Remove "Media Licenses" from Clear Browsing Data dialog

Media licenses will now be deleted when "Cookies and site data" is selected.

BUG=901993
TEST=manual inspection of CBD dialog

Change-Id: I3b48f92d9d2501292d80af5521ac98009b688ae2
Reviewed-on: https://chromium-review.googlesource.com/c/1357638
Reviewed-by: Christian Dullweber <[email protected]>
Reviewed-by: Tommy Nyquist <[email protected]>
Reviewed-by: Dan Beam <[email protected]>
Reviewed-by: Xiaohan Wang <[email protected]>
Commit-Queue: John Rummell <[email protected]>
Cr-Commit-Position: refs/heads/master@{#621392}

Author: jrummell-chromium

chrome/app/settings_strings.grdp

@@ -1232,9 +1232,6 @@
   <message name="IDS_SETTINGS_CLEAR_HOSTED_APP_DATA" desc="Checkbox for deleting data of hosted apps">
     Hosted app data
   </message>
-  <message name="IDS_SETTINGS_CLEAR_MEDIA_LICENSES" desc="Checkbox for deleting media licenses (premium content, etc.)">
-    Media licenses
-  </message>
   <message name="IDS_SETTINGS_CLEAR_PERIOD_HOUR" desc="The option to delete browsing data from the last hour.">
     Last hour
   </message>

chrome/browser/BUILD.gn

@@ -233,8 +233,6 @@ jumbo_split_static_library("browser") {
     "browsing_data/counters/cache_counter.h",
     "browsing_data/counters/downloads_counter.cc",
     "browsing_data/counters/downloads_counter.h",
-    "browsing_data/counters/media_licenses_counter.cc",
-    "browsing_data/counters/media_licenses_counter.h",
     "browsing_data/counters/signin_data_counter.cc",
     "browsing_data/counters/signin_data_counter.h",
     "browsing_data/counters/site_data_counter.cc",

chrome/browser/android/browsing_data/browsing_data_bridge.cc

@@ -104,10 +104,6 @@ static void JNI_BrowsingDataBridge_ClearBrowsingData(
         remove_mask |=
             ChromeBrowsingDataRemoverDelegate::DATA_TYPE_CONTENT_SETTINGS;
         break;
-      case browsing_data::BrowsingDataType::MEDIA_LICENSES:
-        // Media licenses are deleted as part of cookies.
-        NOTREACHED();
-        break;
       case browsing_data::BrowsingDataType::DOWNLOADS:
       case browsing_data::BrowsingDataType::HOSTED_APPS_DATA:
         // Only implemented on Desktop.

chrome/browser/browsing_data/browsing_data_remover_browsertest.cc

@@ -1131,7 +1131,7 @@ IN_PROC_BROWSER_TEST_P(BrowsingDataRemoverBrowserTestP, MediaLicenseDeletion) {
   EXPECT_FALSE(HasDataForType(kMediaLicenseType));
 
   SetDataForType(kMediaLicenseType);
-  EXPECT_EQ(0, GetSiteDataCount());
+  EXPECT_EQ(1, GetSiteDataCount());
   EXPECT_EQ(1, GetMediaLicenseCount());
   ExpectCookieTreeModelCount(1);
   EXPECT_TRUE(HasDataForType(kMediaLicenseType));
@@ -1140,7 +1140,7 @@ IN_PROC_BROWSER_TEST_P(BrowsingDataRemoverBrowserTestP, MediaLicenseDeletion) {
   // which should not remove the recently created Media License.
   RemoveAndWait(content::BrowsingDataRemover::DATA_TYPE_MEDIA_LICENSES,
                 delete_begin, kLastHour);
-  EXPECT_EQ(0, GetSiteDataCount());
+  EXPECT_EQ(1, GetSiteDataCount());
   EXPECT_EQ(1, GetMediaLicenseCount());
   ExpectCookieTreeModelCount(1);
   EXPECT_TRUE(HasDataForType(kMediaLicenseType));
@@ -1174,7 +1174,7 @@ IN_PROC_BROWSER_TEST_F(BrowsingDataRemoverBrowserTest,
   EXPECT_FALSE(HasDataForType(kMediaLicenseType));
 
   SetDataForType(kMediaLicenseType);
-  EXPECT_EQ(0, GetSiteDataCount());
+  EXPECT_EQ(1, GetSiteDataCount());
   EXPECT_EQ(1, GetMediaLicenseCount());
   ExpectCookieTreeModelCount(1);
   EXPECT_TRUE(HasDataForType(kMediaLicenseType));

chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h

@@ -83,37 +83,36 @@ class ChromeBrowsingDataRemoverDelegate
 
     // "Site data" includes storage backend accessible to websites and some
     // additional metadata kept by the browser (e.g. site usage data).
-    DATA_TYPE_SITE_DATA = content::BrowsingDataRemover::DATA_TYPE_COOKIES |
-                          content::BrowsingDataRemover::DATA_TYPE_DOM_STORAGE |
-                          DATA_TYPE_PLUGIN_DATA |
+    DATA_TYPE_SITE_DATA =
+        content::BrowsingDataRemover::DATA_TYPE_COOKIES |
+        content::BrowsingDataRemover::DATA_TYPE_DOM_STORAGE |
+        content::BrowsingDataRemover::DATA_TYPE_MEDIA_LICENSES |
+        DATA_TYPE_PLUGIN_DATA |
 #if defined(OS_ANDROID)
-                          DATA_TYPE_WEB_APP_DATA |
+        DATA_TYPE_WEB_APP_DATA |
 #endif
-                          DATA_TYPE_SITE_USAGE_DATA |
-                          DATA_TYPE_DURABLE_PERMISSION |
-                          DATA_TYPE_EXTERNAL_PROTOCOL_DATA,
+        DATA_TYPE_SITE_USAGE_DATA | DATA_TYPE_DURABLE_PERMISSION |
+        DATA_TYPE_EXTERNAL_PROTOCOL_DATA,
 
     // Datatypes protected by Important Sites.
     IMPORTANT_SITES_DATA_TYPES =
         DATA_TYPE_SITE_DATA | content::BrowsingDataRemover::DATA_TYPE_CACHE,
 
     // Datatypes that can be deleted partially per URL / origin / domain,
     // whichever makes sense.
-    FILTERABLE_DATA_TYPES =
-        DATA_TYPE_SITE_DATA | content::BrowsingDataRemover::DATA_TYPE_CACHE |
-        content::BrowsingDataRemover::DATA_TYPE_DOWNLOADS |
-        content::BrowsingDataRemover::DATA_TYPE_MEDIA_LICENSES,
+    FILTERABLE_DATA_TYPES = DATA_TYPE_SITE_DATA |
+                            content::BrowsingDataRemover::DATA_TYPE_CACHE |
+                            content::BrowsingDataRemover::DATA_TYPE_DOWNLOADS,
 
     // Includes all the available remove options. Meant to be used by clients
     // that wish to wipe as much data as possible from a Profile, to make it
     // look like a new Profile.
     ALL_DATA_TYPES = DATA_TYPE_SITE_DATA |  //
                      content::BrowsingDataRemover::DATA_TYPE_CACHE |
                      content::BrowsingDataRemover::DATA_TYPE_DOWNLOADS |
-                     DATA_TYPE_FORM_DATA |  //
-                     DATA_TYPE_HISTORY |    //
-                     DATA_TYPE_PASSWORDS |
-                     content::BrowsingDataRemover::DATA_TYPE_MEDIA_LICENSES |
+                     DATA_TYPE_FORM_DATA |         //
+                     DATA_TYPE_HISTORY |           //
+                     DATA_TYPE_PASSWORDS |         //
                      DATA_TYPE_CONTENT_SETTINGS |  //
                      DATA_TYPE_BOOKMARKS,
 

chrome/browser/browsing_data/counters/browsing_data_counter_factory.cc

@@ -10,7 +10,6 @@
 #include "chrome/browser/browsing_data/counters/browsing_data_counter_utils.h"
 #include "chrome/browser/browsing_data/counters/cache_counter.h"
 #include "chrome/browser/browsing_data/counters/downloads_counter.h"
-#include "chrome/browser/browsing_data/counters/media_licenses_counter.h"
 #include "chrome/browser/browsing_data/counters/signin_data_counter.h"
 #include "chrome/browser/browsing_data/counters/site_data_counter.h"
 #include "chrome/browser/browsing_data/counters/site_settings_counter.h"
@@ -109,10 +108,6 @@ BrowsingDataCounterFactory::GetForProfileAndPref(Profile* profile,
     return std::make_unique<DownloadsCounter>(profile);
   }
 
-  if (pref_name == browsing_data::prefs::kDeleteMediaLicenses) {
-    return MediaLicensesCounter::Create(profile);
-  }
-
   if (pref_name == browsing_data::prefs::kDeleteSiteSettings) {
     return std::make_unique<SiteSettingsCounter>(
         HostContentSettingsMapFactory::GetForProfile(profile),

chrome/browser/browsing_data/counters/browsing_data_counter_utils.cc

@@ -7,7 +7,6 @@
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/browsing_data/counters/cache_counter.h"
-#include "chrome/browser/browsing_data/counters/media_licenses_counter.h"
 #include "chrome/browser/browsing_data/counters/signin_data_counter.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/account_consistency_mode_manager.h"
@@ -124,19 +123,6 @@ base::string16 GetChromeCounterTextFromResult(
     return l10n_util::GetPluralStringFUTF16(del_cookie_counter_msg_id, origins);
   }
 
-  // TODO(crbug.com/901993): Remove this when Media Licenses removed on desktop.
-  if (pref_name == browsing_data::prefs::kDeleteMediaLicenses) {
-    const MediaLicensesCounter::MediaLicenseResult* media_license_result =
-        static_cast<const MediaLicensesCounter::MediaLicenseResult*>(result);
-    if (media_license_result->Value() > 0) {
-     return l10n_util::GetStringFUTF16(
-          IDS_DEL_MEDIA_LICENSES_COUNTER_SITE_COMMENT,
-          base::UTF8ToUTF16(media_license_result->GetOneOrigin()));
-    }
-    return l10n_util::GetStringUTF16(
-        IDS_DEL_MEDIA_LICENSES_COUNTER_GENERAL_COMMENT);
-  }
-
 #if BUILDFLAG(ENABLE_EXTENSIONS)
   if (pref_name == browsing_data::prefs::kDeleteHostedAppsData) {
     // Hosted apps counter.