Refactored cookies persistent store clean-up on shutdown.

chrome/browser/net/chrome_url_request_context.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.
 
 #ifndef CHROME_BROWSER_NET_CHROME_URL_REQUEST_CONTEXT_H_
 #define CHROME_BROWSER_NET_CHROME_URL_REQUEST_CONTEXT_H_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 174 matching lines @@
     extension_info_map_ = map;
   }
   void set_net_log(net::NetLog* net_log) {
     net_log_ = net_log;
   }
   void set_network_delegate(
       net::HttpNetworkDelegate* network_delegate) {
     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_;
 
   scoped_refptr<ChromeAppCacheService> appcache_service_;
   scoped_refptr<webkit_database::DatabaseTracker> database_tracker_;
   scoped_refptr<ChromeCookiePolicy> chrome_cookie_policy_;
   scoped_refptr<HostContentSettingsMap> host_content_settings_map_;
   scoped_refptr<HostZoomMap> host_zoom_map_;
   scoped_refptr<ChromeBlobStorageContext> blob_storage_context_;
   scoped_refptr<BrowserFileSystemContext> browser_file_system_context_;
   scoped_refptr<ExtensionInfoMap> extension_info_map_;
 
   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);
 };
 
 // A URLRequestContextGetter subclass used by the browser. This returns a
 // subclass of URLRequestContext which can be used to store extra information
 // about requests.
 //
 // Most methods are expected to be called on the UI thread, except for
@@ skipping 77 matching lines @@
   // context. This helper method is called from CreateOriginalForMedia and
   // CreateOffTheRecordForMedia.
   static ChromeURLRequestContextGetter* CreateRequestContextForMedia(
       Profile* profile, const FilePath& disk_cache_path, int cache_size,
       bool off_the_record);
 
   // These methods simply forward to the corresponding method on
   // 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,
                                  net::CookieStore** result);
 
   PrefChangeRegistrar registrar_;
 
   // |io_thread_| is always valid during the lifetime of |this| since |this| is
   // deleted on the IO thread.
   IOThread* const io_thread_;
@@ skipping 32 matching lines @@
 
   // Assigns this factory's properties to |context|.
   void ApplyProfileParametersToContext(ChromeURLRequestContext* context);
 
   // Values extracted from the Profile.
   //
   // NOTE: If you add any parameters here, keep it in sync with
   // 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_;
 
   // TODO(aa): I think this can go away now as we no longer support standalone
   // user scripts.
   FilePath user_script_dir_path_;
   scoped_refptr<HostContentSettingsMap> host_content_settings_map_;
   scoped_refptr<ChromeAppCacheService> appcache_service_;
   scoped_refptr<webkit_database::DatabaseTracker> database_tracker_;
   scoped_refptr<HostZoomMap> host_zoom_map_;
   scoped_refptr<net::TransportSecurityState> transport_security_state_;
   scoped_refptr<net::SSLConfigService> ssl_config_service_;
   scoped_refptr<net::CookieMonster::Delegate> cookie_monster_delegate_;
   scoped_refptr<ChromeBlobStorageContext> blob_storage_context_;
   scoped_refptr<BrowserFileSystemContext> browser_file_system_context_;
   scoped_refptr<ExtensionInfoMap> extension_info_map_;
 
   FilePath profile_dir_path_;
 
  private:
   IOThread* const io_thread_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeURLRequestContextFactory);
 };
 
 #endif  // CHROME_BROWSER_NET_CHROME_URL_REQUEST_CONTEXT_H_