Refactored cookies persistent store clean-up on shutdown.

chrome/browser/net/chrome_url_request_context.h

Index: chrome/browser/net/chrome_url_request_context.h
diff --git a/chrome/browser/net/chrome_url_request_context.h b/chrome/browser/net/chrome_url_request_context.h
index e9faf59b3271d1db9e6afceaaa675740cce26f52..01b09f163cf23b0d4bcfdb03b24293d05011b56f 100644
--- a/chrome/browser/net/chrome_url_request_context.h
+++ b/chrome/browser/net/chrome_url_request_context.h
@@ -192,12 +192,19 @@ class ChromeURLRequestContext : public URLRequestContext {
     network_delegate_ = network_delegate;
   }
 
+  void set_clear_local_state_on_exit(bool clear_local_state) {
+    clear_local_state_on_exit_ = clear_local_state;
+  }
+
   // Callback for when the accept language changes.
   void OnAcceptLanguageChange(const std::string& accept_language);
 
   // Callback for when the default charset changes.
   void OnDefaultCharsetChange(const std::string& default_charset);
 
+  // Clears the persistent store if need.

[jochen (gone - plz use gerrit), 2010/12/02 08:45:50]

needed

[pastarmovj, 2010/12/02 14:54:36]

Done.

+  void ClearLocalState();
+
  protected:
   // Path to the directory user scripts are stored in.
   FilePath user_script_dir_path_;
@@ -213,6 +220,7 @@ class ChromeURLRequestContext : public URLRequestContext {
 
   bool is_media_;
   bool is_off_the_record_;
+  bool clear_local_state_on_exit_;

[Randy Smith (Not in Mondays), 2010/12/01 20:39:50]

It didn't look to me as if you were initializing this variable in the
constructors (either default or copy); did I miss that?  Even if
ChromeURLRequestContextGetter sets it immediately after creation, it should be
created with a good default value.

[pastarmovj, 2010/12/02 14:54:36]

Done.

 
  private:
   DISALLOW_COPY_AND_ASSIGN(ChromeURLRequestContext);
@@ -310,6 +318,7 @@ class ChromeURLRequestContextGetter : public URLRequestContextGetter,
   // ChromeURLRequestContext.
   void OnAcceptLanguageChange(const std::string& accept_language);
   void OnDefaultCharsetChange(const std::string& default_charset);
+  void OnClearSiteDataOnExitChange(bool clear_site_data);

[jochen (gone - plz use gerrit), 2010/12/02 08:45:50]

why not ClearLocalState and clear_local_state?

[pastarmovj, 2010/12/02 14:54:36]

To keep the naming convention of the other two functions that has the same names
as the pref keys they are responding to.

 
   // Saves the cookie store to |result| and signals |completion|.
   void GetCookieStoreAsyncHelper(base::WaitableEvent* completion,
@@ -362,6 +371,7 @@ class ChromeURLRequestContextFactory {
   // ApplyProfileParametersToContext().
   bool is_media_;
   bool is_off_the_record_;
+  bool clear_local_state_on_exit_;
   std::string accept_language_;
   std::string accept_charset_;
   std::string referrer_charset_;