Move browsing_data counter sync tests to separate file

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 57 matching lines @@
 base::string16 GetCounterTextFromResult(
     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 == prefs::kDeletePasswords) {
-    const PasswordsCounter::PasswordResult* password_result =
-        static_cast<const PasswordsCounter::PasswordResult*>(result);
+    const BrowsingDataCounter::SyncResult* password_result =
+        static_cast<const BrowsingDataCounter::SyncResult*>(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,
+        password_result->IsSyncEnabled() ? 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(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 == prefs::kDeleteBrowsingHistory) {
     // History counter.
-    const HistoryCounter::HistoryResult* history_result =
-        static_cast<const HistoryCounter::HistoryResult*>(result);
+    const BrowsingDataCounter::SyncResult* history_result =
+        static_cast<const BrowsingDataCounter::SyncResult*>(result);
     BrowsingDataCounter::ResultInt local_item_count = history_result->Value();
-    bool has_synced_visits = history_result->has_synced_visits();
+    bool has_synced_visits = history_result->IsSyncEnabled();
     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 == prefs::kDeleteFormData) {
     // Autofill counter.
     const AutofillCounter::AutofillResult* autofill_result =
         static_cast<const AutofillCounter::AutofillResult*>(result);
@@ skipping 26 matching lines @@
           break;
         case 2:
           displayed_strings.push_back(l10n_util::GetPluralStringFUTF16(
               IDS_DEL_AUTOFILL_COUNTER_SUGGESTIONS_SHORT, num_suggestions));
           break;
         default:
           NOTREACHED();
       }
     }
 
-    bool synced = autofill_result->autofill_sync_enabled();
+    bool synced = autofill_result->IsSyncEnabled();
 
     // Construct the resulting string from the sections in |displayed_strings|.
     switch (displayed_strings.size()) {
       case 0:
         text = l10n_util::GetStringUTF16(IDS_DEL_AUTOFILL_COUNTER_EMPTY);
         break;
       case 1:
         text = synced ? l10n_util::GetStringFUTF16(
                             IDS_DEL_AUTOFILL_COUNTER_ONE_TYPE_SYNCED,
                             displayed_strings[0])
@@ skipping 84 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