Show password sync status in CBD

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 BrowsingDataCounter::Result* result) {
   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)
+  } else if (pref_name == prefs::kDeletePasswords) {
+    const PasswordsCounter::PasswordResult* password_result =
+        static_cast<const PasswordsCounter::PasswordResult*>(result);
+
+    BrowsingDataCounter::ResultInt count = password_result->Value();
+
+    text = l10n_util::GetPluralStringFUTF16(
+        password_result->password_sync_enabled()
+            ? IDS_DEL_PASSWORDS_COUNTER_SYNCED
+            : IDS_DEL_PASSWORDS_COUNTER,
+        count);
+  } else if (pref_name == prefs::kDeleteDownloadHistory) {
+    BrowsingDataCounter::ResultInt count =
+        static_cast<const 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::kDeleteBrowsingHistoryBasic) {
+    text = l10n_util::GetPluralStringFUTF16(IDS_DEL_DOWNLOADS_COUNTER, count);
+  } else if (pref_name == prefs::kDeleteBrowsingHistoryBasic) {
     // The basic tab doesn't show history counter results.
     NOTREACHED();
-  } else if (pref_name == browsing_data::prefs::kDeleteBrowsingHistory) {
+  } else if (pref_name == 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();
+    const HistoryCounter::HistoryResult* history_result =
+        static_cast<const HistoryCounter::HistoryResult*>(result);
+    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) {
+  } else if (pref_name == 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 =
+    const AutofillCounter::AutofillResult* autofill_result =
+        static_cast<const AutofillCounter::AutofillResult*>(result);
+    AutofillCounter::ResultInt num_suggestions = autofill_result->Value();
+    AutofillCounter::ResultInt num_credit_cards =
         autofill_result->num_credit_cards();
-    browsing_data::AutofillCounter::ResultInt num_addresses =
-        autofill_result->num_addresses();
+    AutofillCounter::ResultInt num_addresses = autofill_result->num_addresses();
 
     std::vector<base::string16> displayed_strings;
 
     if (num_credit_cards) {
       displayed_strings.push_back(l10n_util::GetPluralStringFUTF16(
           IDS_DEL_AUTOFILL_COUNTER_CREDIT_CARDS, num_credit_cards));
     }
     if (num_addresses) {
       displayed_strings.push_back(l10n_util::GetPluralStringFUTF16(
           IDS_DEL_AUTOFILL_COUNTER_ADDRESSES, num_addresses));
@@ skipping 110 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