Refactored cookies persistent store clean-up on shutdown.

net/base/cookie_monster.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.
 
 // Brought to you by the letter D and the number 2.
 
 #ifndef NET_BASE_COOKIE_MONSTER_H_
 #define NET_BASE_COOKIE_MONSTER_H_
 #pragma once
 
@@ skipping 188 matching lines @@
   // "enable_file_scheme_".
   // If this this method is called, it must be called before first use of
   // the instance (i.e. as part of the instance initialization process).
   void SetCookieableSchemes(const char* schemes[], size_t num_schemes);
 
   // Overrides the default key and expiry scheme.  See comments
   // before CookieMap and Garbage collection constants for details.  This
   // function must be called before initialization.
   void SetExpiryAndKeyScheme(ExpiryAndKeyScheme key_scheme);
 
+  // Retrieves the persistent store if it exists. This function will return
+  // NULL for incognito mode.
+  PersistentCookieStore* GetPersistentCookieStore() {
+    return store_.get();

[jochen (gone - plz use gerrit), 2010/12/02 16:48:44]

instead of this, add SetClearLocalStateOnExit() to the cookie monster that
relays to it's persistent cookie store if it exists

[Randy Smith (Not in Mondays), 2010/12/02 21:19:26]

Seconded; to the extent possible, I'd like to hide the existence/lack of
existence of a persistent store behind the cookie monster from consumers.

That change should also include adding a test in cookie_monster_unittest.cc to
test the interface (sends to store when there is one, does nothing when there
isn't).

[pastarmovj, 2010/12/03 16:43:02]

Done.

+  }
+
   // There are some unknowns about how to correctly handle file:// cookies,
   // and our implementation for this is not robust enough. This allows you
   // to enable support, but it should only be used for testing. Bug 1157243.
   // Must be called before creating a CookieMonster instance.
   static void EnableFileScheme();
   static bool enable_file_scheme_;
 
  private:
   ~CookieMonster();
 
@@ skipping 450 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(ParsedCookie);
 };
 
 typedef base::RefCountedThreadSafe<CookieMonster::PersistentCookieStore>
     RefcountedPersistentCookieStore;
 
 class CookieMonster::PersistentCookieStore
     : public RefcountedPersistentCookieStore {
  public:
-  virtual ~PersistentCookieStore() { }
+  virtual ~PersistentCookieStore() {}
 
   // Initializes the store and retrieves the existing cookies. This will be
   // called only once at startup.
-  virtual bool Load(std::vector<CookieMonster::CanonicalCookie*>*) = 0;
+  virtual bool Load(std::vector<CookieMonster::CanonicalCookie*>* cookies) = 0;
 
-  virtual void AddCookie(const CanonicalCookie&) = 0;
-  virtual void UpdateCookieAccessTime(const CanonicalCookie&) = 0;
-  virtual void DeleteCookie(const CanonicalCookie&) = 0;
+  virtual void AddCookie(const CanonicalCookie& cc) = 0;
+  virtual void UpdateCookieAccessTime(const CanonicalCookie& cc) = 0;
+  virtual void DeleteCookie(const CanonicalCookie& cc) = 0;
+
+  // Sets the value of the user preference whether the persistent storage
+  // must be deleted upon destruction.
+  virtual void SetClearLocalStateOnExit(bool clear_local_state) = 0;
 
  protected:
-  PersistentCookieStore() { }
+  PersistentCookieStore() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(PersistentCookieStore);
 };
 
 }  // namespace net
 
 #endif  // NET_BASE_COOKIE_MONSTER_H_