Refactored cookies persistent store clean-up on shutdown.

chrome/browser/net/chrome_url_request_context.cc

 // 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.
 
 #include "chrome/browser/net/chrome_url_request_context.h"
 
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "base/string_number_conversions.h"
@@ skipping 28 matching lines @@
 #include "webkit/glue/webkit_glue.h"
 
 #if defined(USE_NSS)
 #include "net/ocsp/nss_ocsp.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/proxy_config_service.h"
 #endif  // defined(OS_CHROMEOS)
 
+using net::CookieMonster;

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

The Chrome style guide forbids "using" directives.  Instead,
you always specify the namespace/class at point of call.

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

Done.

+
 namespace {
 
 // ----------------------------------------------------------------------------
 // Helper methods to check current thread
 // ----------------------------------------------------------------------------
 
 void CheckCurrentlyOnIOThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 }
 
@@ skipping 476 matching lines @@
   DCHECK(factory);
 
   // If a base profile was specified, listen for changes to the preferences.
   if (profile)
     RegisterPrefsObserver(profile);
 }
 
 ChromeURLRequestContextGetter::~ChromeURLRequestContextGetter() {
   CheckCurrentlyOnIOThread();
 
+  // Clean up the local state of the context if it was created.
+  if (url_request_context_.get()) {
+    ChromeURLRequestContext* chrome_url_request_context =
+        static_cast<ChromeURLRequestContext*>(url_request_context_.get());
+    chrome_url_request_context->ClearLocalState();
+  }

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

It looks to me as if the other url request context related destruction work
occurs in the ChromeURLRequestContext destructor, not in the getter destructor. 
Is there a reason you didn't do this there?

+
   DCHECK(registrar_.IsEmpty()) << "Probably didn't call CleanupOnUIThread";
 
   // Either we already transformed the factory into a URLRequestContext, or
   // we still have a pending factory.
   DCHECK((factory_.get() && !url_request_context_.get()) ||
          (!factory_.get() && url_request_context_.get()));
 
   if (url_request_context_)
     io_thread_->UnregisterURLRequestContextGetter(this);
 
@@ skipping 143 matching lines @@
               accept_language));
     } else if (*pref_name_in == prefs::kDefaultCharset) {
       std::string default_charset =
           prefs->GetString(prefs::kDefaultCharset);
       BrowserThread::PostTask(
           BrowserThread::IO, FROM_HERE,
           NewRunnableMethod(
               this,
               &ChromeURLRequestContextGetter::OnDefaultCharsetChange,
               default_charset));
+    } else if (*pref_name_in == prefs::kClearSiteDataOnExit) {
+      bool clear_site_data =
+          prefs->GetBoolean(prefs::kClearSiteDataOnExit);
+      BrowserThread::PostTask(
+          BrowserThread::IO, FROM_HERE,
+          NewRunnableMethod(
+              this,
+              &ChromeURLRequestContextGetter::OnClearSiteDataOnExitChange,
+              clear_site_data));
     }
   } else {
     NOTREACHED();
   }
 }
 
 void ChromeURLRequestContextGetter::RegisterPrefsObserver(Profile* profile) {
   CheckCurrentlyOnMainThread();
 
   registrar_.Init(profile->GetPrefs());
   registrar_.Add(prefs::kAcceptLanguages, this);
   registrar_.Add(prefs::kDefaultCharset, this);
+  registrar_.Add(prefs::kClearSiteDataOnExit, this);
 }
 
 // static
 ChromeURLRequestContextGetter*
 ChromeURLRequestContextGetter::CreateRequestContextForMedia(
     Profile* profile, const FilePath& disk_cache_path, int cache_size,
     bool off_the_record) {
   return new ChromeURLRequestContextGetter(
       profile,
       new FactoryForMedia(profile,
                           disk_cache_path,
                           cache_size,
                           off_the_record));
 }
 
 void ChromeURLRequestContextGetter::OnAcceptLanguageChange(
     const std::string& accept_language) {
   GetIOContext()->OnAcceptLanguageChange(accept_language);
 }
 
 void ChromeURLRequestContextGetter::OnDefaultCharsetChange(
     const std::string& default_charset) {
   GetIOContext()->OnDefaultCharsetChange(default_charset);
 }
 
+void ChromeURLRequestContextGetter::OnClearSiteDataOnExitChange(
+    bool clear_site_data) {
+  GetIOContext()->set_clear_local_state_on_exit(clear_site_data);
+}
+
 void ChromeURLRequestContextGetter::GetCookieStoreAsyncHelper(
     base::WaitableEvent* completion,
     net::CookieStore** result) {
   // Note that CookieStore is refcounted, yet we do not add a reference.
   *result = GetURLRequestContext()->cookie_store();
   completion->Signal();
 }
 
 // ----------------------------------------------------------------------------
 // ChromeURLRequestContext
