Only commit cookie changes in prerenders after a prerender is shown

chrome/browser/ui/search/instant_search_prerenderer_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/search/instant_search_prerenderer.h"
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/field_trial.h"
@@ skipping 41 matching lines @@
       Profile* profile,
       const GURL& url,
       const Referrer& referrer,
       Origin origin,
       bool call_did_finish_load,
       const content::SessionStorageNamespaceMap& session_storage_namespace_map);
 
   virtual void StartPrerendering(
       int ALLOW_UNUSED creator_child_id,
       const gfx::Size& ALLOW_UNUSED size,
-      content::SessionStorageNamespace* session_storage_namespace) OVERRIDE;
+      content::SessionStorageNamespace* session_storage_namespace,
+      net::URLRequestContextGetter* request_context) OVERRIDE;
   virtual bool GetChildId(int* child_id) const OVERRIDE;
   virtual bool GetRouteId(int* route_id) const OVERRIDE;
 
  private:
   Profile* profile_;
   const GURL url_;
   bool call_did_finish_load_;
   content::SessionStorageNamespaceMap session_storage_namespace_map_;
 
   DISALLOW_COPY_AND_ASSIGN(DummyPrerenderContents);
@@ skipping 35 matching lines @@
                         PrerenderManager::kNoExperiment),
       profile_(profile),
       url_(url),
       call_did_finish_load_(call_did_finish_load),
       session_storage_namespace_map_(session_storage_namespace_map) {
 }
 
 void DummyPrerenderContents::StartPrerendering(
     int ALLOW_UNUSED creator_child_id,
     const gfx::Size& ALLOW_UNUSED size,
-    content::SessionStorageNamespace* session_storage_namespace) {
+    content::SessionStorageNamespace* session_storage_namespace,
+    net::URLRequestContextGetter* request_context) {
   prerender_contents_.reset(content::WebContents::CreateWithSessionStorage(
       content::WebContents::CreateParams(profile_),
       session_storage_namespace_map_));
   PrerenderTabHelper::CreateForWebContentsWithPasswordManager(
       prerender_contents_.get(), NULL);
   content::NavigationController::LoadURLParams params(url_);
   prerender_contents_->GetController().LoadURLWithParams(params);
   SearchTabHelper::CreateForWebContents(prerender_contents_.get());
 
   prerendering_has_started_ = true;
@@ skipping 45 matching lines @@
     AddTab(browser(), GURL(content::kAboutBlankURL));
 
     content::SessionStorageNamespaceMap session_storage_namespace_map;
     session_storage_namespace_map[std::string()] =
         GetActiveWebContents()->GetController().
             GetDefaultSessionStorageNamespace();
     PrerenderManagerFactory::GetForProfile(browser()->profile())->
         SetPrerenderContentsFactory(
             new DummyPrerenderContentsFactory(call_did_finish_load,
                                               session_storage_namespace_map));
-
+    PrerenderManagerFactory::GetForProfile(browser()->profile())->
+        OnCookieStoreLoaded();
     if (prerender_search_results_base_page) {
       InstantSearchPrerenderer* prerenderer = GetInstantSearchPrerenderer();
       prerenderer->Init(session_storage_namespace_map, gfx::Size(640, 480));
       EXPECT_NE(static_cast<PrerenderHandle*>(NULL), prerender_handle());
     }
   }
 
   InstantSearchPrerenderer* GetInstantSearchPrerenderer() {
     return instant_service_->instant_search_prerenderer();
   }
@@ skipping 276 matching lines @@
   // key. Make sure UsePrerenderedPage() extracts the search terms from the URL
   // and uses the prerendered page contents.
   GURL url("https://www.google.com/alt#quux=foo");
   browser()->OpenURL(content::OpenURLParams(url, Referrer(), CURRENT_TAB,
                                             content::PAGE_TRANSITION_TYPED,
                                             false));
   EXPECT_EQ(GetPrerenderURL(), GetActiveWebContents()->GetURL());
   EXPECT_EQ(static_cast<PrerenderHandle*>(NULL), prerender_handle());
 }
 #endif