Backed out changeset cf8e07fcfaa7 (bug 1674317) for xpcshell perma failures on test_AboutHomeStartupCacheWorker.js. CLOSED TREE

browser/actors/AboutNewTabChild.jsm

@@ -48,6 +48,17 @@ class AboutNewTabChild extends JSWindowActorChild {
         return;
       }
 
+      // In the event that the document that was loaded here was the cached
+      // about:home document, then there's nothing further to do - the page
+      // will load its scripts itself.
+      //
+      // Note that it's okay to waive the xray wrappers here since this actor
+      // is registered to only run in the privileged about content process from
+      // about:home, about:newtab and about:welcome.
+      if (ChromeUtils.waiveXrays(this.contentWindow).__FROM_STARTUP_CACHE__) {
+        return;
+      }
+
       const debug = !AppConstants.RELEASE_OR_BETA && ACTIVITY_STREAM_DEBUG;
       const debugString = debug ? "-dev" : "";
 

browser/components/newtab/data/content/abouthomecache/page.html.template

@@ -38,6 +38,16 @@
       {{ MARKUP }}
     </div>
     <div id="footer-asrouter-container" role="presentation"></div>
+    <script src="chrome://browser/content/contentSearchUI.js"></script>
+    <script src="chrome://browser/content/contentSearchHandoffUI.js"></script>
+    <script src="chrome://browser/content/contentTheme.js"></script>
+    <script src="resource://activity-stream/vendor/react.js"></script>
+    <script src="resource://activity-stream/vendor/react-dom.js"></script>
+    <script src="resource://activity-stream/vendor/prop-types.js"></script>
+    <script src="resource://activity-stream/vendor/redux.js"></script>
+    <script src="resource://activity-stream/vendor/react-redux.js"></script>
+    <script src="resource://activity-stream/vendor/react-transition-group.js"></script>
+    <script src="resource://activity-stream/data/content/activity-stream.bundle.js"></script>
     <script src="about:home?jscache"></script>
   </body>
 </html>

browser/components/newtab/data/content/abouthomecache/script.js.template

@@ -15,5 +15,4 @@
 #
 #endif
 window.__FROM_STARTUP_CACHE__ = true;
-window.__STARTUP_STATE__ = {{ STATE }};
-
+window.NewtabRenderUtils.renderCache({{ STATE }});

browser/components/newtab/data/content/newtab-render.js

@@ -4,8 +4,4 @@
 "use strict";
 
 // exported by activity-stream.bundle.js
-if (window.__FROM_STARTUP_CACHE__) {
-  window.NewtabRenderUtils.renderCache(window.__STARTUP_STATE__);
-} else {
-  window.NewtabRenderUtils.renderWithoutState();
-}
+window.NewtabRenderUtils.renderWithoutState();