Refactored cookies persistent store clean-up on shutdown.

net/base/cookie_monster_store_test.h

 // Copyright (c) 2010 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.
 
 #include "base/time.h"
 #include "net/base/cookie_monster.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 // Describes a call to one of the 3 functions of PersistentCookieStore.
 struct CookieStoreCommand {
   enum Type {
     ADD,
     UPDATE_ACCESS_TIME,
-    REMOVE,
+    REMOVE

[jochen (gone - plz use gerrit), 2010/12/02 15:09:51]

please leave the ,

[pastarmovj, 2010/12/02 16:29:07]

Done.

   };
 
   CookieStoreCommand(Type type,
                      const net::CookieMonster::CanonicalCookie& cookie)
       : type(type),
         cookie(cookie) {}
 
   Type type;
   net::CookieMonster::CanonicalCookie cookie;
 };
@@ skipping 27 matching lines @@
     commands_.push_back(CookieStoreCommand(
         CookieStoreCommand::UPDATE_ACCESS_TIME, cookie));
   }
 
   virtual void DeleteCookie(
       const net::CookieMonster::CanonicalCookie& cookie) {
     commands_.push_back(
         CookieStoreCommand(CookieStoreCommand::REMOVE, cookie));
   }
 
+  // No files are created so nothing to clear either
+  virtual void SetClearLocalStateOnExit(bool clear_local_state) {}
+
   void SetLoadExpectation(
       bool return_value,
       const std::vector<net::CookieMonster::CanonicalCookie*>& result) {
     load_return_value_ = return_value;
     load_result_ = result;
   }
 
   const CommandList& commands() const {
     return commands_;
   }
@@ skipping 99 matching lines @@
   }
 
   virtual void DeleteCookie(
       const net::CookieMonster::CanonicalCookie& cookie) {
     int64 creation_time = cookie.CreationDate().ToInternalValue();
     CanonicalCookieMap::iterator it = cookies_.find(creation_time);
     ASSERT_TRUE(it != cookies_.end());
     cookies_.erase(it);
   }
 
+  virtual void SetClearLocalStateOnExit(bool clear_local_state) {}
+
  private:
   CanonicalCookieMap cookies_;
 };
 
 // Helper function for creating a CookieMonster backed by a
 // MockSimplePersistentCookieStore for garbage collection testing.
 //
 // Fill the store through import with |num_cookies| cookies, |num_old_cookies|
 // with access time Now()-days_old, the rest with access time Now().
 // Do two SetCookies().  Return whether each of the two SetCookies() took
@@ skipping 21 matching lines @@
         "a", "1", StringPrintf("h%05d.izzle", i), "/path", false, false,
         past_creation + base::TimeDelta::FromMicroseconds(i), current,
         true, current + base::TimeDelta::FromDays(30));
     store->AddCookie(cc);
   }
 
   return new net::CookieMonster(store, NULL);
 }
 
 }  // namespace