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

trunk/src/chrome/browser/extensions/activity_log/activity_log_browsertest.cc

 // Copyright (c) 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 "base/strings/stringprintf.h"
 #include "chrome/browser/extensions/activity_log/activity_log.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/prerender/prerender_handle.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/prerender/prerender_manager_factory.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/ui_test_utils.h"
-#include "content/public/browser/browser_context.h"
-#include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
-#include "content/public/browser/storage_partition.h"
 #include "content/public/test/browser_test_utils.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 
 namespace extensions {
 
 // Only the prerender tests are in this file. To add tests for activity
 // logging please see:
 //    chrome/test/data/extensions/api_test/activity_log_private/README
 
@@ skipping 66 matching lines @@
   ASSERT_TRUE(web_contents);
 
   content::WindowedNotificationObserver page_observer(
       content::NOTIFICATION_LOAD_STOP,
       content::NotificationService::AllSources());
 
   GURL url(base::StringPrintf(
       "http://www.google.com.bo:%d/test.html",
       port));
 
-  if (!prerender_manager->cookie_store_loaded()) {
-    base::RunLoop loop;
-    prerender_manager->set_on_cookie_store_loaded_cb_for_testing(
-        loop.QuitClosure());
-    loop.Run();
-  }
-
   const gfx::Size kSize(640, 480);
   scoped_ptr<prerender::PrerenderHandle> prerender_handle(
       prerender_manager->AddPrerenderFromLocalPredictor(
           url,
           web_contents->GetController().GetDefaultSessionStorageNamespace(),
           kSize));
 
   page_observer.Wait();
 
   activity_log->GetFilteredActions(
       ext->id(),
       Action::ACTION_ANY,
       "",
       "",
       "",
       -1,
       base::Bind(
           ActivityLogPrerenderTest::Prerender_Arguments, ext->id(), port));
 
   // Allow invocation of Prerender_Arguments
   base::MessageLoop::current()->Run();
 }
 
 }  // namespace extensions