Remove the old synchronous CookieMonster API.

chrome/browser/fast_shutdown_interactive_uitest.cc

 // Copyright (c) 2011 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/bind.h"
 #include "base/file_path.h"
 #include "base/stl_util.h"
+#include "base/synchronization/waitable_event.h"
 #include "base/test/test_timeouts.h"
 #include "base/test/thread_test_helper.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/net/sqlite_persistent_cookie_store.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/test/automation/automation_proxy.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
@@ skipping 18 matching lines @@
 #endif
 
 // Enable some temporary debugging to diagnose flakiness on Chrome OS.
 // http://crbug.com/89173. TODO(sreeram): Delete this soon!
 #if defined(OS_CHROMEOS)
 #define HERE(x) LOG(ERROR) << "Here " << (x)
 #else
 #define HERE(x)
 #endif
 
+void LoadCookiesCallback(
+    base::WaitableEvent* event,
+    std::vector<net::CookieMonster::CanonicalCookie*>* cookies,
+    const std::vector<net::CookieMonster::CanonicalCookie*>& cookies_get) {
+  *cookies = cookies_get;
+  event->Signal();
+}
+
 // Loads the cookie store from |user_data_dir|. If the given |cookie| exists,
 // puts the cookie's value in |cookie_value| and sets |has_cookie| to true.
 // Sets |has_cookie| to false if the |cookie| wasn't found.
 static void GetCookie(
     const FilePath& user_data_dir,
     const net::CookieMonster::CanonicalCookie& cookie,
     bool* has_cookie,
     std::string* cookie_value,
     const scoped_refptr<base::ThreadTestHelper>& thread_helper) {
   scoped_refptr<SQLitePersistentCookieStore> cookie_store(
       new SQLitePersistentCookieStore(
           user_data_dir.AppendASCII(chrome::kNotSignedInProfile)
                        .Append(chrome::kCookieFilename)));
   HERE(1);
   std::vector<net::CookieMonster::CanonicalCookie*> cookies;
-  ASSERT_TRUE(cookie_store->Load(&cookies));
+  base::WaitableEvent event(false, false);
+  ASSERT_TRUE(cookie_store->Load(base::Bind(&LoadCookiesCallback,
+                                            base::Unretained(&event),
+                                            base::Unretained(&cookies))));
+  event.Wait();
   HERE(2);
   *has_cookie = false;
   for (size_t i = 0; i < cookies.size(); ++i) {
     if (cookies[i]->IsEquivalent(cookie)) {
       *has_cookie = true;
       *cookie_value = cookies[i]->Value();
     }
   }
   cookie_store = NULL;
   ASSERT_TRUE(thread_helper->Run());
@@ skipping 80 matching lines @@
                   TestTimeouts::action_max_timeout_ms(), &exit_code));
   HERE(24);
   EXPECT_EQ(0, exit_code);  // Expect a clean shutdown.
 
   // Read the cookie and check that it has the expected value.
   GetCookie(user_data_dir(), cookie, &has_cookie, &cookie_value, thread_helper);
   HERE(25);
   EXPECT_TRUE(has_cookie);
   EXPECT_EQ("ohyeah", cookie_value);
 }