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

net/base/cookie_monster_store_test.h

 // 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.
 
 // This file contains test infrastructure for multiple files
 // (current cookie_monster_unittest.cc and cookie_monster_perftest.cc)
 // that need to test out CookieMonster interactions with the backing store.
 // It should only be included by test code.
 
+#ifndef NET_BASE_COOKIE_MONSTER_STORE_TEST_H_
+#define NET_BASE_COOKIE_MONSTER_STORE_TEST_H_
+#pragma once
+
+#include <map>
+#include <utility>
+#include <string>
+#include <vector>
 #include "net/base/cookie_monster.h"
 
 namespace base {
 class Time;
 }
 
 namespace net {
 
 // Describes a call to one of the 3 functions of PersistentCookieStore.
 struct CookieStoreCommand {
@@ skipping 24 matching lines @@
   virtual ~MockPersistentCookieStore();
 
   void SetLoadExpectation(
       bool return_value,
       const std::vector<CookieMonster::CanonicalCookie*>& result);
 
   const CommandList& commands() const {
     return commands_;
   }
 
-  virtual bool Load(
-      std::vector<CookieMonster::CanonicalCookie*>* out_cookies);
+  virtual bool Load(const LoadedCallback& loaded_callback) OVERRIDE;
 
-  virtual void AddCookie(const CookieMonster::CanonicalCookie& cookie);
+  virtual void AddCookie(const CookieMonster::CanonicalCookie& cookie) OVERRIDE;
 
   virtual void UpdateCookieAccessTime(
-      const CookieMonster::CanonicalCookie& cookie);
+      const CookieMonster::CanonicalCookie& cookie) OVERRIDE;
 
   virtual void DeleteCookie(
-      const CookieMonster::CanonicalCookie& cookie);
+      const CookieMonster::CanonicalCookie& cookie) OVERRIDE;
 
-  virtual void Flush(Task* completion_task);
+  virtual void Flush(Task* completion_task) OVERRIDE;
 
   // No files are created so nothing to clear either
-  virtual void SetClearLocalStateOnExit(bool clear_local_state);
+  virtual void SetClearLocalStateOnExit(bool clear_local_state) OVERRIDE;
 
  private:
   CommandList commands_;
 
   // Deferred result to use when Load() is called.
   bool load_return_value_;
   std::vector<CookieMonster::CanonicalCookie*> load_result_;
 
   DISALLOW_COPY_AND_ASSIGN(MockPersistentCookieStore);
 };
@@ skipping 16 matching lines @@
       CookieMonster::Delegate::ChangeCause cause);
 
  private:
   virtual ~MockCookieMonsterDelegate();
 
   std::vector<CookieNotification> changes_;
 
   DISALLOW_COPY_AND_ASSIGN(MockCookieMonsterDelegate);
 };
 
+// Helper to build a single CanonicalCookie.
+CookieMonster::CanonicalCookie BuildCanonicalCookie(
+    const std::string& key,
+    const std::string& cookie_line,
+    const base::Time& creation_time);
+
 // Helper to build a list of CanonicalCookie*s.
 void AddCookieToList(
     const std::string& key,
     const std::string& cookie_line,
     const base::Time& creation_time,
     std::vector<CookieMonster::CanonicalCookie*>* out_list);
 
 // Just act like a backing database.  Keep cookie information from
 // Add/Update/Delete and regurgitate it when Load is called.
 class MockSimplePersistentCookieStore
     : public CookieMonster::PersistentCookieStore {
  public:
   MockSimplePersistentCookieStore();
   virtual ~MockSimplePersistentCookieStore();
 
-  virtual bool Load(
-      std::vector<CookieMonster::CanonicalCookie*>* out_cookies);
+  virtual bool Load(const LoadedCallback& loaded_callback);
 
   virtual void AddCookie(
       const CookieMonster::CanonicalCookie& cookie);
 
   virtual void UpdateCookieAccessTime(
       const CookieMonster::CanonicalCookie& cookie);
 
   virtual void DeleteCookie(
       const CookieMonster::CanonicalCookie& cookie);
 
@@ skipping 15 matching lines @@
 // with access time Now()-days_old, the rest with access time Now().
 // Do two SetCookies().  Return whether each of the two SetCookies() took
 // longer than |gc_perf_micros| to complete, and how many cookie were
 // left in the store afterwards.
 CookieMonster* CreateMonsterFromStoreForGC(
     int num_cookies,
     int num_old_cookies,
     int days_old);
 
 }  // namespace net
+
+#endif  // NET_BASE_COOKIE_MONSTER_STORE_TEST_H_