Refactored cookies persistent store clean-up on shutdown.

net/base/cookie_monster.h

Index: net/base/cookie_monster.h
diff --git a/net/base/cookie_monster.h b/net/base/cookie_monster.h
index cdb508ee971e0232cd8dd082d088300a809317dc..8f9774906cd6b70586792384b15d2724946c4cac 100644
--- a/net/base/cookie_monster.h
+++ b/net/base/cookie_monster.h
@@ -206,6 +206,14 @@ class CookieMonster : public CookieStore {
   // function must be called before initialization.
   void SetExpiryAndKeyScheme(ExpiryAndKeyScheme key_scheme);
 
+  PersistentCookieStore* GetPersistentCookieStore() {

[Mattias Nissler (ping if slow), 2010/12/01 17:23:24]

We might want to consider to not provide the getter here, but to provide a
ClearLocalState() instead that delegates to ClearLocalState() on the store.
WDYT?

+    return store_.get();
+  }
+
+  void DetachPersistentCookieStore() {
+    store_ = NULL;
+  }
+
   // 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.
@@ -686,6 +694,9 @@ class CookieMonster::PersistentCookieStore
   virtual void UpdateCookieAccessTime(const CanonicalCookie&) = 0;
   virtual void DeleteCookie(const CanonicalCookie&) = 0;
 
+  // Deletes the persistent store file(s).
+  virtual void ClearLocalState() = 0;
+
  protected:
   PersistentCookieStore() { }