UI Changes to support clearing EME/CDM data

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

 // Copyright 2015 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/ui/webui/settings/settings_clear_browsing_data_handler.h"
 
 #include <stddef.h>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/sparse_histogram.h"
 #include "chrome/browser/browsing_data/autofill_counter.h"
 #include "chrome/browser/browsing_data/browsing_data_counter_utils.h"
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_remover_factory.h"
 #include "chrome/browser/browsing_data/cache_counter.h"
 #include "chrome/browser/browsing_data/downloads_counter.h"
 #include "chrome/browser/browsing_data/history_counter.h"
 #include "chrome/browser/browsing_data/hosted_apps_counter.h"
+#include "chrome/browser/browsing_data/media_licenses_counter.h"
 #include "chrome/browser/browsing_data/passwords_counter.h"
 #include "chrome/browser/history/web_history_service_factory.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/common/pref_names.h"
 #include "components/browsing_data_ui/history_notice_utils.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/web_ui.h"
 
 namespace settings {
 
@@ skipping 70 matching lines @@
     remove_mask |= site_data_mask;
     origin_mask |= BrowsingDataHelper::UNPROTECTED_WEB;
   }
 
   if (prefs->GetBoolean(prefs::kDeletePasswords))
     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) &&
-      prefs->GetBoolean(prefs::kPepperFlashSettingsEnabled)) {
-    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;
     origin_mask |= BrowsingDataHelper::PROTECTED_WEB;
   }
 
   // Record the deletion of cookies and cache.
   BrowsingDataRemover::CookieOrCacheDeletionChoice choice =
       BrowsingDataRemover::NEITHER_COOKIES_NOR_CACHE;
   if (prefs->GetBoolean(prefs::kDeleteCookies)) {
@@ skipping 10 matching lines @@
 
   // 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::kDeleteMediaLicenses,
     };
     static size_t num_other_types = arraysize(other_types);
     int checked_other_types = std::count_if(
         other_types, other_types + num_other_types,
         [prefs](const std::string& pref) { return prefs->GetBoolean(pref); });
     UMA_HISTOGRAM_SPARSE_SLOWLY(
         "History.ClearBrowsingData.PasswordsDeletion.AdditionalDatatypesCount",
         checked_other_types);
   }
 
@@ skipping 27 matching lines @@
 void ClearBrowsingDataHandler::HandleInitialize(const base::ListValue* args) {
   AllowJavascript();
 
   // TODO(msramek): Simplify this using a factory.
   AddCounter(base::WrapUnique(new AutofillCounter()));
   AddCounter(base::WrapUnique(new CacheCounter()));
   AddCounter(base::WrapUnique(new DownloadsCounter()));
   AddCounter(base::WrapUnique(new HistoryCounter()));
   AddCounter(base::WrapUnique(new HostedAppsCounter()));
   AddCounter(base::WrapUnique(new PasswordsCounter()));
+  AddCounter(base::WrapUnique(new MediaLicensesCounter()));
 
   OnStateChanged();
   RefreshHistoryNotice();
 }
 
 void ClearBrowsingDataHandler::OnStateChanged() {
   CallJavascriptFunction(
       "cr.webUIListenerCallback",
       base::StringValue("update-footer"),
       base::FundamentalValue(sync_service_ && sync_service_->IsSyncActive()),
@@ skipping 30 matching lines @@
 void ClearBrowsingDataHandler::UpdateCounterText(
     std::unique_ptr<BrowsingDataCounter::Result> result) {
   CallJavascriptFunction(
       "cr.webUIListenerCallback",
       base::StringValue("update-counter-text"),
       base::StringValue(result->source()->GetPrefName()),
       base::StringValue(GetCounterTextFromResult(result.get())));
 }
 
 }  // namespace settings