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..361e995fb38e26c19d9b9db794216c5516844953 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) {

[msramek, 2017/03/22 14:40:21]

If there's no counter on the basic tab, we should return nullptr.

[dullweber, 2017/03/23 10:22:34]

There is already the "return nullptr" at the end of the method but I added
explicit cases for history and cookies

[msramek, 2017/03/28 13:43:43]

For the record, I am fine with kDeleteBrowsingHistoryBasic being handled
implicitly by the nullptr at the end of method; we don't need an explicit case
for that. I was just complaining that in this particular case, a live code was
reached instead of the nullptr.

+  if (pref_name == browsing_data::prefs::kDeleteBrowsingHistory) {
     return base::MakeUnique<browsing_data::HistoryCounter>(
         HistoryServiceFactory::GetForProfile(
             profile, ServiceAccessType::EXPLICIT_ACCESS),