Bug 1381569 - Turn on Activity Stream by default for Nightly. r=mconley

MozReview-Commit-ID: Bsv1hIigZ0K

browser/app/profile/firefox.js

@@ -1280,7 +1280,11 @@ pref("browser.newtabpage.columns", 5);
 pref("browser.newtabpage.directory.source", "https://tiles.services.mozilla.com/v3/links/fetch/%LOCALE%/%CHANNEL%");
 
 // activates Activity Stream
+#ifdef NIGHTLY_BUILD
+pref("browser.newtabpage.activity-stream.enabled", true);
+#else
 pref("browser.newtabpage.activity-stream.enabled", false);
+#endif
 
 // Enable the DOM fullscreen API.
 pref("full-screen-api.enabled", true);

browser/extensions/activity-stream/moz.build

@@ -16,3 +16,5 @@ FINAL_TARGET_PP_FILES.features['activity-stream@mozilla.org'] += [
 ]
 
 JAR_MANIFESTS += ['jar.mn']
+
+BROWSER_CHROME_MANIFESTS += ['test/functional/mochitest/browser.ini']

browser/extensions/activity-stream/test/functional/mochitest/browser.ini

@@ -1,9 +1,5 @@
 [DEFAULT]
-# XXX This defaults to forcing activity-stream tests to be skipped in m-c,
-# since, as of this writing, mozilla-central itself is still turned off.
-# The tests can be run locally using 'npm run mochitest' which does various
-# overrides.
-skip-if=!activity_stream
+skip-if=!nightly_build
 support-files =
   blue_page.html