Change CBD layout and texts

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/feature_list.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browsing_data/cache_counter.h"
@@ skipping 69 matching lines @@
       pref_name == browsing_data::prefs::kDeleteCacheBasic) {
     // Cache counter.
     const auto* cache_result =
         static_cast<const CacheCounter::CacheResult*>(result);
     int64_t cache_size_bytes = cache_result->cache_size();
     bool is_upper_limit = cache_result->is_upper_limit();
 
     // 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());
     browsing_data::BrowsingDataCounter::ResultInt origins =
         static_cast<const browsing_data::BrowsingDataCounter::FinishedResult*>(
             result)
             ->Value();
     return l10n_util::GetPluralStringFUTF16(IDS_DEL_COOKIES_COUNTER_ADVANCED,
                                             origins);
   }
@@ skipping 42 matching lines @@
     return base::ReplaceStringPlaceholders(
         l10n_util::GetPluralStringFUTF16(
             IDS_DEL_HOSTED_APPS_COUNTER, hosted_apps_count),
         replacements,
         nullptr);
   }
 #endif
 
   return browsing_data::GetCounterTextFromResult(result);
 }