Unwire the clear on exit preference from the storage systems.

chrome/browser/profiles/profile_impl_io_data.cc

 // Copyright (c) 2012 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/profiles/profile_impl_io_data.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
@@ skipping 211 matching lines @@
     return;
 
   // Set initialized_ to true at the beginning in case any of the objects
   // below try to get the ResourceContext pointer.
   initialized_ = true;
   PrefService* pref_service = profile_->GetPrefs();
   io_data_->set_http_server_properties_manager(
       new chrome_browser_net::HttpServerPropertiesManager(pref_service));
   ChromeNetworkDelegate::InitializeReferrersEnabled(
       io_data_->enable_referrers(), pref_service);
-  io_data_->clear_local_state_on_exit()->Init(
-      prefs::kClearSiteDataOnExit, pref_service, NULL);
-  io_data_->clear_local_state_on_exit()->MoveToThread(BrowserThread::IO);
   io_data_->session_startup_pref()->Init(
       prefs::kRestoreOnStartup, pref_service, NULL);
   io_data_->session_startup_pref()->MoveToThread(BrowserThread::IO);
 #if defined(ENABLE_SAFE_BROWSING)
   io_data_->safe_browsing_enabled()->Init(prefs::kSafeBrowsingEnabled,
       pref_service, NULL);
   io_data_->safe_browsing_enabled()->MoveToThread(BrowserThread::IO);
 #endif
   io_data_->InitializeOnUIThread(profile_);
 }
 
 ProfileImplIOData::LazyParams::LazyParams()
     : cache_max_size(0),
       media_cache_max_size(0),
       restore_old_session_cookies(false) {}
 
 ProfileImplIOData::LazyParams::~LazyParams() {}
 
 ProfileImplIOData::ProfileImplIOData()
-    : ProfileIOData(false),
-      clear_local_state_on_exit_(false) {}
+    : ProfileIOData(false) {}
 ProfileImplIOData::~ProfileImplIOData() {
   DestroyResourceContext();
 
   if (media_request_context_.get())
     media_request_context_->AssertNoURLRequests();
 }
 
 void ProfileImplIOData::LazyInitializeInternal(
     ProfileParams* profile_params) const {
-  // Keep track of clear_local_state_on_exit for isolated apps.
-  clear_local_state_on_exit_ = profile_params->clear_local_state_on_exit;
-
   ChromeURLRequestContext* main_context = main_request_context();
   ChromeURLRequestContext* extensions_context = extensions_request_context();
   media_request_context_.reset(new ChromeURLRequestContext);
 
   IOThread* const io_thread = profile_params->io_thread;
   IOThread::Globals* const io_thread_globals = io_thread->globals();
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   bool record_mode = chrome::kRecordModeEnabled &&
                      command_line.HasSwitch(switches::kRecordMode);
   bool playback_mode = command_line.HasSwitch(switches::kPlaybackMode);
@@ skipping 65 matching lines @@
 
   // setup cookie store
   if (!cookie_store) {
     DCHECK(!lazy_params_->cookie_path.empty());
 
     scoped_refptr<SQLitePersistentCookieStore> cookie_db =
         new SQLitePersistentCookieStore(
             lazy_params_->cookie_path,
             lazy_params_->restore_old_session_cookies,
             new ClearOnExitPolicy(lazy_params_->special_storage_policy));
-    cookie_db->SetClearLocalStateOnExit(
-        profile_params->clear_local_state_on_exit);
     cookie_store =
         new net::CookieMonster(cookie_db.get(),
                                profile_params->cookie_monster_delegate);
     if (!command_line.HasSwitch(switches::kDisableRestoreSessionState))
       cookie_store->GetCookieMonster()->SetPersistSessionCookies(true);
   }
 
   net::CookieMonster* extensions_cookie_store =
       new net::CookieMonster(
           new SQLitePersistentCookieStore(
               lazy_params_->extensions_cookie_path,
               lazy_params_->restore_old_session_cookies, NULL), NULL);
   // Enable cookies for devtools and extension URLs.
   const char* schemes[] = {chrome::kChromeDevToolsScheme,
                            chrome::kExtensionScheme};
   extensions_cookie_store->SetCookieableSchemes(schemes, 2);
 
   main_context->set_cookie_store(cookie_store);
   media_request_context_->set_cookie_store(cookie_store);
   extensions_context->set_cookie_store(extensions_cookie_store);
 
   // Setup server bound cert service.
   if (!server_bound_cert_service) {
     DCHECK(!lazy_params_->server_bound_cert_path.empty());
 
     scoped_refptr<SQLiteServerBoundCertStore> server_bound_cert_db =
         new SQLiteServerBoundCertStore(
             lazy_params_->server_bound_cert_path,
             new ClearOnExitPolicy(lazy_params_->special_storage_policy));
-    server_bound_cert_db->SetClearLocalStateOnExit(
-        profile_params->clear_local_state_on_exit);
     server_bound_cert_service = new net::ServerBoundCertService(
         new net::DefaultServerBoundCertStore(server_bound_cert_db.get()),
         base::WorkerPool::GetTaskRunner(true));
   }
 
   set_server_bound_cert_service(server_bound_cert_service);
   main_context->set_server_bound_cert_service(server_bound_cert_service);
   media_request_context_->set_server_bound_cert_service(
       server_bound_cert_service);
 
@@ skipping 102 matching lines @@
     app_http_cache->set_mode(
         record_mode ? net::HttpCache::RECORD : net::HttpCache::PLAYBACK);
   }
 
   // Use an app-specific cookie store.
   if (!cookie_store) {
     DCHECK(!cookie_path.empty());
 
     scoped_refptr<SQLitePersistentCookieStore> cookie_db =
         new SQLitePersistentCookieStore(cookie_path, false, NULL);
-    cookie_db->SetClearLocalStateOnExit(clear_local_state_on_exit_);
     // TODO(creis): We should have a cookie delegate for notifying the cookie
     // extensions API, but we need to update it to understand isolated apps
     // first.
     cookie_store = new net::CookieMonster(cookie_db.get(), NULL);
   }
 
   context->SetCookieStore(cookie_store);
   context->SetHttpTransactionFactory(app_http_cache);
 
   return context;
@@ skipping 19 matching lines @@
 void ProfileImplIOData::ClearNetworkingHistorySinceOnIOThread(
     base::Time time) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   LazyInitialize();
 
   DCHECK(transport_security_state());
   transport_security_state()->DeleteSince(time);
   DCHECK(http_server_properties_manager());
   http_server_properties_manager()->Clear();
 }