Change CBD layout and texts

chrome/browser/browsing_data/browsing_data_counter_factory.cc

 // Copyright 2016 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_factory.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/browsing_data/browsing_data_counter_utils.h"
@@ skipping 29 matching lines @@
 
 }  // namespace
 
 // static
 std::unique_ptr<browsing_data::BrowsingDataCounter>
 BrowsingDataCounterFactory::GetForProfileAndPref(Profile* profile,
                                                  const std::string& pref_name) {
   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),
         base::Bind(&GetUpdatedWebHistoryService,
                    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) {
     return base::MakeUnique<CacheCounter>(profile);
   }
 
   if (pref_name == browsing_data::prefs::kDeleteCookies &&
       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>(
         PasswordStoreFactory::GetForProfile(
             profile, ServiceAccessType::EXPLICIT_ACCESS));
   }
 
   if (pref_name == browsing_data::prefs::kDeleteFormData) {
     return base::MakeUnique<browsing_data::AutofillCounter>(
         WebDataServiceFactory::GetAutofillWebDataForProfile(
             profile, ServiceAccessType::EXPLICIT_ACCESS));
   }
 
   if (pref_name == browsing_data::prefs::kDeleteDownloadHistory)
     return base::MakeUnique<DownloadsCounter>(profile);
 
   if (pref_name == browsing_data::prefs::kDeleteMediaLicenses)
     return base::MakeUnique<MediaLicensesCounter>(profile);
 
 #if BUILDFLAG(ENABLE_EXTENSIONS)
   if (pref_name == browsing_data::prefs::kDeleteHostedAppsData)
     return base::MakeUnique<HostedAppsCounter>(profile);
 #endif
 
   return nullptr;
 }