Only commit cookie changes in prerenders after a prerender is shown

chrome/browser/prerender/prerender_manager.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_PRERENDER_PRERENDER_MANAGER_H_
 #define CHROME_BROWSER_PRERENDER_PRERENDER_MANAGER_H_
 
 #include <list>
 #include <map>
 #include <string>
@@ skipping 277 matching lines @@
 
   // MediaCaptureDevicesDispatcher::Observer
   virtual void OnCreatingAudioStream(int render_process_id,
                                      int render_frame_id) OVERRIDE;
 
   const Config& config() const { return config_; }
   Config& mutable_config() { return config_; }
 
   PrerenderTracker* prerender_tracker() { return prerender_tracker_; }
 
+  bool cookie_store_loaded() { return cookie_store_loaded_; }
+
   // Adds a condition. This is owned by the PrerenderManager.
   void AddCondition(const PrerenderCondition* condition);
 
   // Records that some visible tab navigated (or was redirected) to the
   // provided URL.
   void RecordNavigation(const GURL& url);
 
   // Updates the LoggedInPredictor state to reflect that a login has likely
   // on the URL provided.
   void RecordLikelyLoginOnURL(const GURL& url);
@@ skipping 45 matching lines @@
   static void HangSessionStorageMergesForTesting();
 
   // Notification that a prerender has completed and its bytes should be
   // recorded.
   void RecordNetworkBytes(bool used, int64 prerender_bytes);
 
   // Add to the running tally of bytes transferred over the network for this
   // profile if prerendering is currently enabled.
   void AddProfileNetworkBytesIfEnabled(int64 bytes);
 
+  // To be called once the cookie store for this profile has been loaded.
+  void OnCookieStoreLoaded();
+
+  // For testing purposes. Issues a callback once the cookie store has been
+  // loaded.
+  void set_on_cookie_store_loaded_cb(base::Closure cb) {

[Charlie Reis, 2014/05/07 17:21:32]

I think we typically include "_for_testing" in the name to make it easier to
spot places that try to call such functions in normal code.

[tburkard, 2014/05/07 18:34:27]

Done.

+    on_cookie_store_loaded_cb_ = cb;
+  }
+
  protected:
   class PendingSwap;
   class PrerenderData : public base::SupportsWeakPtr<PrerenderData> {
    public:
     struct OrderByExpiryTime;
 
     PrerenderData(PrerenderManager* manager,
                   PrerenderContents* contents,
                   base::TimeTicks expiry_time);
 
@@ skipping 131 matching lines @@
   void SetPrerenderContentsFactory(
       PrerenderContents::Factory* prerender_contents_factory);
 
   // Called by a PrerenderData to signal that the launcher has navigated away
   // from the context that launched the prerender. A user may have clicked
   // a link in a page containing a <link rel=prerender> element, or the user
   // might have committed an omnibox navigation. This is used to possibly
   // shorten the TTL of the prerendered page.
   void SourceNavigatedAway(PrerenderData* prerender_data);
 
+  // Gets the request context for the profile.
+  // For unit tests, this will be overriden to return NULL, since it is not
+  // needed.
+  virtual net::URLRequestContextGetter* GetURLRequestContext();
+
  private:
   friend class ::InstantSearchPrerendererTest;
   friend class PrerenderBrowserTest;
   friend class PrerenderContents;
   friend class PrerenderHandle;
   friend class UnitTestPrerenderManager;
 
   class OnCloseWebContentsDeleter;
   struct NavigationRecord;
 
@@ skipping 189 matching lines @@
 
   CancelableRequestConsumer query_url_consumer_;
 
   // The number of bytes transferred over the network for the profile this
   // PrerenderManager is attached to.
   int64 profile_network_bytes_;
 
   // The value of profile_network_bytes_ that was last recorded.
   int64 last_recorded_profile_network_bytes_;
 
+  // Indicates whether the cookie store for this profile has fully loaded yet.
+  bool cookie_store_loaded_;
+
+  base::Closure on_cookie_store_loaded_cb_;
+
   DISALLOW_COPY_AND_ASSIGN(PrerenderManager);
 };
 
 }  // namespace prerender
 
 #endif  // CHROME_BROWSER_PRERENDER_PRERENDER_MANAGER_H_