@@ skipping 82 matching lines @@
   appcache_service_ = other->appcache_service_;
   database_tracker_ = other->database_tracker_;
   chrome_cookie_policy_ = other->chrome_cookie_policy_;
   host_content_settings_map_ = other->host_content_settings_map_;
   host_zoom_map_ = other->host_zoom_map_;
   is_media_ = other->is_media_;
   is_off_the_record_ = other->is_off_the_record_;
   blob_storage_context_ = other->blob_storage_context_;
   browser_file_system_context_ = other->browser_file_system_context_;
   extension_info_map_ = other->extension_info_map_;
+  clear_local_state_on_exit_ = other->clear_local_state_on_exit_;
 }
 
 void ChromeURLRequestContext::OnAcceptLanguageChange(
     const std::string& accept_language) {
   CheckCurrentlyOnIOThread();
   accept_language_ =
       net::HttpUtil::GenerateAcceptLanguageHeader(accept_language);
 }
 
 void ChromeURLRequestContext::OnDefaultCharsetChange(
     const std::string& default_charset) {
   CheckCurrentlyOnIOThread();
   referrer_charset_ = default_charset;
   accept_charset_ =
       net::HttpUtil::GenerateAcceptCharsetHeader(default_charset);
 }
 
+void ChromeURLRequestContext::ClearLocalState()
+{

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

brace goes on previous line.

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

Done.

+  CheckCurrentlyOnIOThread();
+  if (clear_local_state_on_exit_) {
+    scoped_refptr<CookieMonster::PersistentCookieStore> store =
+        cookie_store_->GetCookieMonster()->GetPersistentCookieStore();
+    cookie_store_->GetCookieMonster()->DetachPersistentCookieStore();
+    BrowserThread::PostTask(
+        BrowserThread::FILE,
+        FROM_HERE,
+        NewRunnableMethod(
+            store.get(),
+            &CookieMonster::PersistentCookieStore::ClearLocalState));
+  }
+}
+
 // ----------------------------------------------------------------------------
 // ChromeURLRequestContextFactory
 // ----------------------------------------------------------------------------
 
 // Extract values from |profile| and copy them into
 // ChromeURLRequestContextFactory. We will use them later when constructing the
 // ChromeURLRequestContext on the IO thread (see
 // ApplyProfileParametersToContext() which reverses this).
 ChromeURLRequestContextFactory::ChromeURLRequestContextFactory(Profile* profile)
     : is_media_(false),
       is_off_the_record_(profile->IsOffTheRecord()),
       io_thread_(g_browser_process->io_thread()) {
   CheckCurrentlyOnMainThread();
   PrefService* prefs = profile->GetPrefs();
 
   // Set up Accept-Language and Accept-Charset header values
   accept_language_ = net::HttpUtil::GenerateAcceptLanguageHeader(
       prefs->GetString(prefs::kAcceptLanguages));
   std::string default_charset = prefs->GetString(prefs::kDefaultCharset);
   accept_charset_ =
       net::HttpUtil::GenerateAcceptCharsetHeader(default_charset);
+  clear_local_state_on_exit_ = prefs->GetBoolean(prefs::kClearSiteDataOnExit);
 
   // At this point, we don't know the charset of the referring page
   // where a url request originates from. This is used to get a suggested
   // filename from Content-Disposition header made of raw 8bit characters.
   // Down the road, it can be overriden if it becomes known (for instance,
   // when download request is made through the context menu in a web page).
   // At the moment, it'll remain 'undeterministic' when a user
   // types a URL in the omnibar or click on a download link in a page.
   // For the latter, we need a change on the webkit-side.
   // We initialize it to the default charset here and a user will
@@ skipping 36 matching lines @@
   context->set_host_content_settings_map(host_content_settings_map_);
   context->set_host_zoom_map(host_zoom_map_);
   context->set_transport_security_state(
       transport_security_state_);
   context->set_ssl_config_service(ssl_config_service_);
   context->set_appcache_service(appcache_service_);
   context->set_database_tracker(database_tracker_);
   context->set_blob_storage_context(blob_storage_context_);
   context->set_browser_file_system_context(browser_file_system_context_);
   context->set_extension_info_map(extension_info_map_);
+  context->set_clear_local_state_on_exit(clear_local_state_on_exit_);
 }