Make kClearSiteDataOnExit work correctly for Flash in multi-profile.

chrome/browser/browser_process_impl.cc

 // Copyright (c) 2011 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 <set>
 #include <vector>
 
@@ skipping 19 matching lines @@
 #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/metrics/thread_watcher.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/policy/browser_policy_connector.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prerender/prerender_tracker.h"
 #include "chrome/browser/printing/background_printing_manager.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/chrome_resource_dispatcher_host_delegate.h"
 #include "chrome/browser/safe_browsing/client_side_detection_service.h"
@@ skipping 81 matching lines @@
       created_safe_browsing_service_(false),
       created_safe_browsing_detection_service_(false),
       module_ref_count_(0),
       did_start_(false),
       checked_for_new_frames_(false),
       using_new_frames_(false) {
   g_browser_process = this;
   clipboard_.reset(new ui::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);
 
   net_log_.reset(new ChromeNetLog);
 
   extension_event_router_forwarder_ = new ExtensionEventRouterForwarder;
 
   ExtensionTabIdMap::GetInstance()->Init();
 }
 
@@ skipping 61 matching lines @@
     // Cancel pending requests and prevent new requests.
     resource_dispatcher_host()->Shutdown();
   }
 
   ExtensionTabIdMap::GetInstance()->Shutdown();
 
   // The policy providers managed by |browser_policy_connector_| need to shut
   // down while the IO and FILE threads are still alive.
   browser_policy_connector_.reset();
 
-  // Wait for removing plugin data to finish before shutting down the IO thread.
-  WaitForPluginDataRemoverToFinish();
-
   // Destroying the GpuProcessHostUIShims on the UI thread posts a task to
   // delete related objects on the GPU thread. This must be done before
   // stopping the GPU thread. The GPU thread will close IPC channels to renderer
   // processes so this has to happen before stopping the IO thread.
   GpuProcessHostUIShim::DestroyAll();
 
   // 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();
@@ skipping 392 matching lines @@
   return safe_browsing_detection_service_.get();
 }
 
 bool BrowserProcessImpl::plugin_finder_disabled() const {
   return *plugin_finder_disabled_pref_;
 }
 
 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::kClearSiteDataOnExit) &&
-          local_state()->GetBoolean(prefs::kClearPluginLSODataEnabled)) {
-        plugin_data_remover_ = new PluginDataRemover();
-        if (!plugin_data_remover_mime_type().empty())
-          plugin_data_remover_->set_mime_type(plugin_data_remover_mime_type());
-        plugin_data_remover_->StartRemoving(base::Time());
-      }
-    }
-  } else if (type == NotificationType::PREF_CHANGED) {
+  if (type == NotificationType::PREF_CHANGED) {
     std::string* pref = Details<std::string>(details).ptr();
     if (*pref == prefs::kDefaultBrowserSettingEnabled) {
       if (local_state_->GetBoolean(prefs::kDefaultBrowserSettingEnabled))
         ShellIntegration::SetAsDefaultBrowser();
     } else if (*pref == prefs::kDisabledSchemes) {
       ApplyDisabledSchemesPolicy();
     } else if (*pref == prefs::kAllowCrossOriginAuthPrompt) {
       ApplyAllowCrossOriginAuthPromptPolicy();
     }
   } else {
     NOTREACHED();
   }
 }
 
-void BrowserProcessImpl::WaitForPluginDataRemoverToFinish() {
-  if (plugin_data_remover_.get())
-    plugin_data_remover_->Wait();
-}
-
 #if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
 void BrowserProcessImpl::StartAutoupdateTimer() {
   autoupdate_timer_.Start(
       base::TimeDelta::FromHours(kUpdateCheckIntervalHours),
       this,
       &BrowserProcessImpl::OnAutoupdateTimer);
 }
 #endif
 
 ChromeNetLog* BrowserProcessImpl::net_log() {
@@ skipping 449 matching lines @@
 }
 
 void BrowserProcessImpl::OnAutoupdateTimer() {
   if (CanAutorestartForUpdate()) {
     DLOG(WARNING) << "Detected update.  Restarting browser.";
     RestartPersistentInstance();
   }
 }
 
 #endif  // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)