Change CBD layout and texts

components/browsing_data/core/browsing_data_utils.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 "components/browsing_data/core/browsing_data_utils.h"
 
 #include "base/metrics/user_metrics.h"
 #include "components/browsing_data/core/counters/autofill_counter.h"
 #include "components/browsing_data/core/counters/history_counter.h"
 #include "components/browsing_data/core/counters/passwords_counter.h"
@@ skipping 68 matching lines @@
     // Counters with trivially formatted result: passwords and downloads.
     browsing_data::BrowsingDataCounter::ResultInt count =
         static_cast<const browsing_data::BrowsingDataCounter::FinishedResult*>(
             result)
             ->Value();
     text = l10n_util::GetPluralStringFUTF16(
         pref_name == browsing_data::prefs::kDeletePasswords
             ? IDS_DEL_PASSWORDS_COUNTER
             : IDS_DEL_DOWNLOADS_COUNTER,
         count);
-  } else if (pref_name == browsing_data::prefs::kDeleteBrowsingHistory ||
-             pref_name == browsing_data::prefs::kDeleteBrowsingHistoryBasic) {
+  } else if (pref_name == browsing_data::prefs::kDeleteBrowsingHistoryBasic) {
+    // The basic tab doesn't show history counter results.
+    NOTREACHED();
+  } else if (pref_name == browsing_data::prefs::kDeleteBrowsingHistory) {
     // History counter.
     const browsing_data::HistoryCounter::HistoryResult* history_result =
         static_cast<const browsing_data::HistoryCounter::HistoryResult*>(
             result);
     browsing_data::BrowsingDataCounter::ResultInt local_item_count =
         history_result->Value();
     bool has_synced_visits = history_result->has_synced_visits();
-
     text = has_synced_visits
                ? l10n_util::GetPluralStringFUTF16(
                      IDS_DEL_BROWSING_HISTORY_COUNTER_SYNCED, local_item_count)
                : l10n_util::GetPluralStringFUTF16(
                      IDS_DEL_BROWSING_HISTORY_COUNTER, local_item_count);
 
   } else if (pref_name == browsing_data::prefs::kDeleteFormData) {
     // Autofill counter.
     const browsing_data::AutofillCounter::AutofillResult* autofill_result =
         static_cast<const browsing_data::AutofillCounter::AutofillResult*>(
@@ skipping 127 matching lines @@
                       prefs->GetBoolean(prefs::kDeleteCache));
     prefs->SetBoolean(prefs::kDeleteCookiesBasic,
                       prefs->GetBoolean(prefs::kDeleteCookies));
     prefs->SetInteger(prefs::kDeleteTimePeriodBasic,
                       prefs->GetInteger(prefs::kDeleteTimePeriod));
     prefs->SetBoolean(prefs::kPreferencesMigratedToBasic, true);
   }
 }
 
 }  // namespace browsing_data