Bug 1426438 - Remove NewTabURL.jsm. r=florian
MozReview-Commit-ID: JDiEzEju3zP
--- 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]