Refactored app cache clear on exit code to happen in the object owning the files.

chrome/browser/profiles/profile_impl.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/profiles/profile_impl.h"
 
 #include "app/resource_bundle.h"
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/file_path.h"
@@ skipping 557 matching lines @@
 }
 
 ChromeAppCacheService* ProfileImpl::GetAppCacheService() {
   if (!appcache_service_) {
     appcache_service_ = new ChromeAppCacheService;
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         NewRunnableMethod(appcache_service_.get(),
                           &ChromeAppCacheService::InitializeOnIOThread,
                           GetPath(), IsOffTheRecord(),
-                          make_scoped_refptr(GetHostContentSettingsMap())));
+                          make_scoped_refptr(GetHostContentSettingsMap()),
+                          clear_local_state_on_exit_));
   }
   return appcache_service_;
 }
 
 webkit_database::DatabaseTracker* ProfileImpl::GetDatabaseTracker() {
   if (!db_tracker_) {
     db_tracker_ = new webkit_database::DatabaseTracker(
         GetPath(), IsOffTheRecord());
   }
   return db_tracker_;
@@ skipping 621 matching lines @@
     } else if (*pref_name_in == prefs::kEnableAutoSpellCorrect) {
       NotificationService::current()->Notify(
           NotificationType::SPELLCHECK_AUTOSPELL_TOGGLED,
               Source<Profile>(this), NotificationService::NoDetails());
     } else if (*pref_name_in == prefs::kClearSiteDataOnExit) {
       clear_local_state_on_exit_ =
           prefs->GetBoolean(prefs::kClearSiteDataOnExit);
       if (webkit_context_)
         webkit_context_->set_clear_local_state_on_exit(
             clear_local_state_on_exit_);
+      if (appcache_service_)

[jochen (gone - plz use gerrit), 2011/01/05 12:29:51]

use { ... }

[pastarmovj, 2011/01/05 13:47:38]

Done.

+        appcache_service_->SetClearLocalStateOnExit(
+            clear_local_state_on_exit_);
     }
   } else if (NotificationType::THEME_INSTALLED == type) {
     DCHECK_EQ(Source<Profile>(source).ptr(), GetOriginalProfile());
     const Extension* extension = Details<const Extension>(details).ptr();
     SetTheme(extension);
   } else if (NotificationType::BOOKMARK_MODEL_LOADED == type) {
     GetProfileSyncService();  // Causes lazy-load if sync is enabled.
     registrar_.Remove(this, NotificationType::BOOKMARK_MODEL_LOADED,
                       Source<Profile>(this));
   }
@@ skipping 128 matching lines @@
 }
 
 PrerenderManager* ProfileImpl::GetPrerenderManager() {
   CommandLine* cl = CommandLine::ForCurrentProcess();
   if (!cl->HasSwitch(switches::kEnablePagePrerender))
     return NULL;
   if (!prerender_manager_.get())
     prerender_manager_.reset(new PrerenderManager(this));
   return prerender_manager_.get();
 }