Backed out changeset c1c441c9edce (bug 845668) for frequent Windows mochitest-2 crashes.

CLOSED TREE

content/base/src/nsFrameLoader.cpp

@@ -2049,6 +2049,8 @@ nsFrameLoader::TryRemoteBrowser()
     nsCOMPtr<nsIBrowserDOMWindow> browserDOMWin;
     rootChromeWin->GetBrowserDOMWindow(getter_AddRefs(browserDOMWin));
     mRemoteBrowser->SetBrowserDOMWindow(browserDOMWin);
+
+    mChildHost = static_cast<ContentParent*>(mRemoteBrowser->Manager());
   }
   return true;
 }

content/base/src/nsFrameLoader.h

@@ -434,6 +434,7 @@ private:
   bool mVisible : 1;
 
   // XXX leaking
+  nsCOMPtr<nsIObserver> mChildHost;
   RenderFrameParent* mCurrentRemoteFrame;
   TabParent* mRemoteBrowser;