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..d83712fb424c55544bbc31137532a0cccb7686fd 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_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;
 
@@ -944,16 +952,17 @@ void BrowsingDataRemover::RemoveImpl(
   }
 
 #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 Flash.

[msramek, 2016/06/27 14:27:33]

This metric isn't here because of Flash; it's here to measure the occurrence of
REMOVE_CONTENT_LICENSES in |remove_mask|.

So perhaps it should be renamed to "ClearBrowsingData_MediaLicenses", or just
left as is, if you don't mind the little inconsistency.

It might also make sense to move it upwards, so it's recorded even if plugins
aren't enabled, although I'm not sure if that happens in practice on desktop
builds.

[jrummell, 2016/06/28 01:16:48]

I'm wasn't sure what Actions do, and the description in actions.xml didn't help.
I have no problem renaming it, if that won't break anything (looks like obsolete
actions need to be kept). 

WDYT?

For now I've moved it out of the #if, since the dialog will show the option
always, and we should count it for everybody.

[msramek, 2016/06/28 09:07:51]

Yep, this works for me. Not renaming it means we won't lose the continuity of
data.

If somebody is bothered that the metric is still called "ContentLicenses", it
can always be renamed later.

     content::RecordAction(
         UserMetricsAction("ClearBrowsingData_ContentLicenses"));
 
-    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_));
     }
-    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.
@@ -1103,7 +1112,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_ &&
@@ -1222,13 +1232,13 @@ void BrowsingDataRemover::OnWaitableEventSignaled(
   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