Backed out changeset 357206a19974 (bug 1474414) for build bustage at mozbuild/test/codecoverage/test_lcov_rewrite.py on a CLOSED TREE

.eslintignore

@@ -90,7 +90,7 @@ browser/extensions/pdfjs/content/web**
 browser/extensions/pocket/content/panels/js/tmpl.js
 browser/extensions/pocket/content/panels/js/vendor/**
 # Activity Stream has incompatible eslintrc. `npm run lint` from its directory
-browser/components/newtab/**
+browser/extensions/activity-stream/**
 # The only file in browser/locales/ is pre-processed.
 browser/locales/**
 # imported from chromium

CLOBBER

@@ -22,4 +22,4 @@
 # changes to stick? As of bug 928195, this shouldn't be necessary! Please
 # don't change CLOBBER for WebIDL changes any more.
 
-Bug 1474414 - Moving Activity Stream out of system-addon requires a clobber.
+Bug 1371485 - Moving gyp requires a clobber.

browser/base/content/test/performance/browser_preferences_usage.js

@@ -93,7 +93,7 @@ add_task(async function startup() {
       max: 650,
     },
     "extensions.getAddons.cache.enabled": {
-      min: 8,
+      min: 9,
       max: 55,
     },
   };

browser/base/content/test/tabs/browser_isLocalAboutURI.js

@@ -33,7 +33,7 @@ add_task(function test_URI_with_resolved() {
     is(gBrowser._isLocalAboutURI(URI, resolvedURI), expect, description);
   };
   check("about:newtab",
-    "jar:file:///Applications/Firefox.app/Contents/Resources/browser/omni.ja!/chrome/browser/res/activity-stream/prerendered/en-US/activity-stream.html",
+    "jar:file:///Applications/Firefox.app/Contents/Resources/browser/features/activity-stream@mozilla.org.xpi!/chrome/content/data/content/activity-stream.html",
     true,
     "about:newtab with jar is local");
   check("about:newtab",

browser/components/newtab/jar.mn

@@ -1,47 +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/.
-
-browser.jar:
-% resource activity-stream %res/activity-stream/ contentaccessible=yes
-  res/activity-stream/lib/ (./lib/*)
-  res/activity-stream/common/ (./common/*)
-  res/activity-stream/vendor/Redux.jsm (./vendor/Redux.jsm)
-  res/activity-stream/vendor/react.js (./vendor/react.js)
-  res/activity-stream/vendor/react-dom.js (./vendor/react-dom.js)
-#ifndef RELEASE_OR_BETA
-  res/activity-stream/vendor/react-dev.js (./vendor/react-dev.js)
-  res/activity-stream/vendor/react-dom-dev.js (./vendor/react-dom-dev.js)
-#endif
-  res/activity-stream/vendor/prop-types.js (./vendor/prop-types.js)
-  res/activity-stream/vendor/react-intl.js (./vendor/react-intl.js)
-  res/activity-stream/vendor/redux.js (./vendor/redux.js)
-  res/activity-stream/vendor/react-redux.js (./vendor/react-redux.js)
-  res/activity-stream/data/content/assets/ (./data/content/assets/*)
-  res/activity-stream/data/content/tippytop/ (./data/content/tippytop/*)
-  res/activity-stream/data/content/activity-stream.bundle.js (./data/content/activity-stream.bundle.js)
-#ifndef RELEASE_OR_BETA
-  res/activity-stream/data/content/activity-stream.bundle.js.map (./data/content/activity-stream.bundle.js.map)
-#endif
-#ifdef XP_MACOSX
-  res/activity-stream/css/activity-stream.css (./css/activity-stream-mac.css)
-#ifndef RELEASE_OR_BETA
-  res/activity-stream/css/activity-stream-mac.css.map (./css/activity-stream-mac.css.map)
-#endif
-#elifdef XP_WIN
-  res/activity-stream/css/activity-stream.css (./css/activity-stream-windows.css)
-#ifndef RELEASE_OR_BETA
-  res/activity-stream/css/activity-stream-windows.css.map (./css/activity-stream-windows.css.map)
-#endif
-#else
-  res/activity-stream/css/activity-stream.css (./css/activity-stream-linux.css)
-#ifndef RELEASE_OR_BETA
-  res/activity-stream/css/activity-stream-linux.css.map (./css/activity-stream-linux.css.map)
-#endif
-#endif
-  res/activity-stream/prerendered/static/activity-stream-initial-state.js (./prerendered/static/activity-stream-initial-state.js)
-#ifndef RELEASE_OR_BETA
-  res/activity-stream/prerendered/static/activity-stream-debug.html (./prerendered/static/activity-stream-debug.html)
-  res/activity-stream/prerendered/static/activity-stream-prerendered-debug.html (./prerendered/static/activity-stream-prerendered-debug.html)
-#endif
-  res/activity-stream/prerendered/ (./prerendered/locales/*)

browser/components/newtab/moz.build

@@ -5,12 +5,12 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 with Files("**"):
-    BUG_COMPONENT = ("Firefox", "Activity Streams: Newtab")
+    BUG_COMPONENT = ("Firefox", "New Tab Page")
 
-BROWSER_CHROME_MANIFESTS += ['test/browser/browser.ini']
+BROWSER_CHROME_MANIFESTS += ['tests/browser/browser.ini']
 
 XPCSHELL_TESTS_MANIFESTS += [
-    'test/xpcshell/xpcshell.ini',
+    'tests/xpcshell/xpcshell.ini',
 ]
 
 XPIDL_SOURCES += [
@@ -23,5 +23,3 @@ EXTRA_COMPONENTS += [
     'aboutNewTabService.js',
     'NewTabComponents.manifest',
 ]
-
-JAR_MANIFESTS += ['jar.mn']

browser/components/newtab/tests/browser/browser.ini

@@ -0,0 +1,8 @@
+[DEFAULT]
+prefs =
+  browser.newtabpage.activity-stream.debug=false
+
+[browser_activity_stream_strings.js]
+[browser_enabled_newtabpage.js]
+[browser_newtab_overrides.js]
+[browser_packaged_as_locales.js]

browser/extensions/activity-stream/bootstrap.js

@@ -0,0 +1,31 @@
+/* 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";
+
+ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+
+ChromeUtils.defineModuleGetter(this, "Services",
+  "resource://gre/modules/Services.jsm");
+
+XPCOMUtils.defineLazyServiceGetter(this, "resProto",
+                                   "@mozilla.org/network/protocol;1?name=resource",
+                                   "nsISubstitutingProtocolHandler");
+
+const RESOURCE_HOST = "activity-stream";
+
+// The functions below are required by bootstrap.js
+
+this.install = function install(data, reason) {};
+
+this.startup = function startup(data, reason) {
+  resProto.setSubstitutionWithFlags(RESOURCE_HOST,
+                                    Services.io.newURI("chrome/content/", null, data.resourceURI),
+                                    resProto.ALLOW_CONTENT_ACCESS);
+};
+
+this.shutdown = function shutdown(data, reason) {
+  resProto.setSubstitution(RESOURCE_HOST, null);
+};
+
+this.uninstall = function uninstall(data, reason) {};