UI Changes to support clearing EME/CDM data

chrome/browser/pepper_flash_settings_manager.cc

 // Copyright (c) 2012 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/pepper_flash_settings_manager.h"
 
 #include <map>
 #include <utility>
 #include <vector>
 
@@ skipping 664 matching lines @@
       BrowserThread::UI, FROM_HERE,
       base::Bind(&Core::NotifyError, this, notifications));
 }
 
 void PepperFlashSettingsManager::Core::
     NotifyDeauthorizeContentLicensesCompleted(uint32_t request_id,
                                               bool success) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   if (manager_.get()) {
-    manager_->client_->OnDeauthorizeContentLicensesCompleted(
-        request_id, success);
+    manager_->client_->OnDeauthorizeFlashContentLicensesCompleted(request_id,
+                                                                  success);
   }
 }
 
 void PepperFlashSettingsManager::Core::NotifyGetPermissionSettingsCompleted(
     uint32_t request_id,
     bool success,
     PP_Flash_BrowserOperations_Permission default_permission,
     const ppapi::FlashSiteSettings& sites) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
@@ skipping 56 matching lines @@
     // Check |manager_| for each iteration in case it is destroyed in one of
     // the callbacks.
     if (!manager_.get())
       return;
 
     switch (iter->second) {
       case INVALID_REQUEST_TYPE:
         NOTREACHED();
         break;
       case DEAUTHORIZE_CONTENT_LICENSES:
-        manager_->client_->OnDeauthorizeContentLicensesCompleted(
+        manager_->client_->OnDeauthorizeFlashContentLicensesCompleted(
             iter->first, false);
         break;
       case GET_PERMISSION_SETTINGS:
         manager_->client_->OnGetPermissionSettingsCompleted(
             iter->first, false, PP_FLASH_BROWSEROPERATIONS_PERMISSION_DEFAULT,
             ppapi::FlashSiteSettings());
         break;
       case SET_DEFAULT_PERMISSION:
         manager_->client_->OnSetDefaultPermissionCompleted(
             iter->first, false);
@@ skipping 189 matching lines @@
         *plugin_info = *iter;
       return true;
     }
   }
   return false;
 }
 
 // static
 void PepperFlashSettingsManager::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
-  registry->RegisterBooleanPref(prefs::kDeauthorizeContentLicenses, false);
-
   registry->RegisterBooleanPref(prefs::kPepperFlashSettingsEnabled, true);
 }
 
 uint32_t PepperFlashSettingsManager::DeauthorizeContentLicenses(
     PrefService* prefs) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   // Clear the device ID salt which has the effect of regenerating a device
   // ID. Since this happens synchronously (and on the UI thread), we don't have
   // to add it to a pending request.
@@ skipping 71 matching lines @@
 }
 
 void PepperFlashSettingsManager::OnError(Core* core) {
   DCHECK(core);
   if (core != core_.get())
     return;
 
   core_->Detach();
   core_ = NULL;
 }