UI Changes to support clearing EME/CDM data

chrome/browser/pepper_flash_settings_manager.cc

Index: chrome/browser/pepper_flash_settings_manager.cc
diff --git a/chrome/browser/pepper_flash_settings_manager.cc b/chrome/browser/pepper_flash_settings_manager.cc
index 9cf779fd35127b97bb941b8b2cc556fd8c692b86..c1e2d356a8fb2d272757f8bcf17b7f22c91c4d8b 100644
--- a/chrome/browser/pepper_flash_settings_manager.cc
+++ b/chrome/browser/pepper_flash_settings_manager.cc
@@ -682,8 +682,8 @@ void PepperFlashSettingsManager::Core::
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   if (manager_.get()) {
-    manager_->client_->OnDeauthorizeContentLicensesCompleted(
-        request_id, success);
+    manager_->client_->OnDeauthorizeFlashContentLicensesCompleted(request_id,
+                                                                  success);
   }
 }
 
@@ -760,7 +760,7 @@ void PepperFlashSettingsManager::Core::NotifyError(
         NOTREACHED();
         break;
       case DEAUTHORIZE_CONTENT_LICENSES:
-        manager_->client_->OnDeauthorizeContentLicensesCompleted(
+        manager_->client_->OnDeauthorizeFlashContentLicensesCompleted(
             iter->first, false);
         break;
       case GET_PERMISSION_SETTINGS:
@@ -970,8 +970,6 @@ bool PepperFlashSettingsManager::IsPepperFlashInUse(
 // static
 void PepperFlashSettingsManager::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
-  registry->RegisterBooleanPref(prefs::kDeauthorizeContentLicenses, false);
-
   registry->RegisterBooleanPref(prefs::kPepperFlashSettingsEnabled, true);
 }