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..bd1e26fa342b01bc3697432b39a5f13d4c3decf9 100644
--- a/chrome/browser/browsing_data/browsing_data_counter_utils.cc
+++ b/chrome/browser/browsing_data/browsing_data_counter_utils.cc
@@ -87,16 +87,27 @@ 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);
     }
-    return l10n_util::GetStringUTF16(IDS_DEL_CACHE_COUNTER_ALMOST_EMPTY);
+    if (pref_name == browsing_data::prefs::kDeleteCacheBasic) {
+      return l10n_util::GetStringFUTF16(IDS_DEL_CACHE_COUNTER_BASIC,
+                                        size_string);
+    }
+    return size_string;
+  }
+  if (pref_name == browsing_data::prefs::kDeleteCookiesBasic) {
+    // The basic tab doesn't show cookie counter results.
+    NOTREACHED();
   }
-
   if (pref_name == browsing_data::prefs::kDeleteCookies) {
     // Site data counter.
     DCHECK(IsSiteDataCounterEnabled());