Add a preference to clear Flash LSO data in the Clear Browsing Data dialog.

chrome/browser/browser_process_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/browser_process_impl.h"
 
 #include <map>
 
 #include "app/clipboard/clipboard.h"
 #include "app/l10n_util.h"
@@ skipping 19 matching lines @@
 #include "chrome/browser/google/google_url_tracker.h"
 #include "chrome/browser/icon_manager.h"
 #include "chrome/browser/in_process_webkit/dom_storage_context.h"
 #include "chrome/browser/intranet_redirect_detector.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/metrics/metrics_service.h"
 #include "chrome/browser/net/predictor_api.h"
 #include "chrome/browser/net/sdch_dictionary_fetcher.h"
 #include "chrome/browser/net/sqlite_persistent_cookie_store.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
+#include "chrome/browser/plugin_data_remover.h"
 #include "chrome/browser/plugin_service.h"
 #include "chrome/browser/plugin_updater.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/printing/print_job_manager.h"
 #include "chrome/browser/printing/print_preview_tab_controller.h"
 #include "chrome/browser/profile_manager.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/browser/sidebar/sidebar_manager.h"
@@ skipping 59 matching lines @@
   main_notification_service_.reset(new NotificationService);
 
   // Must be created after the NotificationService.
   print_job_manager_.reset(new printing::PrintJobManager);
 
   shutdown_event_.reset(new base::WaitableEvent(true, false));
 }
 
 BrowserProcessImpl::~BrowserProcessImpl() {
   FilePath profile_path;
-  bool clear_local_state_on_exit;
-
-  // Store the profile path for clearing local state data on exit.
-  clear_local_state_on_exit = ShouldClearLocalState(&profile_path);
+  bool clear_local_state_on_exit = false;
+  Profile* profile = GetProfile();
+  if (profile) {
+    // Store the profile path for clearing local state data on exit.
+    profile_path = profile->GetPath();
+    PrefService* prefs = profile->GetPrefs();
+    clear_local_state_on_exit = prefs->GetBoolean(prefs::kClearSiteDataOnExit);
+    if (prefs->GetBoolean(prefs::kClearPluginLSODataOnExit) &&
+        local_state()->GetBoolean(prefs::kClearPluginLSODataEnabled)) {
+      PluginDataRemover remover;
+      remover.StartRemoving(base::Time(), new MessageLoop::QuitTask());
+      MessageLoop::current()->Run();

[jochen (gone - plz use gerrit), 2010/11/24 19:03:07]

i think this is the wrong place to do this. Can't you guarantee that when the
plugin service terminates, all plugin processes are gone? Then you should
trigger the removal of LSOs during the destruction of the plugin service.

This clear local state stuff here is really just a bad hack that will go away
soon.

[Bernhard Bauer, 2010/11/29 10:45:23]

PluginDataRemover needs the PluginService in order to connect to Flash and call
the clear data API on it, so I can't start the removing in the destructor.

+    }
+  }
 
   // Delete the AutomationProviderList before NotificationService,
   // since it may try to unregister notifications
   // Both NotificationService and AutomationProvider are singleton instances in
   // the BrowserProcess. Since AutomationProvider may have some active
   // notification observers, it is essential that it gets destroyed before the
   // NotificationService. NotificationService won't be destroyed until after
   // this destructor is run.
   automation_provider_list_.reset();
 
@@ skipping 369 matching lines @@
 }
 
 void BrowserProcessImpl::ClearLocalState(const FilePath& profile_path) {
   SQLitePersistentCookieStore::ClearLocalState(profile_path.Append(
       chrome::kCookieFilename));
   DOMStorageContext::ClearLocalState(profile_path, chrome::kExtensionScheme);
   webkit_database::DatabaseTracker::ClearLocalState(profile_path);
   ChromeAppCacheService::ClearLocalState(profile_path);
 }
 
-bool BrowserProcessImpl::ShouldClearLocalState(FilePath* profile_path) {
-  FilePath user_data_dir;
-  Profile* profile;
-
+Profile* BrowserProcessImpl::GetProfile() {
   // Check for the existence of a profile manager. When quitting early,
   // e.g. because another chrome instance is running, or when invoked with
   // options such as --uninstall or --try-chrome-again=0, the profile manager
   // does not exist yet.
   if (!profile_manager_.get())
-    return false;
+    return NULL;
 
+  FilePath user_data_dir;
   PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
-  profile = profile_manager_->GetDefaultProfile(user_data_dir);
-  if (!profile)
-    return false;
-  *profile_path = profile->GetPath();
-  return profile->GetPrefs()->GetBoolean(prefs::kClearSiteDataOnExit);
+  return profile_manager_->GetDefaultProfile(user_data_dir);
 }
 
 void BrowserProcessImpl::CreateResourceDispatcherHost() {
   DCHECK(!created_resource_dispatcher_host_ &&
          resource_dispatcher_host_.get() == NULL);
   created_resource_dispatcher_host_ = true;
 
   resource_dispatcher_host_.reset(new ResourceDispatcherHost());
   resource_dispatcher_host_->Initialize();
 }
@@ skipping 279 matching lines @@
 }
 
 void BrowserProcessImpl::OnAutoupdateTimer() {
   if (CanAutorestartForUpdate()) {
     DLOG(WARNING) << "Detected update.  Restarting browser.";
     RestartPersistentInstance();
   }
 }
 
 #endif  // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)