Change CBD layout and texts

chrome/browser/browsing_data/browsing_data_counter_utils.cc

Index: chrome/browser/browsing_data/browsing_data_counter_utils.cc
diff --git a/chrome/browser/browsing_data/browsing_data_counter_utils.cc b/chrome/browser/browsing_data/browsing_data_counter_utils.cc
index 277cf067080adcba56964aac8e99ebf0caebd31a..9de7addb017e4182d9f2db945d3f9b2c8e2a0729 100644
--- a/chrome/browser/browsing_data/browsing_data_counter_utils.cc
+++ b/chrome/browser/browsing_data/browsing_data_counter_utils.cc
@@ -68,7 +68,8 @@ base::string16 FormatBytesMBOrHigher(
 }
 
 base::string16 GetChromeCounterTextFromResult(
-    const browsing_data::BrowsingDataCounter::Result* result) {
+    const browsing_data::BrowsingDataCounter::Result* result,
+    browsing_data::ClearBrowsingDataTab cbd_tab) {
   std::string pref_name = result->source()->GetPrefName();
 
   if (!result->Finished()) {
@@ -87,25 +88,45 @@ base::string16 GetChromeCounterTextFromResult(
     // Three cases: Nonzero result for the entire cache, nonzero result for
     // a subset of cache (i.e. a finite time interval), and almost zero (< 1MB).
     static const int kBytesInAMegabyte = 1024 * 1024;
+    base::string16 size_string;
     if (cache_size_bytes >= kBytesInAMegabyte) {
       base::string16 formatted_size = FormatBytesMBOrHigher(cache_size_bytes);
-      return !is_upper_limit
-                 ? formatted_size
-                 : l10n_util::GetStringFUTF16(
-                       IDS_DEL_CACHE_COUNTER_UPPER_ESTIMATE, formatted_size);
+      size_string = !is_upper_limit ? formatted_size
+                                    : l10n_util::GetStringFUTF16(
+                                          IDS_DEL_CACHE_COUNTER_UPPER_ESTIMATE,
+                                          formatted_size);
+    } else {
+      size_string =
+          l10n_util::GetStringUTF16(IDS_DEL_CACHE_COUNTER_ALMOST_EMPTY);
+    }
+    switch (cbd_tab) {
+      case browsing_data::ClearBrowsingDataTab::ADVANCED:
+        return size_string;
+      case browsing_data::ClearBrowsingDataTab::BASIC:
+        return l10n_util::GetStringFUTF16(IDS_DEL_CACHE_COUNTER_BASIC,
+                                          size_string);
+      case browsing_data::ClearBrowsingDataTab::NUM_TYPES:
+        NOTREACHED();
     }
-    return l10n_util::GetStringUTF16(IDS_DEL_CACHE_COUNTER_ALMOST_EMPTY);
   }
 
-  if (pref_name == browsing_data::prefs::kDeleteCookies) {
+  if (pref_name == browsing_data::prefs::kDeleteCookies ||
+      pref_name == browsing_data::prefs::kDeleteCookiesBasic) {
     // Site data counter.
     DCHECK(IsSiteDataCounterEnabled());
     browsing_data::BrowsingDataCounter::ResultInt origins =
         static_cast<const browsing_data::BrowsingDataCounter::FinishedResult*>(
             result)
             ->Value();
-    return l10n_util::GetPluralStringFUTF16(IDS_DEL_COOKIES_COUNTER_ADVANCED,
-                                            origins);
+    switch (cbd_tab) {
+      case browsing_data::ClearBrowsingDataTab::ADVANCED:
+        return l10n_util::GetPluralStringFUTF16(
+            IDS_DEL_COOKIES_COUNTER_ADVANCED, origins);
+      // The basic tab doesn't show cookie counter results.
+      case browsing_data::ClearBrowsingDataTab::BASIC:
+      case browsing_data::ClearBrowsingDataTab::NUM_TYPES:
+        NOTREACHED();
+    }
   }
 
   if (pref_name == browsing_data::prefs::kDeleteMediaLicenses) {
@@ -157,5 +178,5 @@ base::string16 GetChromeCounterTextFromResult(
   }
 #endif
 
-  return browsing_data::GetCounterTextFromResult(result);
+  return browsing_data::GetCounterTextFromResult(result, cbd_tab);
 }