Change CBD layout and texts

chrome/browser/browsing_data/browsing_data_counter_factory.cc

Index: chrome/browser/browsing_data/browsing_data_counter_factory.cc
diff --git a/chrome/browser/browsing_data/browsing_data_counter_factory.cc b/chrome/browser/browsing_data/browsing_data_counter_factory.cc
index accd07d20c2800eab984110be96fb2b5a18eaaec..086edaa0296314d13c3e4e6ca5e42732fc051334 100644
--- a/chrome/browser/browsing_data/browsing_data_counter_factory.cc
+++ b/chrome/browser/browsing_data/browsing_data_counter_factory.cc
@@ -47,8 +47,7 @@ BrowsingDataCounterFactory::GetForProfileAndPref(Profile* profile,
   if (!AreCountersEnabled())
     return nullptr;
 
-  if (pref_name == browsing_data::prefs::kDeleteBrowsingHistory ||
-      pref_name == browsing_data::prefs::kDeleteBrowsingHistoryBasic) {
+  if (pref_name == browsing_data::prefs::kDeleteBrowsingHistory) {
     return base::MakeUnique<browsing_data::HistoryCounter>(
         HistoryServiceFactory::GetForProfile(
             profile, ServiceAccessType::EXPLICIT_ACCESS),
@@ -56,6 +55,10 @@ BrowsingDataCounterFactory::GetForProfileAndPref(Profile* profile,
                    base::Unretained(profile)),
         ProfileSyncServiceFactory::GetForProfile(profile));
   }
+  if (pref_name == browsing_data::prefs::kDeleteBrowsingHistoryBasic) {
+    // The history option on the basic tab doesn't use a counter.
+    return nullptr;
+  }
 
   if (pref_name == browsing_data::prefs::kDeleteCache ||
       pref_name == browsing_data::prefs::kDeleteCacheBasic) {
@@ -66,6 +69,10 @@ BrowsingDataCounterFactory::GetForProfileAndPref(Profile* profile,
       IsSiteDataCounterEnabled()) {
     return base::MakeUnique<SiteDataCounter>(profile);
   }
+  if (pref_name == browsing_data::prefs::kDeleteCookiesBasic) {
+    // The cookies option on the basic tab doesn't use a counter.
+    return nullptr;
+  }
 
   if (pref_name == browsing_data::prefs::kDeletePasswords) {
     return base::MakeUnique<browsing_data::PasswordsCounter>(