Backed out changeset 169e19d13daa (bug 903456) for S4 bustage
authorWes Kocher <wkocher@mozilla.com>
Mon, 29 Dec 2014 11:55:21 -0800
changeset 221500 a91703c279ec0c0c7fe16f20e1e28d6bad43450f
parent 221499 3e5f3d222e219e0543e6df14b20e2fdf9f1263bc
child 221501 b6c3d0131066ffe4d698b3497095acba6db94e3d
push id28031
push userkwierso@gmail.com
push dateTue, 30 Dec 2014 00:55:49 +0000
treeherdermozilla-central@62e3a9f26d21 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs903456
milestone37.0a1
backs out169e19d13daaefd19b3887c8f80230e5802fa5bb
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 169e19d13daa (bug 903456) for S4 bustage
toolkit/components/search/toolkitsearch.manifest
xpcom/tests/unit/test_bug930456.js
xpcom/tests/unit/test_bug930456_child.js
xpcom/tests/unit/xpcshell.ini
--- a/toolkit/components/search/toolkitsearch.manifest
+++ b/toolkit/components/search/toolkitsearch.manifest
@@ -1,6 +1,6 @@
-component {7319788a-fe93-4db3-9f39-818cf08f4256} nsSearchService.js process=main
-contract @mozilla.org/browser/search-service;1 {7319788a-fe93-4db3-9f39-818cf08f4256} process=main
+component {7319788a-fe93-4db3-9f39-818cf08f4256} nsSearchService.js
+contract @mozilla.org/browser/search-service;1 {7319788a-fe93-4db3-9f39-818cf08f4256}
 # 21600 == 6 hours
 category update-timer nsSearchService @mozilla.org/browser/search-service;1,getService,search-engine-update-timer,browser.search.update.interval,21600
 component {aa892eb4-ffbf-477d-9f9a-06c995ae9f27} nsSearchSuggestions.js
-contract @mozilla.org/autocomplete/search;1?name=search-autocomplete {aa892eb4-ffbf-477d-9f9a-06c995ae9f27}
+contract @mozilla.org/autocomplete/search;1?name=search-autocomplete {aa892eb4-ffbf-477d-9f9a-06c995ae9f27}
\ No newline at end of file
deleted file mode 100644
--- a/xpcom/tests/unit/test_bug930456.js
+++ /dev/null
@@ -1,15 +0,0 @@
-const Ci = Components.interfaces;
-const Cc = Components.classes;
-
-Components.utils.import("resource:///modules/Services.jsm");
-
-function run_test()
-{
-  let isChild = Services.appinfo.processType == Services.appinfo.PROCESS_TYPE_CONTENT;
-
-  if (isChild) {
-    do_check_false("@mozilla.org/browser/search-service;1" in Cc);
-  } else {
-    do_check_true("@mozilla.org/browser/search-service;1" in Cc);
-  }
-}
deleted file mode 100644
--- a/xpcom/tests/unit/test_bug930456_child.js
+++ /dev/null
@@ -1,3 +0,0 @@
-function run_test() {
-  run_test_in_child("test_bug930456.js");
-}
--- a/xpcom/tests/unit/xpcshell.ini
+++ b/xpcom/tests/unit/xpcshell.ini
@@ -22,18 +22,16 @@ skip-if = os == "android"
 [test_bug476919.js]
 # Bug 676998: test fails consistently on Android
 fail-if = os == "android"
 [test_bug478086.js]
 [test_bug656331.js]
 # Bug 676998: test fails consistently on Android
 fail-if = os == "android"
 [test_bug725015.js]
-[test_bug930456.js]
-[test_bug930456_child.js]
 [test_compmgr_warnings.js]
 # Bug 676998: test fails consistently on Android
 fail-if = os == "android"
 [test_file_createUnique.js]
 [test_file_equality.js]
 [test_hidden_files.js]
 [test_home.js]
 # Bug 676998: test fails consistently on Android