Add a preference to clear plugin data on browser shutdown.

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/first_run/first_run.h"
 #include "chrome/browser/google/google_url_tracker.h"
 #include "chrome/browser/icon_manager.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/chrome_net_log.h"
 #include "chrome/browser/net/predictor_api.h"
 #include "chrome/browser/net/sdch_dictionary_fetcher.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/profiles/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/client_side_detection_service.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
@@ skipping 53 matching lines @@
       created_safe_browsing_detection_service_(false),
       module_ref_count_(0),
       did_start_(false),
       checked_for_new_frames_(false),
       using_new_frames_(false),
       have_inspector_files_(true) {
   g_browser_process = this;
   clipboard_.reset(new Clipboard);
   main_notification_service_.reset(new NotificationService);
 
+  notification_registrar_.Add(this,
+                              NotificationType::APP_TERMINATING,
+                              NotificationService::AllSources());
+
   // Must be created after the NotificationService.
   print_job_manager_.reset(new printing::PrintJobManager);
 
   shutdown_event_.reset(new base::WaitableEvent(true, false));
 
   net_log_.reset(new ChromeNetLog);
 }
 
 BrowserProcessImpl::~BrowserProcessImpl() {
   FilePath profile_path;
@@ skipping 45 matching lines @@
 
     // Cancel pending requests and prevent new requests.
     resource_dispatcher_host()->Shutdown();
   }
 
 #if defined(USE_X11)
   // The IO thread must outlive the BACKGROUND_X11 thread.
   background_x11_thread_.reset();
 #endif
 
+  // Wait for removing plugin data to finish before shutting down the IO thread.
+  WaitForPluginDataRemoverToFinish();
+
   // Need to stop io_thread_ before resource_dispatcher_host_, since
   // io_thread_ may still deref ResourceDispatcherHost and handle resource
   // request before going away.
   io_thread_.reset();
 
   // The IO thread was the only user of this thread.
   cache_thread_.reset();
 
   // Stop the process launcher thread after the IO thread, in case the IO thread
   // posted a task to terminate a process on the process launcher thread.
@@ skipping 312 matching lines @@
   }
   return safe_browsing_detection_service_.get();
 }
 
 void BrowserProcessImpl::CheckForInspectorFiles() {
   file_thread()->message_loop()->PostTask
       (FROM_HERE,
        NewRunnableMethod(this, &BrowserProcessImpl::DoInspectorFilesCheck));
 }
 
+void BrowserProcessImpl::Observe(NotificationType type,
+                                 const NotificationSource& source,
+                                 const NotificationDetails& details) {
+  if (type == NotificationType::APP_TERMINATING) {
+    Profile* profile = ProfileManager::GetDefaultProfile();
+    if (profile) {
+      PrefService* prefs = profile->GetPrefs();
+      if (prefs->GetBoolean(prefs::kClearPluginLSODataOnExit) &&
+          local_state()->GetBoolean(prefs::kClearPluginLSODataEnabled)) {
+        plugin_data_remover_ = new PluginDataRemover();
+        plugin_data_remover_->StartRemoving(base::Time(), NULL);
+      }
+    }
+  } else {
+    NOTREACHED();
+  }
+}
+
+void BrowserProcessImpl::WaitForPluginDataRemoverToFinish() {
+  if (!plugin_data_remover_.get() || !plugin_data_remover_->is_removing())
+    return;
+  plugin_data_remover_->set_done_task(new MessageLoop::QuitTask());
+  base::Time start_time(base::Time::Now());
+  MessageLoop::current()->Run();
+  UMA_HISTOGRAM_TIMES("ClearPluginData.wait_at_shutdown",
+                      base::Time::Now() - start_time);
+}
+
 #if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
 void BrowserProcessImpl::StartAutoupdateTimer() {
   autoupdate_timer_.Start(
       base::TimeDelta::FromHours(kUpdateCheckIntervalHours),
       this,
       &BrowserProcessImpl::OnAutoupdateTimer);
 }
 #endif
 
 bool BrowserProcessImpl::have_inspector_files() const {
@@ skipping 347 matching lines @@
 }
 
 void BrowserProcessImpl::OnAutoupdateTimer() {
   if (CanAutorestartForUpdate()) {
     DLOG(WARNING) << "Detected update.  Restarting browser.";
     RestartPersistentInstance();
   }
 }
 
 #endif  // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)