Only commit cookie changes in prerenders after a prerender is shown

chrome/browser/net/cookie_store_util.cc

Index: chrome/browser/net/cookie_store_util.cc
===================================================================
--- chrome/browser/net/cookie_store_util.cc	(revision 269838)
+++ chrome/browser/net/cookie_store_util.cc	(working copy)
@@ -12,6 +12,8 @@
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/net/chrome_cookie_notification_details.h"
 #include "chrome/browser/net/evicted_domain_cookie_counter.h"
+#include "chrome/browser/prerender/prerender_manager.h"
+#include "chrome/browser/prerender/prerender_manager_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/chrome_constants.h"
@@ -49,6 +51,13 @@
                    this, cookie, removed, cause));
   }
 
+  virtual void OnLoaded() OVERRIDE {
+    BrowserThread::PostTask(
+        BrowserThread::UI, FROM_HERE,
+        base::Bind(&ChromeCookieMonsterDelegate::OnLoadedAsyncHelper,
+                   this));
+  }
+
  private:
   virtual ~ChromeCookieMonsterDelegate() {}
 
@@ -73,6 +82,16 @@
     }
   }
 
+  void OnLoadedAsyncHelper() {
+    Profile* profile = profile_getter_.Run();
+    if (profile) {
+      prerender::PrerenderManager* prerender_manager =
+          prerender::PrerenderManagerFactory::GetForProfile(profile);
+      if (prerender_manager)
+        prerender_manager->OnCookieStoreLoaded();
+    }
+  }
+
   const base::Callback<Profile*(void)> profile_getter_;
 };