Bug 1426438 - Remove NewTabURL.jsm. r=florian draft
authorNihanth Subramanya <nhnt11@gmail.com>
Thu, 21 Dec 2017 00:03:12 +0530
changeset 713604 3743879bd6315dc7967163bc91f02c23a45b0d13
parent 713481 a235bf4868ab9e48c7b2f4bf4cc9bd949ca23c35
child 744377 a72f9dc2b8a127488e5502463134705ad0195543
push id93691
push usernhnt11@gmail.com
push dateWed, 20 Dec 2017 18:38:11 +0000
reviewersflorian
bugs1426438
milestone59.0a1
Bug 1426438 - Remove NewTabURL.jsm. r=florian MozReview-Commit-ID: JDiEzEju3zP
browser/base/content/test/static/browser_all_files_referenced.js
browser/components/newtab/NewTabURL.jsm
browser/components/newtab/moz.build
browser/components/newtab/tests/xpcshell/test_NewTabURL.js
browser/components/newtab/tests/xpcshell/xpcshell.ini
--- a/browser/base/content/test/static/browser_all_files_referenced.js
+++ b/browser/base/content/test/static/browser_all_files_referenced.js
@@ -79,19 +79,16 @@ var whitelist = [
   {file: "resource://gre/defaults/autoconfig/prefcalls.js"},
 
   // modules/libpref/Preferences.cpp
   {file: "resource://gre/greprefs.js"},
 
   // browser/extensions/pdfjs/content/web/viewer.js
   {file: "resource://pdf.js/build/pdf.worker.js"},
 
-  // Add-on API introduced in bug 1118285
-  {file: "resource://app/modules/NewTabURL.jsm"},
-
   // browser/components/newtab bug 1355166
   {file: "resource://app/modules/NewTabSearchProvider.jsm"},
   {file: "resource://app/modules/NewTabWebChannel.jsm"},
 
   // layout/mathml/nsMathMLChar.cpp
   {file: "resource://gre/res/fonts/mathfontSTIXGeneral.properties"},
   {file: "resource://gre/res/fonts/mathfontUnicode.properties"},
 
deleted file mode 100644
--- a/browser/components/newtab/NewTabURL.jsm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* 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/. */
-
-"use strict";
-
-const {utils: Cu} = Components;
-
-this.EXPORTED_SYMBOLS = ["NewTabURL"];
-
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-XPCOMUtils.defineLazyServiceGetter(this, "aboutNewTabService",
-                                   "@mozilla.org/browser/aboutnewtab-service;1",
-                                   "nsIAboutNewTabService");
-
-this.NewTabURL = {
-
-  get() {
-    return aboutNewTabService.newTabURL;
-  },
-
-  get overridden() {
-    return aboutNewTabService.overridden;
-  },
-
-  override(newURL) {
-    aboutNewTabService.newTabURL = newURL;
-  },
-
-  reset() {
-    aboutNewTabService.resetNewTabURL();
-  }
-};
--- a/browser/components/newtab/moz.build
+++ b/browser/components/newtab/moz.build
@@ -12,17 +12,16 @@ BROWSER_CHROME_MANIFESTS += ['tests/brow
 XPCSHELL_TESTS_MANIFESTS += [
     'tests/xpcshell/xpcshell.ini',
 ]
 
 EXTRA_JS_MODULES += [
     'NewTabPrefsProvider.jsm',
     'NewTabRemoteResources.jsm',
     'NewTabSearchProvider.jsm',
-    'NewTabURL.jsm',
     'NewTabWebChannel.jsm'
 ]
 
 XPIDL_SOURCES += [
     'nsIAboutNewTabService.idl',
 ]
 
 XPIDL_MODULE = 'browser-newtab'
deleted file mode 100644
--- a/browser/components/newtab/tests/xpcshell/test_NewTabURL.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-"use strict";
-
-const {utils: Cu} = Components;
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource:///modules/NewTabURL.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
-XPCOMUtils.defineLazyServiceGetter(this, "aboutNewTabService",
-                                   "@mozilla.org/browser/aboutnewtab-service;1",
-                                   "nsIAboutNewTabService");
-
-add_task(async function() {
-  let defaultURL = aboutNewTabService.newTabURL;
-  Services.prefs.setBoolPref("browser.newtabpage.activity-stream.enabled", false);
-
-  Assert.equal(NewTabURL.get(), defaultURL, `Default newtab URL should be ${defaultURL}`);
-  let url = "http://example.com/";
-  let notificationPromise = promiseNewtabURLNotification(url);
-  NewTabURL.override(url);
-  await notificationPromise;
-  Assert.ok(NewTabURL.overridden, "Newtab URL should be overridden");
-  Assert.equal(NewTabURL.get(), url, "Newtab URL should be the custom URL");
-
-  notificationPromise = promiseNewtabURLNotification(defaultURL);
-  NewTabURL.reset();
-  await notificationPromise;
-  Assert.ok(!NewTabURL.overridden, "Newtab URL should not be overridden");
-  Assert.equal(NewTabURL.get(), defaultURL, "Newtab URL should be the default");
-
-  // change newtab page to activity stream
-  Services.prefs.setBoolPref("browser.newtabpage.activity-stream.enabled", true);
-  Assert.equal(NewTabURL.get(), "about:newtab", `Newtab URL should be about:newtab`);
-  Assert.ok(!NewTabURL.overridden, "Newtab URL should not be overridden");
-});
-
-function promiseNewtabURLNotification(aNewURL) {
-  return new Promise(resolve => {
-    Services.obs.addObserver(function observer(aSubject, aTopic, aData) { // jshint ignore:line
-      Services.obs.removeObserver(observer, aTopic);
-      Assert.equal(aData, aNewURL, "Data for newtab-url-changed notification should be new URL.");
-      resolve();
-    }, "newtab-url-changed");
-  });
-}
--- a/browser/components/newtab/tests/xpcshell/xpcshell.ini
+++ b/browser/components/newtab/tests/xpcshell/xpcshell.ini
@@ -1,9 +1,8 @@
 [DEFAULT]
 head =
 firefox-appdir = browser
 skip-if = toolkit == 'android'
 
 [test_AboutNewTabService.js]
 [test_NewTabPrefsProvider.js]
 [test_NewTabSearchProvider.js]
-[test_NewTabURL.js]