Re-land http://codereview.chromium.org/7831056/ and http://codereview.chromium.org/7833042/ .

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/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 {
 
 MockPersistentCookieStore::MockPersistentCookieStore()
     : 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;
 }
 
-bool MockPersistentCookieStore::Load(
-    std::vector<CookieMonster::CanonicalCookie*>* out_cookies) {
+bool MockPersistentCookieStore::Load(const LoadedCallback& loaded_callback) {
   bool ok = load_return_value_;
-  if (ok)
-    *out_cookies = load_result_;
+  std::vector<CookieMonster::CanonicalCookie*> out_cookies;
+  if (ok) {
+    out_cookies = load_result_;
+  }
+  loaded_callback.Run(out_cookies);
   return ok;
 }
 
 void MockPersistentCookieStore::AddCookie(
     const CookieMonster::CanonicalCookie& cookie) {
   commands_.push_back(
       CookieStoreCommand(CookieStoreCommand::ADD, cookie));
 }
 
 void MockPersistentCookieStore::UpdateCookieAccessTime(
@@ skipping 28 matching lines @@
   changes_.push_back(notification);
 }
 
 MockCookieMonsterDelegate::~MockCookieMonsterDelegate() {}
 
 void AddCookieToList(
     const std::string& key,
     const std::string& cookie_line,
     const base::Time& creation_time,
     std::vector<CookieMonster::CanonicalCookie*>* out_list) {
+  scoped_ptr<CookieMonster::CanonicalCookie> cookie(
+      new CookieMonster::CanonicalCookie(
+          BuildCanonicalCookie(key, cookie_line, creation_time)));
+
+  out_list->push_back(cookie.release());
+}
+
+CookieMonster::CanonicalCookie BuildCanonicalCookie(
+    const std::string& key,
+    const std::string& cookie_line,
+    const base::Time& creation_time) {
 
   // Parse the cookie line.
   CookieMonster::ParsedCookie pc(cookie_line);
   EXPECT_TRUE(pc.IsValid());
 
   // This helper is simplistic in interpreting a parsed cookie, in order to
   // avoid duplicated CookieMonster's CanonPath() and CanonExpiration()
   // functions. Would be nice to export them, and re-use here.
   EXPECT_FALSE(pc.HasMaxAge());
   EXPECT_TRUE(pc.HasPath());
   base::Time cookie_expires = pc.HasExpires() ?
       CookieMonster::ParseCookieTime(pc.Expires()) : base::Time();
   std::string cookie_path = pc.Path();
 
-  scoped_ptr<CookieMonster::CanonicalCookie> cookie(
-      new 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()));
-
-  out_list->push_back(cookie.release());
+  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() {}
 
 MockSimplePersistentCookieStore::~MockSimplePersistentCookieStore() {}
 
 bool MockSimplePersistentCookieStore::Load(
-    std::vector<CookieMonster::CanonicalCookie*>* out_cookies) {
+    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(
+    out_cookies.push_back(
         new CookieMonster::CanonicalCookie(it->second));
+  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;
 }
 
@@ skipping 45 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