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 48 matching lines @@
           base::UserMetricsAction("ClearBrowsingData_LastMonth"));
       break;
     case TimePeriod::ALL_TIME:
       base::RecordAction(
           base::UserMetricsAction("ClearBrowsingData_Everything"));
       break;
   }
 }
 
 base::string16 GetCounterTextFromResult(
-    const browsing_data::BrowsingDataCounter::Result* result) {
+    const browsing_data::BrowsingDataCounter::Result* result,
+    ClearBrowsingDataTab cbd_tab) {
   base::string16 text;
   std::string pref_name = result->source()->GetPrefName();
 
   if (!result->Finished()) {
     // The counter is still counting.
     text = l10n_util::GetStringUTF16(IDS_CLEAR_BROWSING_DATA_CALCULATING);
 
   } else if (pref_name == browsing_data::prefs::kDeletePasswords ||
              pref_name == browsing_data::prefs::kDeleteDownloadHistory) {
     // 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) {

[msramek, 2017/03/15 10:23:35]

High-level question: Why do we need |cbd_tab| when the preference already
clearly distinguishes between them?

If I called this function with browsing_data::prefs::kDeleteBrowsingHistoryBasic
and ClearBrowsingDataTab::ADVANCED, I'll get a valid result. And arguably, I
shouldn't.

[dullweber, 2017/03/15 10:59:50]

We actually don't need it here. Thanks!

     // 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);
+    switch (cbd_tab) {
+      case ClearBrowsingDataTab::ADVANCED:
+        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);
+        break;
+      // The basic tab doesn't show history counter results.
+      case ClearBrowsingDataTab::BASIC:
+      case browsing_data::ClearBrowsingDataTab::NUM_TYPES:

[msramek, 2017/03/15 10:23:35]

nit: No need for the namespace.

+        NOTREACHED();
+    }
 
   } else if (pref_name == browsing_data::prefs::kDeleteFormData) {
     // Autofill counter.
     const browsing_data::AutofillCounter::AutofillResult* autofill_result =
         static_cast<const browsing_data::AutofillCounter::AutofillResult*>(
             result);
     browsing_data::AutofillCounter::ResultInt num_suggestions =
         autofill_result->Value();
     browsing_data::AutofillCounter::ResultInt num_credit_cards =
         autofill_result->num_credit_cards();
@@ skipping 122 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