Revert 105639 - The change list splits loading of cookies from DB by the domain key(eTLD+1).

net/base/cookie_monster_store_test.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 "net/base/cookie_monster_store_test.h"
 
-#include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/stringprintf.h"
 #include "base/time.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
-LoadedCallbackTask::LoadedCallbackTask(LoadedCallback loaded_callback,
-                   std::vector<CookieMonster::CanonicalCookie*> cookies)
-    : loaded_callback_(loaded_callback),
-      cookies_(cookies) {
-}
-
-LoadedCallbackTask::~LoadedCallbackTask() {}
 
 MockPersistentCookieStore::MockPersistentCookieStore()
-    : load_return_value_(true),
-      loaded_(false) {
+    : load_return_value_(true) {
 }
 
 MockPersistentCookieStore::~MockPersistentCookieStore() {}
 
 void MockPersistentCookieStore::SetLoadExpectation(
     bool return_value,
     const std::vector<CookieMonster::CanonicalCookie*>& result) {
   load_return_value_ = return_value;
   load_result_ = result;
 }
 
-void MockPersistentCookieStore::Load(const LoadedCallback& loaded_callback) {
+bool MockPersistentCookieStore::Load(const LoadedCallback& loaded_callback) {
+  bool ok = load_return_value_;
   std::vector<CookieMonster::CanonicalCookie*> out_cookies;
-  if (load_return_value_) {
+  if (ok) {
     out_cookies = load_result_;
-    loaded_ = true;
   }
-  MessageLoop::current()->PostTask(FROM_HERE,
-    base::Bind(&LoadedCallbackTask::Run,
-               new LoadedCallbackTask(loaded_callback, out_cookies)));
-}
-
-void MockPersistentCookieStore::LoadCookiesForKey(const std::string& key,
-    const LoadedCallback& loaded_callback) {
-  if (!loaded_) {
-    Load(loaded_callback);
-  } else {
-    MessageLoop::current()->PostTask(FROM_HERE,
-      base::Bind(&LoadedCallbackTask::Run,
-        new LoadedCallbackTask(loaded_callback,
-          std::vector<CookieMonster::CanonicalCookie*>())));
-  }
+  loaded_callback.Run(out_cookies);
+  return ok;
 }
 
 void MockPersistentCookieStore::AddCookie(
     const CookieMonster::CanonicalCookie& cookie) {
   commands_.push_back(
       CookieStoreCommand(CookieStoreCommand::ADD, cookie));
 }
 
 void MockPersistentCookieStore::UpdateCookieAccessTime(
     const CookieMonster::CanonicalCookie& cookie) {
@@ skipping 60 matching lines @@
   std::string cookie_path = pc.Path();
 
   return CookieMonster::CanonicalCookie(
       GURL(), pc.Name(), pc.Value(), key, cookie_path,
       pc.MACKey(), pc.MACAlgorithm(),
       creation_time, creation_time, cookie_expires,
       pc.IsSecure(), pc.IsHttpOnly(),
       !cookie_expires.is_null());
 }
 
-MockSimplePersistentCookieStore::MockSimplePersistentCookieStore()
-    : loaded_(false) {}
+MockSimplePersistentCookieStore::MockSimplePersistentCookieStore() {}
 
 MockSimplePersistentCookieStore::~MockSimplePersistentCookieStore() {}
 
-void MockSimplePersistentCookieStore::Load(
+bool MockSimplePersistentCookieStore::Load(
     const LoadedCallback& loaded_callback) {
   std::vector<CookieMonster::CanonicalCookie*> out_cookies;
-
   for (CanonicalCookieMap::const_iterator it = cookies_.begin();
        it != cookies_.end(); it++)
     out_cookies.push_back(
         new CookieMonster::CanonicalCookie(it->second));
-
-  MessageLoop::current()->PostTask(FROM_HERE,
-    base::Bind(&LoadedCallbackTask::Run,
-               new LoadedCallbackTask(loaded_callback, out_cookies)));
-  loaded_ = true;
-}
-
-void MockSimplePersistentCookieStore::LoadCookiesForKey(const std::string& key,
-    const LoadedCallback& loaded_callback) {
-  if (!loaded_) {
-    Load(loaded_callback);
-  } else {
-    MessageLoop::current()->PostTask(FROM_HERE,
-      base::Bind(&LoadedCallbackTask::Run,
-        new LoadedCallbackTask(loaded_callback,
-          std::vector<CookieMonster::CanonicalCookie*>())));
-  }
+  loaded_callback.Run(out_cookies);
+  return true;
 }
 
 void MockSimplePersistentCookieStore::AddCookie(
     const CookieMonster::CanonicalCookie& cookie) {
   int64 creation_time = cookie.CreationDate().ToInternalValue();
   EXPECT_TRUE(cookies_.find(creation_time) == cookies_.end());
   cookies_[creation_time] = cookie;
 }
 
 void MockSimplePersistentCookieStore::UpdateCookieAccessTime(
@@ skipping 44 matching lines @@
         GURL(), "a", "1", base::StringPrintf("h%05d.izzle", i), "/path",
         mac_key, mac_algorithm, creation_time, expiration_time,
         last_access_time, false, false, true);
     store->AddCookie(cc);
   }
 
   return new CookieMonster(store, NULL);
 }
 
 }  // namespace net