Bug 1515865 - Remove unnecessary Task.jsm inclusions in mobile/android tests. r=snorp
authorMark Banner <standard8@mozilla.com>
Wed, 26 Dec 2018 19:20:48 +0000
changeset 511938 252193307797bda3bb7e1071d7d77fa245ee909e
parent 511937 81cf3d9b8621fa4b85966889ad03d6ea1eec9cd3
child 511939 d8deeeb37952ad156be7468e44eaa990092328e8
push id1953
push userffxbld-merge
push dateMon, 11 Mar 2019 12:10:20 +0000
treeherdermozilla-release@9c35dcbaa899 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssnorp
bugs1515865
milestone66.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
Bug 1515865 - Remove unnecessary Task.jsm inclusions in mobile/android tests. r=snorp Differential Revision: https://phabricator.services.mozilla.com/D15177
mobile/android/tests/browser/chrome/test_get_last_visited.html
mobile/android/tests/browser/chrome/test_home_provider.html
mobile/android/tests/browser/chrome/test_media_playback.html
mobile/android/tests/browser/chrome/test_mozAutoplayMediaBlocked.html
mobile/android/tests/browser/chrome/test_offline_page.html
mobile/android/tests/browser/chrome/test_selectoraddtab.html
mobile/android/tests/browser/chrome/test_session_clear_history.html
mobile/android/tests/browser/chrome/test_session_parentid.html
mobile/android/tests/browser/chrome/test_session_zombification.html
mobile/android/tests/browser/chrome/test_settings_fontinflation.html
mobile/android/tests/browser/chrome/test_shared_preferences.html
mobile/android/tests/browser/chrome/test_web_channel.html
mobile/android/tests/browser/robocop/testReadingListCache.js
mobile/android/tests/browser/robocop/testThemeInstall.js
--- a/mobile/android/tests/browser/chrome/test_get_last_visited.html
+++ b/mobile/android/tests/browser/chrome/test_get_last_visited.html
@@ -12,17 +12,16 @@ https://bugzilla.mozilla.org/show_bug.cg
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"/>
   <script type="application/javascript" src="head.js"></script>
   <script type="application/javascript">
 
   "use strict";
 
   ChromeUtils.import("resource://gre/modules/Services.jsm");
   ChromeUtils.import("resource://gre/modules/Messaging.jsm");
