UI Changes to support clearing EME/CDM data

chrome/browser/browsing_data/browsing_data_remover.cc

Index: chrome/browser/browsing_data/browsing_data_remover.cc
diff --git a/chrome/browser/browsing_data/browsing_data_remover.cc b/chrome/browser/browsing_data/browsing_data_remover.cc
index c58ab51a4923239b8d8d0f3ea16a5e224ae75b50..7450f5b7e6a151e2df5ad34e095476fa76592fae 100644
--- a/chrome/browser/browsing_data/browsing_data_remover.cc
+++ b/chrome/browser/browsing_data/browsing_data_remover.cc
@@ -905,6 +905,14 @@ void BrowsingDataRemover::RemoveImpl(
         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_CONTENT_LICENSES) {

[xhwang, 2016/06/17 06:24:29]

Should this be renamed to REMOVE_MEDIA_LICENSES? (can be in a separate CL)

[jrummell, 2016/06/21 00:13:43]

Done.

+    storage_partition_remove_mask |=
+        content::StoragePartition::REMOVE_DATA_MASK_PLUGIN_PRIVATE_DATA;
+  }
+
   if (storage_partition_remove_mask) {
     waiting_for_clear_storage_partition_data_ = true;
 
@@ -948,7 +956,7 @@ void BrowsingDataRemover::RemoveImpl(
     content::RecordAction(
         UserMetricsAction("ClearBrowsingData_ContentLicenses"));

[xhwang, 2016/06/17 06:24:29]

This should probably be renamed as well. Can you add a todo?

[jrummell, 2016/06/21 00:13:43]

Done.

 
-    waiting_for_clear_content_licenses_ = true;
+    waiting_for_clear_flash_content_licenses_ = true;
     if (!pepper_flash_settings_manager_.get()) {
       pepper_flash_settings_manager_.reset(
           new PepperFlashSettingsManager(this, profile_));
@@ -1103,7 +1111,8 @@ base::Time BrowsingDataRemover::CalculateBeginDeleteTime(
 
 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_ &&
@@ -1225,10 +1234,10 @@ void BrowsingDataRemover::OnWaitableEventSignaled(
 void BrowsingDataRemover::OnDeauthorizeContentLicensesCompleted(

[xhwang, 2016/06/17 06:24:29]

OnDeauthorizeFlashContentLicensesCompleted

[jrummell, 2016/06/21 00:13:43]

Done.

     uint32_t request_id,
     bool /* success */) {
-  DCHECK(waiting_for_clear_content_licenses_);
+  DCHECK(waiting_for_clear_flash_content_licenses_);
   DCHECK_EQ(request_id, deauthorize_content_licenses_request_id_);
 
-  waiting_for_clear_content_licenses_ = false;
+  waiting_for_clear_flash_content_licenses_ = false;
   NotifyIfDone();
 }
 #endif