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

chrome/browser/browsing_data_remover.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/browsing_data_remover.h"
 
 #include <map>
 #include <set>
 
 #include "base/callback.h"
 #include "chrome/browser/autofill/personal_data_manager.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/in_process_webkit/webkit_context.h"
+#include "chrome/browser/plugin_data_remover.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
 #include "chrome/browser/password_manager/password_store.h"
 #include "chrome/browser/renderer_host/web_cache_manager.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
 #include "chrome/browser/webdata/web_data_service.h"
 #include "chrome/common/net/url_request_context_getter.h"
@@ skipping 53 matching lines @@
           this, &BrowsingDataRemover::OnGotAppCacheInfo)),
       ALLOW_THIS_IN_INITIALIZER_LIST(appcache_deleted_callback_(
           this, &BrowsingDataRemover::OnAppCacheDeleted)),
       request_context_getter_(profile->GetRequestContext()),
       appcaches_to_be_deleted_count_(0),
       next_cache_state_(STATE_NONE),
       cache_(NULL),
       waiting_for_clear_databases_(false),
       waiting_for_clear_history_(false),
       waiting_for_clear_cache_(false),
-      waiting_for_clear_appcache_(false) {
+      waiting_for_clear_appcache_(false),
+      waiting_for_clear_lso_data_(false) {
   DCHECK(profile);
 }
 
 BrowsingDataRemover::~BrowsingDataRemover() {
   DCHECK(all_done());
 }
 
 void BrowsingDataRemover::Remove(int remove_mask) {
   DCHECK(!removing_);
   removing_ = true;
@@ skipping 144 matching lines @@
                               profile_);
 
     main_context_getter_ = profile_->GetRequestContext();
     media_context_getter_ = profile_->GetRequestContextForMedia();
 
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         NewRunnableMethod(this, &BrowsingDataRemover::ClearCacheOnIOThread));
   }
 
+  if (remove_mask & REMOVE_LSO_DATA) {
+    UserMetrics::RecordAction(UserMetricsAction("ClearBrowsingData_LSOData"));
+
+    waiting_for_clear_lso_data_ = true;
+    if (!plugin_data_remover_.get())
+      plugin_data_remover_.reset(new PluginDataRemover());
+    plugin_data_remover_->StartRemoving(
+        delete_begin_,
+        NewRunnableMethod(this, &BrowsingDataRemover::OnClearedPluginData));
+  }
+
   NotifyAndDeleteIfDone();
 }
 
 void BrowsingDataRemover::AddObserver(Observer* observer) {
   observer_list_.AddObserver(observer);
 }
 
 void BrowsingDataRemover::RemoveObserver(Observer* observer) {
   observer_list_.RemoveObserver(observer);
 }
@@ skipping 224 matching lines @@
 }
 
 ChromeAppCacheService* BrowsingDataRemover::GetAppCacheService() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   ChromeURLRequestContext* request_context =
       reinterpret_cast<ChromeURLRequestContext*>(
           request_context_getter_->GetURLRequestContext());
   return request_context ? request_context->appcache_service()
                          : NULL;
 }
+
+void BrowsingDataRemover::OnClearedPluginData() {
+  waiting_for_clear_lso_data_ = false;
+  NotifyAndDeleteIfDone();
+}
+

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

remove empty line

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

Done.