Fix stupid now-incorrect comment that keeps getting copied to new tests, no bug, r=ARGH
authorGavin Sharp <gavin@gavinsharp.com>
Wed, 05 Jun 2013 23:53:17 -0700
changeset 145706 01eefd251a9a10e3b00f1567e004bfdf06886c08
parent 145705 6a5f8ebc836a6866849daa92aa916427af01aa7d
child 145707 971b1e4b4c46e9cc01202bd7d496fd20a4033f22
push id2697
push userbbajaj@mozilla.com
push dateMon, 05 Aug 2013 18:49:53 +0000
treeherdermozilla-beta@dfec938c7b63 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersARGH
milestone24.0a1
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
Fix stupid now-incorrect comment that keeps getting copied to new tests, no bug, r=ARGH
mobile/android/base/tests/testDeviceSearchEngine.js
toolkit/components/search/tests/xpcshell/test_engineselect.js
toolkit/components/search/tests/xpcshell/test_purpose.js
--- a/mobile/android/base/tests/testDeviceSearchEngine.js
+++ b/mobile/android/base/tests/testDeviceSearchEngine.js
@@ -37,22 +37,20 @@ function search_observer(aSubject, aTopi
     do_print("Device: phone");
     check_submission("/phone?q=foo", "foo", null);
   }
 
   do_test_finished();
 };
 
 add_task(function test_default() {
-  let search = Services.search; // Cause service initialization
-
   do_register_cleanup(function cleanup() {
     Services.obs.removeObserver(search_observer, "browser-search-engine-modified");
   });
 
   do_test_pending();
   Services.obs.addObserver(search_observer, "browser-search-engine-modified", false);
 
   do_print("Loading search engine");
-  search.addEngine("http://mochi.test:8888/tests/robocop/devicesearch.xml", Ci.nsISearchEngine.DATA_XML, null, false);
+  Services.search.addEngine("http://mochi.test:8888/tests/robocop/devicesearch.xml", Ci.nsISearchEngine.DATA_XML, null, false);
 });
 
 run_next_test();
--- a/toolkit/components/search/tests/xpcshell/test_engineselect.js
+++ b/toolkit/components/search/tests/xpcshell/test_engineselect.js
@@ -73,26 +73,24 @@ function search_observer(aSubject, aTopi
 function run_test() {
   removeMetadata();
   updateAppInfo();
 
   let httpServer = new HttpServer();
   httpServer.start(4444);
   httpServer.registerDirectory("/", do_get_cwd());
 
-  let search = Services.search; // Cause service initialization
-
   do_register_cleanup(function cleanup() {
     httpServer.stop(function() {});
     Services.obs.removeObserver(search_observer, "browser-search-engine-modified");
   });
 
   do_test_pending();
 
   Services.obs.addObserver(search_observer, "browser-search-engine-modified", false);
 
-  search.addEngine("http://localhost:4444/data/engine.xml",
-                   Ci.nsISearchEngine.DATA_XML,
-                   null, false);
-  search.addEngine("http://localhost:4444/data/engine2.xml",
-                   Ci.nsISearchEngine.DATA_XML,
-                   null, false);
+  Services.search.addEngine("http://localhost:4444/data/engine.xml",
+                            Ci.nsISearchEngine.DATA_XML,
+                            null, false);
+  Services.search.addEngine("http://localhost:4444/data/engine2.xml",
+                            Ci.nsISearchEngine.DATA_XML,
+                            null, false);
 }
--- a/toolkit/components/search/tests/xpcshell/test_purpose.js
+++ b/toolkit/components/search/tests/xpcshell/test_purpose.js
@@ -53,22 +53,20 @@ function run_test() {
   removeMetadata();
   updateAppInfo();
   do_load_manifest("data/chrome.manifest");
 
   let httpServer = new HttpServer();
   httpServer.start(4444);
   httpServer.registerDirectory("/", do_get_cwd());
 
-  let search = Services.search; // Cause service initialization
-
   do_register_cleanup(function cleanup() {
     httpServer.stop(function() {});
     Services.obs.removeObserver(search_observer, "browser-search-engine-modified");
   });
 
   do_test_pending();
   Services.obs.addObserver(search_observer, "browser-search-engine-modified", false);
 
-  search.addEngine("http://localhost:4444/data/engine.xml",
-                   Ci.nsISearchEngine.DATA_XML,
-                   null, false);
+  Services.search.addEngine("http://localhost:4444/data/engine.xml",
+                            Ci.nsISearchEngine.DATA_XML,
+                            null, false);
 }