UI Changes to support clearing EME/CDM data

chrome/browser/ui/webui/options/clear_browser_data_handler.cc

Index: chrome/browser/ui/webui/options/clear_browser_data_handler.cc
diff --git a/chrome/browser/ui/webui/options/clear_browser_data_handler.cc b/chrome/browser/ui/webui/options/clear_browser_data_handler.cc
index b4b15d3b832a48a855e054908db8a10fa38ea8b9..854585d0a75a849479559183102698bc0b3731fc 100644
--- a/chrome/browser/ui/webui/options/clear_browser_data_handler.cc
+++ b/chrome/browser/ui/webui/options/clear_browser_data_handler.cc
@@ -29,6 +29,7 @@
 #include "chrome/browser/browsing_data/browsing_data_remover_factory.h"
 #include "chrome/browser/browsing_data/cache_counter.h"
 #include "chrome/browser/browsing_data/history_counter.h"
+#include "chrome/browser/browsing_data/media_license_counter.h"
 #include "chrome/browser/browsing_data/passwords_counter.h"
 #include "chrome/browser/history/web_history_service_factory.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
@@ -83,8 +84,6 @@ ClearBrowserDataHandler::~ClearBrowserDataHandler() {
 void ClearBrowserDataHandler::InitializeHandler() {
   PrefService* prefs = Profile::FromWebUI(web_ui())->GetPrefs();
   clear_plugin_lso_data_enabled_.Init(prefs::kClearPluginLSODataEnabled, prefs);
-  pepper_flash_settings_enabled_.Init(prefs::kPepperFlashSettingsEnabled,
-                                      prefs);
   allow_deleting_browser_history_.Init(
       prefs::kAllowDeletingBrowserHistory,
       prefs,
@@ -96,6 +95,7 @@ void ClearBrowserDataHandler::InitializeHandler() {
     AddCounter(base::WrapUnique(new HistoryCounter()));
     AddCounter(base::WrapUnique(new CacheCounter()));
     AddCounter(base::WrapUnique(new AutofillCounter()));
+    AddCounter(base::WrapUnique(new MediaLicenseCounter()));
 
     sync_service_ =
         ProfileSyncServiceFactory::GetForProfile(Profile::FromWebUI(web_ui()));
@@ -269,11 +269,8 @@ void ClearBrowserDataHandler::HandleClearBrowserData(
     remove_mask |= BrowsingDataRemover::REMOVE_PASSWORDS;
   if (prefs->GetBoolean(prefs::kDeleteFormData))
     remove_mask |= BrowsingDataRemover::REMOVE_FORM_DATA;
-  // Clearing Content Licenses is only supported in Pepper Flash.
-  if (prefs->GetBoolean(prefs::kDeauthorizeContentLicenses) &&
-      *pepper_flash_settings_enabled_) {
+  if (prefs->GetBoolean(prefs::kDeleteMediaLicenses))
     remove_mask |= BrowsingDataRemover::REMOVE_CONTENT_LICENSES;
-  }
   if (prefs->GetBoolean(prefs::kDeleteHostedAppsData)) {
     remove_mask |= site_data_mask;
     origin_mask |= BrowsingDataHelper::PROTECTED_WEB;
@@ -296,13 +293,10 @@ void ClearBrowserDataHandler::HandleClearBrowserData(
   // Record the circumstances under which passwords are deleted.
   if (prefs->GetBoolean(prefs::kDeletePasswords)) {
     static const char* other_types[] = {
-        prefs::kDeleteBrowsingHistory,
-        prefs::kDeleteDownloadHistory,
-        prefs::kDeleteCache,
-        prefs::kDeleteCookies,
-        prefs::kDeleteFormData,
-        prefs::kDeleteHostedAppsData,
-        prefs::kDeauthorizeContentLicenses,
+        prefs::kDeleteBrowsingHistory, prefs::kDeleteDownloadHistory,
+        prefs::kDeleteCache,           prefs::kDeleteCookies,
+        prefs::kDeleteFormData,        prefs::kDeleteHostedAppsData,
+        prefs::kDeleteMediaLicenses,
     };
     static size_t num_other_types = arraysize(other_types);
     int checked_other_types = std::count_if(