Move plugins to ChromeBrowsingDataRemoverDelegate.

chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h

 // Copyright 2016 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.
 
 #ifndef CHROME_BROWSER_BROWSING_DATA_CHROME_BROWSING_DATA_REMOVER_DELEGATE_H_
 #define CHROME_BROWSER_BROWSING_DATA_CHROME_BROWSING_DATA_REMOVER_DELEGATE_H_
 
 #include <memory>
 
 #include "base/callback_forward.h"
@@ skipping 11 matching lines @@
 #include "ppapi/features/features.h"
 
 #if BUILDFLAG(ENABLE_PLUGINS)
 #include "chrome/browser/pepper_flash_settings_manager.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chromeos/dbus/dbus_method_call_status.h"
 #endif
 
+class BrowsingDataFlashLSOHelper;
 class Profile;
 class WebappRegistry;
 
 namespace content {
 class BrowserContext;
+class PluginDataRemover;
 }
 
 // A delegate used by BrowsingDataRemover to delete data specific to Chrome
 // as the embedder.
 class ChromeBrowsingDataRemoverDelegate : public BrowsingDataRemoverDelegate
 #if BUILDFLAG(ENABLE_PLUGINS)
     , public PepperFlashSettingsManager::Client
 #endif
 {
  public:
@@ skipping 33 matching lines @@
       int remove_mask,
       const BrowsingDataFilterBuilder& filter_builder,
       int origin_type_mask,
       const base::Closure& callback) override;
 
 #if defined(OS_ANDROID)
   void OverrideWebappRegistryForTesting(
       std::unique_ptr<WebappRegistry> webapp_registry);
 #endif
 
+#if BUILDFLAG(ENABLE_PLUGINS)
+  // Used for testing.
+  void OverrideFlashLSOHelperForTesting(
+      scoped_refptr<BrowsingDataFlashLSOHelper> flash_lso_helper);
+#endif
+
  private:
   // If AllDone(), calls the callback provided in RemoveEmbedderData().
   void NotifyIfDone();
 
   // Whether there are no running deletion tasks.
   bool AllDone();
 
   // Callback for when TemplateURLService has finished loading. Clears the data,
   // clears the respective waiting flag, and invokes NotifyIfDone.
   void OnKeywordsLoaded(base::Callback<bool(const GURL&)> url_filter);
 
 #if defined (OS_CHROMEOS)
   void OnClearPlatformKeys(chromeos::DBusMethodCallStatus call_status,
                            bool result);
 #endif
 
   // Callback for when cookies have been deleted. Invokes NotifyIfDone.
   void OnClearedCookies();
 
 #if BUILDFLAG(ENABLE_PLUGINS)
+  // Called when plugin data has been cleared. Invokes NotifyIfDone.
+  void OnWaitableEventSignaled(base::WaitableEvent* waitable_event);
+
+  // Called when the list of |sites| storing Flash LSO cookies is fetched.
+  void OnSitesWithFlashDataFetched(
+      base::Callback<bool(const std::string&)> plugin_filter,
+      const std::vector<std::string>& sites);
+
+  // Indicates that LSO cookies for one website have been deleted.
+  void OnFlashDataDeleted();
+
   // PepperFlashSettingsManager::Client implementation.
   void OnDeauthorizeFlashContentLicensesCompleted(uint32_t request_id,
                                                   bool success) override;
 #endif
 
   // The profile for which the data will be deleted.
   Profile* profile_;
 
   // Start time to delete from.
   base::Time delete_begin_;
@@ skipping 25 matching lines @@
   SubTask clear_network_predictor_;
   SubTask clear_networking_history_;
   SubTask clear_passwords_;
   SubTask clear_passwords_stats_;
   SubTask clear_http_auth_cache_;
   SubTask clear_platform_keys_;
 #if defined(OS_ANDROID)
   SubTask clear_precache_history_;
   SubTask clear_offline_page_data_;
 #endif
-
 #if BUILDFLAG(ENABLE_WEBRTC)
   SubTask clear_webrtc_logs_;
 #endif
   SubTask clear_auto_sign_in_;
+  // Counts the number of plugin data tasks. Should be the number of LSO cookies
+  // to be deleted, or 1 while we're fetching LSO cookies or deleting in bulk.
+  int clear_plugin_data_count_ = 0;
 
 #if BUILDFLAG(ENABLE_PLUGINS)
+  // Used to delete plugin data.
+  std::unique_ptr<content::PluginDataRemover> plugin_data_remover_;
+  base::WaitableEventWatcher watcher_;
+
+  // Used for per-site plugin data deletion.
+  scoped_refptr<BrowsingDataFlashLSOHelper> flash_lso_helper_;
+
   uint32_t deauthorize_flash_content_licenses_request_id_ = 0;
 
   // Used to deauthorize content licenses for Pepper Flash.
   std::unique_ptr<PepperFlashSettingsManager> pepper_flash_settings_manager_;
 #endif
 
   // Used if we need to clear history.
   base::CancelableTaskTracker history_task_tracker_;
 
   std::unique_ptr<TemplateURLService::Subscription> template_url_sub_;
 
 #if defined(OS_ANDROID)
   // WebappRegistry makes calls across the JNI. In unit tests, the Java side is
   // not initialised, so the registry must be mocked out.
   std::unique_ptr<WebappRegistry> webapp_registry_;
 #endif
 
   base::WeakPtrFactory<ChromeBrowsingDataRemoverDelegate> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeBrowsingDataRemoverDelegate);
 };
 
 #endif  // CHROME_BROWSER_BROWSING_DATA_CHROME_BROWSING_DATA_REMOVER_DELEGATE_H_