Revert 269855 "Only commit cookie changes in prerenders after a ..."

trunk/src/chrome/browser/prerender/prerender_unittest.cc

Index: trunk/src/chrome/browser/prerender/prerender_unittest.cc
===================================================================
--- trunk/src/chrome/browser/prerender/prerender_unittest.cc	(revision 269877)
+++ trunk/src/chrome/browser/prerender/prerender_unittest.cc	(working copy)
@@ -52,8 +52,7 @@
   virtual void StartPrerendering(
       int ALLOW_UNUSED creator_child_id,
       const gfx::Size& ALLOW_UNUSED size,
-      content::SessionStorageNamespace* ALLOW_UNUSED session_storage_namespace,
-      net::URLRequestContextGetter* ALLOW_UNUSED request_context)
+      content::SessionStorageNamespace* ALLOW_UNUSED session_storage_namespace)
       OVERRIDE;
 
   virtual bool GetChildId(int* child_id) const OVERRIDE {
@@ -102,7 +101,6 @@
         time_ticks_(TimeTicks::Now()),
         prerender_tracker_(prerender_tracker) {
     set_rate_limit_enabled(false);
-    OnCookieStoreLoaded();
   }
 
   virtual ~UnitTestPrerenderManager() {
@@ -231,11 +229,6 @@
     prerender_contents_map_.erase(std::make_pair(child_id, route_id));
   }
 
- protected:
-  virtual net::URLRequestContextGetter* GetURLRequestContext() OVERRIDE {
-    return NULL;
-  }
-
  private:
   void SetNextPrerenderContents(DummyPrerenderContents* prerender_contents) {
     CHECK(!next_prerender_contents_.get());
@@ -303,8 +296,7 @@
 void DummyPrerenderContents::StartPrerendering(
     int ALLOW_UNUSED creator_child_id,
     const gfx::Size& ALLOW_UNUSED size,
-    content::SessionStorageNamespace* ALLOW_UNUSED session_storage_namespace,
-    net::URLRequestContextGetter* ALLOW_UNUSED request_context) {
+    content::SessionStorageNamespace* ALLOW_UNUSED session_storage_namespace) {
   // In the base PrerenderContents implementation, StartPrerendering will
   // be called even when the PrerenderManager is part of the control group,
   // but it will early exit before actually creating a new RenderView if