UI Changes to support clearing EME/CDM data

chrome/browser/browsing_data/browsing_data_remover.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/browsing_data/browsing_data_remover.h"
 
 #include <map>
 #include <set>
 #include <string>
 
@@ skipping 887 matching lines @@
         delete_begin_,
         base::Bind(&BrowsingDataRemover::OnClearedNetworkingHistory,
                    weak_ptr_factory_.GetWeakPtr()));
   }
 
   if (remove_mask & REMOVE_WEBRTC_IDENTITY) {
     storage_partition_remove_mask |=
         content::StoragePartition::REMOVE_DATA_MASK_WEBRTC_IDENTITY;
   }
 
+  // Content Decryption Modules used by Encrypted Media store licenses in a
+  // private filesystem. These are different than content licenses used by
+  // Flash (which are deleted father down in this method).
+  if (remove_mask & REMOVE_MEDIA_LICENSES) {
+    storage_partition_remove_mask |=
+        content::StoragePartition::REMOVE_DATA_MASK_PLUGIN_PRIVATE_DATA;
+  }
+
   if (storage_partition_remove_mask) {
     waiting_for_clear_storage_partition_data_ = true;
 
     content::StoragePartition* storage_partition;
     if (storage_partition_for_testing_)
       storage_partition = storage_partition_for_testing_;
     else
       storage_partition = BrowserContext::GetDefaultStoragePartition(profile_);
 
     uint32_t quota_storage_remove_mask =
@@ skipping 18 matching lines @@
     }
 
     storage_partition->ClearData(
         storage_partition_remove_mask, quota_storage_remove_mask,
         base::Bind(&DoesOriginMatchMaskAndUrls, origin_type_mask_, filter),
         cookie_matcher, delete_begin_, delete_end_,
         base::Bind(&BrowsingDataRemover::OnClearedStoragePartitionData,
                    weak_ptr_factory_.GetWeakPtr()));
   }
 
-#if defined(ENABLE_PLUGINS)
-  if (remove_mask & REMOVE_CONTENT_LICENSES) {
+  if (remove_mask & REMOVE_MEDIA_LICENSES) {
+    // TODO(jrummell): This UMA should be renamed to indicate it is for Media
+    // Licenses.
     content::RecordAction(
         UserMetricsAction("ClearBrowsingData_ContentLicenses"));
 
-    waiting_for_clear_content_licenses_ = true;
+#if defined(ENABLE_PLUGINS)
+    waiting_for_clear_flash_content_licenses_ = true;
     if (!pepper_flash_settings_manager_.get()) {
       pepper_flash_settings_manager_.reset(
           new PepperFlashSettingsManager(this, profile_));
     }
-    deauthorize_content_licenses_request_id_ =
+    deauthorize_flash_content_licenses_request_id_ =
         pepper_flash_settings_manager_->DeauthorizeContentLicenses(prefs);
 #if defined(OS_CHROMEOS)
     // On Chrome OS, also delete any content protection platform keys.
     const user_manager::User* user =
         chromeos::ProfileHelper::Get()->GetUserByProfile(profile_);
     if (!user) {
       LOG(WARNING) << "Failed to find user for current profile.";
     } else {
       chromeos::DBusThreadManager::Get()
           ->GetCryptohomeClient()
           ->TpmAttestationDeleteKeys(
               chromeos::attestation::KEY_USER,
               cryptohome::Identification(user->GetAccountId()),
               chromeos::attestation::kContentProtectionKeyPrefix,
               base::Bind(&BrowsingDataRemover::OnClearPlatformKeys,
                          weak_ptr_factory_.GetWeakPtr()));
       waiting_for_clear_platform_keys_ = true;
     }
-#endif
+#endif  // defined(OS_CHROMEOS)
+#endif  // defined(ENABLE_PLUGINS)
   }
-#endif
 
   // Remove omnibox zero-suggest cache results.
   if ((remove_mask & (REMOVE_CACHE | REMOVE_COOKIES)))
     prefs->SetString(omnibox::kZeroSuggestCachedResults, std::string());
 
   if (remove_mask & (REMOVE_COOKIES | REMOVE_HISTORY)) {
     domain_reliability::DomainReliabilityService* service =
       domain_reliability::DomainReliabilityServiceFactory::
           GetForBrowserContext(profile_);
     if (service) {
@@ skipping 108 matching lines @@
       break;
     case EVERYTHING:
       delete_begin_time = base::Time();
       break;
   }
   return delete_begin_time - diff;
 }
 
 bool BrowsingDataRemover::AllDone() {
   return !waiting_for_clear_autofill_origin_urls_ &&
-         !waiting_for_clear_cache_ && !waiting_for_clear_content_licenses_ &&
+         !waiting_for_clear_cache_ &&
+         !waiting_for_clear_flash_content_licenses_ &&
          !waiting_for_clear_channel_ids_ && !waiting_for_clear_cookies_count_ &&
          !waiting_for_clear_domain_reliability_monitor_ &&
          !waiting_for_clear_form_ && !waiting_for_clear_history_ &&
          !waiting_for_clear_hostname_resolution_cache_ &&
          !waiting_for_clear_keyword_data_ && !waiting_for_clear_nacl_cache_ &&
          !waiting_for_clear_network_predictor_ &&
          !waiting_for_clear_networking_history_ &&
          !waiting_for_clear_passwords_ && !waiting_for_clear_passwords_stats_ &&
          !waiting_for_clear_platform_keys_ && !waiting_for_clear_plugin_data_ &&
          !waiting_for_clear_pnacl_cache_ &&
@@ skipping 98 matching lines @@
 #if defined(ENABLE_PLUGINS)
 void BrowsingDataRemover::OnWaitableEventSignaled(
     base::WaitableEvent* waitable_event) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   waiting_for_clear_plugin_data_ = false;
   plugin_data_remover_.reset();
   watcher_.StopWatching();
   NotifyIfDone();
 }
 
-void BrowsingDataRemover::OnDeauthorizeContentLicensesCompleted(
+void BrowsingDataRemover::OnDeauthorizeFlashContentLicensesCompleted(
     uint32_t request_id,
     bool /* success */) {
-  DCHECK(waiting_for_clear_content_licenses_);
-  DCHECK_EQ(request_id, deauthorize_content_licenses_request_id_);
+  DCHECK(waiting_for_clear_flash_content_licenses_);
+  DCHECK_EQ(request_id, deauthorize_flash_content_licenses_request_id_);
 
-  waiting_for_clear_content_licenses_ = false;
+  waiting_for_clear_flash_content_licenses_ = false;
   NotifyIfDone();
 }
 #endif
 
 #if defined(OS_CHROMEOS)
 void BrowsingDataRemover::OnClearPlatformKeys(
     chromeos::DBusMethodCallStatus call_status,
     bool result) {
   DCHECK(waiting_for_clear_platform_keys_);
   LOG_IF(ERROR, call_status != chromeos::DBUS_METHOD_CALL_SUCCESS || !result)
@@ skipping 94 matching lines @@
   waiting_for_clear_domain_reliability_monitor_ = false;
   NotifyIfDone();
 }
 
 // static
 BrowsingDataRemover::CallbackSubscription
     BrowsingDataRemover::RegisterOnBrowsingDataRemovedCallback(
         const BrowsingDataRemover::Callback& callback) {
   return GetOnBrowsingDataRemovedCallbacks()->Add(callback);
 }