-  ChromeUtils.import("resource://gre/modules/Task.jsm");
 
   let chromeWin = Services.wm.getMostRecentWindow("navigator:browser");
   let BrowserApp = chromeWin.BrowserApp;
 
   function get_last_visited(prePath) {
     return EventDispatcher.instance.sendRequestForResult({
       type: "History:GetPrePathLastVisitedTimeMilliseconds",
       prePath: prePath,
--- a/mobile/android/tests/browser/chrome/test_home_provider.html
+++ b/mobile/android/tests/browser/chrome/test_home_provider.html
@@ -12,17 +12,16 @@ Migrated from Robocop: https://bugzilla.
   <link rel="stylesheet" type="text/css" href="chrome://global/skin"/>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"/>
   <script type="application/javascript">
 
   ChromeUtils.import("resource://gre/modules/HomeProvider.jsm");
   ChromeUtils.import("resource://gre/modules/osfile.jsm");
   ChromeUtils.import("resource://gre/modules/Services.jsm");
   ChromeUtils.import("resource://gre/modules/Sqlite.jsm");
-  ChromeUtils.import("resource://gre/modules/Task.jsm");
 
   const TEST_DATASET_ID = "test-dataset-id";
   const TEST_URL = "http://test.com";
   const TEST_TITLE = "Test";
   const TEST_BACKGROUND_URL = "http://example.com/background";
   const TEST_BACKGROUND_COLOR = "#FF9500";
 
   const PREF_SYNC_CHECK_INTERVAL_SECS = "home.sync.checkIntervalSecs";
--- a/mobile/android/tests/browser/chrome/test_media_playback.html
+++ b/mobile/android/tests/browser/chrome/test_media_playback.html
@@ -9,17 +9,16 @@
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"/>
   <script type="application/javascript" src="head.js"></script>
   <script type="application/javascript">
 
 "use strict";
 
 ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/Task.jsm");
 
 let gChromeWin;
 let gBrowserApp;
 
 const URL = "http://example.org/chrome/mobile/android/tests/browser/chrome/media_playback.html";
 
 // Waiting for a tab to load or restore can be slow on the emulator.
 SimpleTest.requestLongerTimeout(2);
--- a/mobile/android/tests/browser/chrome/test_mozAutoplayMediaBlocked.html
+++ b/mobile/android/tests/browser/chrome/test_mozAutoplayMediaBlocked.html
@@ -15,17 +15,16 @@
  */
 
 "use strict";
 
 /* globals InspectorUtils */
 
 ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/Task.jsm");
 
 let gChromeWin;
 let gBrowserApp;
 
 const URL = "http://example.org/chrome/mobile/android/tests/browser/chrome/media_playback.html";
 
 // Waiting for a tab to load or restore can be slow on the emulator.
 SimpleTest.requestLongerTimeout(2);
--- a/mobile/android/tests/browser/chrome/test_offline_page.html
+++ b/mobile/android/tests/browser/chrome/test_offline_page.html
@@ -13,17 +13,16 @@ Migrated from Robocop: https://bugzilla.
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"/>
   <script type="application/javascript" src="head.js"></script>
   <script type="application/javascript">
 
   "use strict";
 
   ChromeUtils.import("resource://gre/modules/Services.jsm");
   ChromeUtils.import("resource://gre/modules/Messaging.jsm");
-  ChromeUtils.import("resource://gre/modules/Task.jsm");
 
   // Provide a helper to yield until we are sure the offline state has changed
   function promiseOffline(isOffline) {
     return new Promise((resolve, reject) => {
       function observe(subject, topic, data) {
         info("Received topic: " + topic);
         Services.obs.removeObserver(observe, "network:offline-status-changed");
         resolve();
--- a/mobile/android/tests/browser/chrome/test_selectoraddtab.html
+++ b/mobile/android/tests/browser/chrome/test_selectoraddtab.html
@@ -12,17 +12,16 @@ https://bugzilla.mozilla.org/show_bug.cg
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"/>
   <script type="application/javascript" src="head.js"></script>
   <script type="application/javascript">
 
   "use strict";
 
   ChromeUtils.import("resource://gre/modules/Services.jsm");
   ChromeUtils.import("resource://gre/modules/Messaging.jsm");
-  ChromeUtils.import("resource://gre/modules/Task.jsm");
 
   // The chrome window
   let chromeWin = Services.wm.getMostRecentWindow("navigator:browser");
   let BrowserApp = chromeWin.BrowserApp;
 
   // Track the tabs where the tests are happening
   let tabBlank;
   let tabTest;
--- a/mobile/android/tests/browser/chrome/test_session_clear_history.html
+++ b/mobile/android/tests/browser/chrome/test_session_clear_history.html
@@ -15,17 +15,16 @@ https://bugzilla.mozilla.org/show_bug.cg
 
   /** Test for Bug 1343603 **/
 
   "use strict";
 
   ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
   ChromeUtils.import("resource://gre/modules/Services.jsm");
   ChromeUtils.import("resource://gre/modules/Messaging.jsm");
-  ChromeUtils.import("resource://gre/modules/Task.jsm");
 
   // The chrome window
   let chromeWin = Services.wm.getMostRecentWindow("navigator:browser");
   let BrowserApp = chromeWin.BrowserApp;
 
   // Track the tabs where the tests are happening
   let tabBlank;
   let tabTest;
--- a/mobile/android/tests/browser/chrome/test_session_parentid.html
+++ b/mobile/android/tests/browser/chrome/test_session_parentid.html
@@ -15,17 +15,16 @@ https://bugzilla.mozilla.org/show_bug.cg
 
   /** Test for Bug 1301160 **/
 
   "use strict";
 
   ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
   ChromeUtils.import("resource://gre/modules/Services.jsm");
   ChromeUtils.import("resource://gre/modules/Messaging.jsm");
-  ChromeUtils.import("resource://gre/modules/Task.jsm");
 
   // The chrome window and related services
   let chromeWin = Services.wm.getMostRecentWindow("navigator:browser");
   let BrowserApp = chromeWin.BrowserApp;
   let ss = Cc["@mozilla.org/browser/sessionstore;1"].getService(Ci.nsISessionStore);
 
   // Track the tabs where the tests are happening
   let tabParent;
--- a/mobile/android/tests/browser/chrome/test_session_zombification.html
+++ b/mobile/android/tests/browser/chrome/test_session_zombification.html
@@ -15,17 +15,16 @@ https://bugzilla.mozilla.org/show_bug.cg
 
   /** Test for Bug 1044556 **/
 
   "use strict";
 
   ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
   ChromeUtils.import("resource://gre/modules/Services.jsm");
   ChromeUtils.import("resource://gre/modules/Messaging.jsm");
-  ChromeUtils.import("resource://gre/modules/Task.jsm");
 
   // The chrome window
   let chromeWin = Services.wm.getMostRecentWindow("navigator:browser");
   let BrowserApp = chromeWin.BrowserApp;
 
   // Track the tabs where the tests are happening
   let tabBlank;
   let tabTest;
--- a/mobile/android/tests/browser/chrome/test_settings_fontinflation.html
+++ b/mobile/android/tests/browser/chrome/test_settings_fontinflation.html
@@ -17,17 +17,16 @@ https://bugzilla.mozilla.org/show_bug.cg
   /** Test for Bug 1328868 **/
 
   "use strict";
 
   ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
   ChromeUtils.import("resource://gre/modules/Services.jsm");
   ChromeUtils.import("resource://gre/modules/Messaging.jsm");
   ChromeUtils.import("resource://gre/modules/Promise.jsm");
-  ChromeUtils.import("resource://gre/modules/Task.jsm");
   ChromeUtils.import("resource://gre/modules/SharedPreferences.jsm");
 
   const GECKO_PREF_FONT_INFLATION = "font.size.inflation.minTwips";
   const FONT_INFLATION_DEFAULT_VALUE = 120;
   const GECKO_PREF_FONT_SCALE = "font.size.systemFontScale";
   const ANDROID_PREF = "android.not_a_preference.font.size.use_system_font_size";
 
   // The chrome window
--- a/mobile/android/tests/browser/chrome/test_shared_preferences.html
+++ b/mobile/android/tests/browser/chrome/test_shared_preferences.html
@@ -11,17 +11,16 @@ Migrated from Robocop: https://bugzilla.
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/AddTask.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://global/skin"/>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"/>
   <script type="application/javascript" src="head.js"></script>
   <script type="application/javascript">
 
   ChromeUtils.import("resource://gre/modules/SharedPreferences.jsm");
   ChromeUtils.import("resource://gre/modules/Promise.jsm");
-  ChromeUtils.import("resource://gre/modules/Task.jsm");
 
   let _observerId = 0;
 
   add_task(async function test_get_set() {
     let branch = SharedPreferences.forAndroid("test");
 
     branch.setBoolPref("boolKey", true);
     branch.setCharPref("charKey", "string value");
--- a/mobile/android/tests/browser/chrome/test_web_channel.html
+++ b/mobile/android/tests/browser/chrome/test_web_channel.html
@@ -11,17 +11,16 @@ Migrated from Robocop: https://bugzilla.
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/AddTask.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://global/skin"/>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"/>
   <script type="application/javascript">
 
   ChromeUtils.import("resource://gre/modules/Promise.jsm");
   ChromeUtils.import("resource://gre/modules/Services.jsm");
   ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-  ChromeUtils.import("resource://gre/modules/Task.jsm");
   ChromeUtils.defineModuleGetter(this, "WebChannel",
     "resource://gre/modules/WebChannel.jsm");
 
   const HTTP_PATH = "http://mochi.test:8888";
   const HTTP_ENDPOINT = "/chrome/mobile/android/tests/browser/chrome/web_channel.html";
 
   const gChromeWin = Services.wm.getMostRecentWindow("navigator:browser");
   let BrowserApp = gChromeWin.BrowserApp;
--- a/mobile/android/tests/browser/robocop/testReadingListCache.js
+++ b/mobile/android/tests/browser/robocop/testReadingListCache.js
@@ -2,17 +2,16 @@
 /* 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/. */
 
 /* globals ReaderMode */
 
 ChromeUtils.import("resource://gre/modules/ReaderMode.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/Task.jsm");
 
 var Reader = Services.wm.getMostRecentWindow("navigator:browser").Reader;
 
 const URL_PREFIX = "http://mochi.test:8888/tests/robocop/reader_mode_pages/";
 
 var TEST_PAGES = [
   {
     url: URL_PREFIX + "basic_article.html",
--- a/mobile/android/tests/browser/robocop/testThemeInstall.js
+++ b/mobile/android/tests/browser/robocop/testThemeInstall.js
@@ -1,17 +1,16 @@
 // -*- indent-tabs-mode: nil; js-indent-level: 2 -*-
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 "use strict";
 
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 ChromeUtils.import("resource://gre/modules/Messaging.jsm");
-ChromeUtils.import("resource://gre/modules/Task.jsm");
 
 // The chrome window and friends.
 let chromeWin = Services.wm.getMostRecentWindow("navigator:browser");
 let BrowserApp = chromeWin.BrowserApp;
 
 const BASE = "https://example.com:443/tests/robocop/";
 const XPI = BASE + "browser_theme_image_file.xpi";
 const PAGE = BASE + "robocop_blank_04.html";