UI Changes to support clearing EME/CDM data

chrome/browser/browsing_data/browsing_data_counter_utils.cc

 // Copyright 2015 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_counter_utils.h"
 
 #include "base/command_line.h"
+#include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browsing_data/autofill_counter.h"
 #include "chrome/browser/browsing_data/cache_counter.h"
 #include "chrome/browser/browsing_data/history_counter.h"
+#include "chrome/browser/browsing_data/media_licenses_counter.h"
 #include "chrome/browser/browsing_data/passwords_counter.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/prefs/pref_service.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/text/bytes_formatting.h"
 
 bool AreCountersEnabled() {
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
@@ skipping 130 matching lines @@
         break;
       case 3:
         text = l10n_util::GetStringFUTF16(IDS_DEL_AUTOFILL_COUNTER_THREE_TYPES,
                                           displayed_strings[0],
                                           displayed_strings[1],
                                           displayed_strings[2]);
         break;
       default:
         NOTREACHED();
     }
+  } else if (pref_name == prefs::kDeleteMediaLicenses) {
+    const MediaLicenseCounter::MediaLicenseResult* media_license_result =
+        static_cast<const MediaLicenseCounter::MediaLicenseResult*>(result);
+    text =
+        (media_license_result->Value() > 0)

[Nico, 2016/06/23 21:23:11]

if your ternary op spans 6 lines, you probably want to use an if instead

[jrummell, 2016/06/24 18:26:05]

Done.

+            ? l10n_util::GetStringFUTF16(
+                  IDS_DEL_MEDIA_LICENSES_SITE_COMMENT,
+                  base::UTF8ToUTF16(media_license_result->GetOneOrigin()))
+            : l10n_util::GetStringUTF16(IDS_DEL_MEDIA_LICENSES_GENERAL_COMMENT);
   }
 
   return text;
 }
 
 bool GetDeletionPreferenceFromDataType(
     BrowsingDataType data_type, std::string* out_pref) {
   switch (data_type) {
     case HISTORY:
       *out_pref = prefs::kDeleteBrowsingHistory;
@@ skipping 31 matching lines @@
     return new HistoryCounter();
   if (pref_name == prefs::kDeleteCache)
     return new CacheCounter();
   if (pref_name == prefs::kDeletePasswords)
     return new PasswordsCounter();
   if (pref_name == prefs::kDeleteFormData)
     return new AutofillCounter();
 
   return nullptr;
 }