Backed out 5 changesets (bug 1446676) for timeouts in talos-chrome-pr…

…ofiling on OS X. a=backout

Backed out changeset 5d3eb0526d8b (bug 1446676)
Backed out changeset d6bda91c66d6 (bug 1446676)
Backed out changeset 71d65d6b6499 (bug 1446676)
Backed out changeset aabfc0197692 (bug 1446676)
Backed out changeset ad8214a6cf04 (bug 1446676)

--HG--
rename : services/sync/tps/extensions/tps/bootstrap.js => services/sync/tps/extensions/tps/components/tps-cmdline.js
rename : testing/talos/talos/pageloader/bootstrap.js => testing/talos/talos/pageloader/components/tp-cmdline.js
rename : testing/talos/talos/startup_test/sessionrestore/addon/bootstrap.js => testing/talos/talos/startup_test/sessionrestore/addon/SessionRestoreTalosTest.js
rename : testing/talos/talos/talos-powers/bootstrap.js => testing/talos/talos/talos-powers/components/TalosPowersService.js
rename : tools/quitter/bootstrap.js => tools/quitter/QuitterObserver.js

dom/workers/moz.build

@@ -82,6 +82,7 @@ FINAL_LIBRARY = 'xul'
 
 TEST_DIRS += [
     'test/extensions/bootstrap',
+    'test/extensions/traditional',
 ]
 
 MOCHITEST_MANIFESTS += [

dom/workers/test/chrome.ini

@@ -69,6 +69,7 @@ skip-if = (os == 'linux') # Bug 1244409
 [test_WorkerDebugger_suspended.xul]
 [test_chromeWorker.xul]
 [test_chromeWorkerJSM.xul]
+[test_extension.xul]
 [test_extensionBootstrap.xul]
 [test_file.xul]
 [test_fileBlobPosting.xul]

dom/workers/test/extensions/moz.build

@@ -4,4 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DIRS += ['bootstrap']
+DIRS += ['bootstrap', 'traditional']

dom/workers/test/extensions/traditional/WorkerTest.js

@@ -0,0 +1,118 @@
+/**
+ * Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+ChromeUtils.import("resource://gre/modules/Services.jsm");
+ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+
+var gWorkerAndCallback = {
+  _worker: null,
+  _callback: null,
+
+  _ensureStarted: function() {
+    if (!this._worker) {
+      throw new Error("Not yet started!");
+    }
+  },
+
+  start: function() {
+    if (!this._worker) {
+      var worker = new Worker("chrome://worker/content/worker.js");
+      worker.onerror = function(event) {
+        Cu.reportError(event.message);
+        event.preventDefault();
+      };
+
+      this._worker = worker;
+    }
+  },
+
+  stop: function() {
+    if (this._worker) {
+      try {
+        this.terminate();
+      }
+      catch(e) {
+        Cu.reportError(e);
+      }
+      this._worker = null;
+    }
+  },
+
+  set callback(val) {
+    this._ensureStarted();
+    if (val) {
+      var callback = val.QueryInterface(Ci.nsIWorkerTestCallback);
+      if (this.callback != callback) {
+        this._worker.onmessage = function(event) {
+          callback.onmessage(event.data);
+        };
+        this._worker.onerror = function(event) {
+          callback.onerror(event.message);
+          event.preventDefault();
+        };
+        this._callback = callback;
+      }
+    }
+    else {
+      this._worker.onmessage = null;
+      this._worker.onerror = null;
+      this._callback = null;
+    }
+  },
+
+  get callback() {
+    return this._callback;
+  },
+
+  postMessage: function(data) {
+    this._ensureStarted();
+    this._worker.postMessage(data);
+  },
+
+  terminate: function() {
+    this._ensureStarted();
+    this._worker.terminate();
+    this.callback = null;
+  }
+};
+
+function WorkerTest() {
+}
+WorkerTest.prototype = {
+  observe: function(subject, topic, data) {
+    switch(topic) {
+      case "profile-after-change":
+        gWorkerAndCallback.start();
+        Services.obs.addObserver(this, "profile-before-change");
+        break;
+      case "profile-before-change":
+        gWorkerAndCallback.stop();
+        break;
+      default:
+        Cu.reportError("Unknown topic: " + topic);
+    }
+  },
+
+  set callback(val) {
+    gWorkerAndCallback.callback = val;
+  },
+
+  get callback() {
+    return gWorkerAndCallback.callback;
+  },
+
+  postMessage: function(message) {
+    gWorkerAndCallback.postMessage(message);
+  },
+
+  terminate: function() {
+    gWorkerAndCallback.terminate();
+  },
+
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver, Ci.nsIWorkerTest]),
+  classID: Components.ID("{3b52b935-551f-4606-ba4c-decc18b67bfd}")
+};
+
+this.NSGetFactory = XPCOMUtils.generateNSGetFactory([WorkerTest]);

dom/workers/test/extensions/traditional/WorkerTest.manifest

@@ -0,0 +1,3 @@
+component {3b52b935-551f-4606-ba4c-decc18b67bfd} WorkerTest.js
+contract @mozilla.org/test/workertest;1 {3b52b935-551f-4606-ba4c-decc18b67bfd}
+category profile-after-change WorkerTest @mozilla.org/test/workertest;1

dom/workers/test/extensions/traditional/install.rdf

@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+
+<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+     xmlns:em="http://www.mozilla.org/2004/em-rdf#">
+
+  <Description about="urn:mozilla:install-manifest">
+    <em:name>WorkerTest</em:name>
+    <em:description>Worker functions for use in testing.</em:description>
+    <em:creator>Mozilla</em:creator>
+    <em:version>2016.03.09</em:version>
+    <em:id>[email protected]</em:id>
+    <em:type>2</em:type>
+    <em:targetApplication>
+      <Description>
+        <!-- Firefox -->
+        <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
+        <em:minVersion>45.0</em:minVersion>
+        <em:maxVersion>*</em:maxVersion>
+      </Description>
+    </em:targetApplication>
+    <em:targetApplication>
+      <Description>
+        <!-- Fennec -->
+        <em:id>{aa3c5121-dab2-40e2-81ca-7ea25febc110}</em:id>
+        <em:minVersion>45.0</em:minVersion>
+        <em:maxVersion>*</em:maxVersion>
+      </Description>
+    </em:targetApplication>
+  </Description>
+</RDF>

dom/workers/test/extensions/traditional/jar.mn

@@ -0,0 +1,3 @@
+worker.jar:
+% content worker %content/
+  content/worker.js (worker.js)

dom/workers/test/extensions/traditional/moz.build

@@ -0,0 +1,30 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+XPIDL_SOURCES += [
+    'nsIWorkerTest.idl',
+]
+
+XPIDL_MODULE = 'WorkerTest'
+
+EXTRA_COMPONENTS += [
+    'WorkerTest.js',
+    'WorkerTest.manifest',
+]
+
+XPI_NAME = 'worker'
+
+JAR_MANIFESTS += ['jar.mn']
+USE_EXTENSION_MANIFEST = True
+NO_JS_MANIFEST = True
+
+FINAL_TARGET_FILES += [
+    'install.rdf',
+]
+
+TEST_HARNESS_FILES.testing.mochitest.extensions += [
+    '[email protected]',
+]

dom/workers/test/extensions/traditional/nsIWorkerTest.idl

@@ -0,0 +1,23 @@
+/* -*- Mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 40 -*- */
+/* vim: set ts=2 et sw=2 tw=40: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "nsISupports.idl"
+
+[scriptable, uuid(10f8ebdf-1373-4640-9c34-53dee99f526f)]
+interface nsIWorkerTestCallback : nsISupports
+{
+  void onmessage(in DOMString data);
+  void onerror(in DOMString data);
+};
+
+[scriptable, uuid(887a0614-a0f0-4c0e-80e0-cf31e6d4e286)]
+interface nsIWorkerTest : nsISupports
+{
+  void postMessage(in DOMString data);
+  void terminate();
+
+  attribute nsIWorkerTestCallback callback;
+};

dom/workers/test/extensions/traditional/worker.js

@@ -0,0 +1,7 @@
+/**
+ * Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+onmessage = function(event) {
+  postMessage(event.data);
+}

dom/workers/test/test_extension.xul

@@ -0,0 +1,55 @@
+<?xml version="1.0"?>
+<!--
+  Any copyright is dedicated to the Public Domain.
+  http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<window title="DOM Worker Threads Test"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        onload="test();">
+
+  <script type="application/javascript"
+          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
+  <script type="application/javascript"
+          src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"/>
+  <script type="application/javascript" src="dom_worker_helper.js"/>
+
+  <script type="application/javascript">
+  <![CDATA[
+
+    function test() {
+      const message = "woohoo";
+
+      var workertest =
+        Cc["@mozilla.org/test/workertest;1"].createInstance(Ci.nsIWorkerTest);
+
+      workertest.callback = {
+        onmessage: function(data) {
+          is(data, message, "Correct message");
+          workertest.callback = null;
+          workertest = null;
+          SimpleTest.finish();
+        },
+        onerror: function(data) {
+          ok(false, "Worker had an error: " + data.message);
+          workertest.callback = null;
+          workertest = null;
+          SimpleTest.finish();
+        },
+        QueryInterface: XPCOMUtils.generateQI([Ci.nsIWorkerTestCallback])
+      };
+
+      workertest.postMessage(message);
+
+      SimpleTest.waitForExplicitFinish();
+    }
+
+  ]]>
+  </script>
+
+  <body xmlns="http://www.w3.org/1999/xhtml">
+    <p id="display"></p>
+    <div id="content" style="display:none;"></div>
+    <pre id="test"></pre>
+  </body>
+  <label id="test-result"/>
+</window>