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

chrome/browser/browser_shutdown.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_shutdown.h"
 
 #include <string>
 
 #include "app/resource_bundle.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/thread.h"
 #include "base/thread_restrictions.h"
 #include "base/time.h"
 #include "build/build_config.h"
 #include "chrome/browser/about_flags.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/dom_ui/chrome_url_data_manager.h"
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/jankometer.h"
 #include "chrome/browser/metrics/metrics_service.h"
+#include "chrome/browser/plugin_data_remover.h"
 #include "chrome/browser/plugin_process_host.h"
 #include "chrome/browser/prefs/pref_service.h"
+#include "chrome/browser/profile_manager.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/renderer_host/render_widget_host.h"
 #include "chrome/browser/service/service_process_control_manager.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/chrome_plugin_lib.h"
 #include "chrome/common/switch_utils.h"
 #include "net/predictor_api.h"
@@ skipping 67 matching lines @@
 #if defined(OS_CHROMEOS)
   chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker(
       "BrowserShutdownStarted", false);
 #endif
   // During shutdown we will end up some blocking operations.  But the
   // work needs to get done and we're going to wait for them no matter
   // what thread they're on, so don't worry about it slowing down
   // shutdown.
   base::ThreadRestrictions::SetIOAllowed(true);
 
-  // Unload plugins. This needs to happen on the IO thread.
-  BrowserThread::PostTask(
-        BrowserThread::IO, FROM_HERE,
-        NewRunnableFunction(&ChromePluginLib::UnloadAllPlugins));
-
-  // Shutdown all IPC channels to service processes.
-  ServiceProcessControlManager::instance()->Shutdown();
-
   // WARNING: During logoff/shutdown (WM_ENDSESSION) we may not have enough
   // time to get here. If you have something that *must* happen on end session,
   // consider putting it in BrowserProcessImpl::EndSession.
   DCHECK(g_browser_process);
 
   // Notifies we are going away.
   g_browser_process->shutdown_event()->Signal();
 
-  PrefService* prefs = g_browser_process->local_state();
+  PrefService* local_state = g_browser_process->local_state();
 
-  chrome_browser_net::SavePredictorStateForNextStartupAndTrim(prefs);
+  // Unload plugins. This needs to happen on the IO thread.
+  BrowserThread::PostTask(
+        BrowserThread::IO, FROM_HERE,
+        NewRunnableFunction(&ChromePluginLib::UnloadAllPlugins));
+
+  Profile* profile = ProfileManager::GetDefaultProfile();
+  if (profile) {
+    // Store the profile path for clearing local state data on exit.
+    PrefService* prefs = profile->GetPrefs();
+    if (prefs->GetBoolean(prefs::kClearPluginLSODataOnExit) &&
+        local_state->GetBoolean(prefs::kClearPluginLSODataEnabled)) {
+      PluginDataRemover remover;
+      remover.StartRemoving(base::Time(), new MessageLoop::QuitTask());

[jam, 2010/11/29 17:14:08]

I have a big concern about blocking our shutdown to wait on creating a Flash
process.  That could be pretty slow for various reasons (i.e. system is
overloaded, Flash loads slowly).  If a user is waiting to restart Chrome again
(say because they shutdown Chrome for an auto-update), and try to start Chrome
manually while this is happening, it won't work.  They might shutdown Chrome
processes manually which would be unfortunate as it could lead to profile
corruption.

Running a nested message loop also seems kind of scary, it's really hard to
predict the side-effects of reentrancy at this point in shutdown.

If the user has the kClearPluginLSODataOnExit pref set, why not just call
Flash's ClearLSO function each time before we shutdown the Flash process?  That
way there's no slowing down of shutdown, which is critical, and it would avoid
any race conditions that you mention.

+      MessageLoop::current()->Run();
+    }
+  }
+
+  // Shutdown all IPC channels to service processes.
+  ServiceProcessControlManager::instance()->Shutdown();
+
+  chrome_browser_net::SavePredictorStateForNextStartupAndTrim(local_state);
 
   MetricsService* metrics = g_browser_process->metrics_service();
   if (metrics) {
     metrics->RecordCleanShutdown();
     metrics->RecordCompletedSessionEnd();
   }
 
   if (shutdown_type_ > NOT_VALID && shutdown_num_processes_ > 0) {
     // Record the shutdown info so that we can put it into a histogram at next
     // startup.
-    prefs->SetInteger(prefs::kShutdownType, shutdown_type_);
-    prefs->SetInteger(prefs::kShutdownNumProcesses, shutdown_num_processes_);
-    prefs->SetInteger(prefs::kShutdownNumProcessesSlow,
-                      shutdown_num_processes_slow_);
+    local_state->SetInteger(prefs::kShutdownType, shutdown_type_);
+    local_state->SetInteger(prefs::kShutdownNumProcesses,
+                            shutdown_num_processes_);
+    local_state->SetInteger(prefs::kShutdownNumProcessesSlow,
+                            shutdown_num_processes_slow_);
   }
 
   // Check local state for the restart flag so we can restart the session below.
   bool restart_last_session = false;
-  if (prefs->HasPrefPath(prefs::kRestartLastSessionOnShutdown)) {
+  if (local_state->HasPrefPath(prefs::kRestartLastSessionOnShutdown)) {
     restart_last_session =
-        prefs->GetBoolean(prefs::kRestartLastSessionOnShutdown);
-    prefs->ClearPref(prefs::kRestartLastSessionOnShutdown);
+        local_state->GetBoolean(prefs::kRestartLastSessionOnShutdown);
+    local_state->ClearPref(prefs::kRestartLastSessionOnShutdown);
   }
 
-  prefs->SavePersistentPrefs();
+  local_state->SavePersistentPrefs();
 
 #if defined(OS_WIN) && defined(GOOGLE_CHROME_BUILD)
   // Cleanup any statics created by RLZ. Must be done before NotificationService
   // is destroyed.
   RLZTracker::CleanupRlz();
 #endif
 
   // The jank'o'meter requires that the browser process has been destroyed
   // before calling UninstallJankometer().
   delete g_browser_process;
@@ skipping 147 matching lines @@
 
 bool ShuttingDownWithoutClosingBrowsers() {
 #if defined(USE_X11)
   if (GetShutdownType() == browser_shutdown::END_SESSION)
     return true;
 #endif
   return false;
 }
 
 }  // namespace browser_shutdown