UI Changes to support clearing EME/CDM data

chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc

Index: chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc
diff --git a/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc b/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc
index ac540c0a011704314a55c04370aa4e2778bebfe0..b58c21834cc528539e09c5d4c9c350be2a41ae46 100644
--- a/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc
+++ b/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc
@@ -106,11 +106,8 @@ void ClearBrowsingDataHandler::HandleClearBrowsingData(
   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_) {
-    remove_mask |= BrowsingDataRemover::REMOVE_CONTENT_LICENSES;
-  }
+  if (prefs->GetBoolean(prefs::kDeleteMediaLicenses))
+    remove_mask |= BrowsingDataRemover::REMOVE_MEDIA_LICENSES;
 
   if (prefs->GetBoolean(prefs::kDeleteHostedAppsData)) {
     remove_mask |= site_data_mask;
@@ -135,13 +132,10 @@ void ClearBrowsingDataHandler::HandleClearBrowsingData(
   // 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,

[Peter Kasting, 2016/06/22 00:05:14]

Nit: Same comment.

[jrummell, 2016/06/23 02:48:55]

Done.

     };
     static size_t num_other_types = arraysize(other_types);
     int checked_other_types = std::count_if(