Move browsing_data counter sync tests to separate file

components/browsing_data/core/counters/history_counter.cc

 // Copyright (c) 2015 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/counters/history_counter.h"
 
 #include <limits.h>
 #include <stdint.h>
 
 #include "base/memory/ptr_util.h"
@@ skipping 84 matching lines @@
   // TODO(msramek): Include web history count when there is an API for it.
 }
 
 void HistoryCounter::OnGetLocalHistoryCount(
     history::HistoryCountResult result) {
   // Ensure that all callbacks are on the same thread, so that we do not need
   // a mutex for |MergeResults|.
   DCHECK(thread_checker_.CalledOnValidThread());
 
   if (!result.success) {
-    LOG(ERROR) << "Failed to count the local history.";
     return;
   }
 
   local_result_ = result.count;
   local_counting_finished_ = true;
   MergeResults();
 }
 
 void HistoryCounter::OnGetWebHistoryCount(
     history::WebHistoryService::Request* request,
@@ skipping 28 matching lines @@
   web_history_request_.reset();
   has_synced_visits_ = true;
   web_counting_finished_ = true;
   MergeResults();
 }
 
 void HistoryCounter::MergeResults() {
   if (!local_counting_finished_ || !web_counting_finished_)
     return;
 
-  ReportResult(
-      base::MakeUnique<HistoryResult>(this, local_result_, has_synced_visits_));
+  ReportResult(base::MakeUnique<HistoryResult>(
+      this, local_result_, history_sync_enabled_, has_synced_visits_));
 }
 
-HistoryCounter::HistoryResult::HistoryResult(const HistoryCounter* source,
-                                             ResultInt value,
-                                             bool has_synced_visits)
-    : FinishedResult(source, value), has_synced_visits_(has_synced_visits) {}
-
-HistoryCounter::HistoryResult::~HistoryResult() {}
-
 void HistoryCounter::OnStateChanged(syncer::SyncService* sync) {
   bool history_sync_enabled_new_state = !!web_history_service_callback_.Run();
 
   // If the history sync was just enabled or disabled, restart the counter
   // so that we update the result accordingly.
   if (history_sync_enabled_ != history_sync_enabled_new_state) {
     history_sync_enabled_ = history_sync_enabled_new_state;
     Restart();
   }
 }
 
+HistoryCounter::HistoryResult::HistoryResult(const HistoryCounter* source,
+                                             ResultInt value,
+                                             bool is_sync_enabled,
+                                             bool has_synced_visits)
+    : SyncResult(source, value, is_sync_enabled),
+      has_synced_visits_(has_synced_visits) {}
+
+HistoryCounter::HistoryResult::~HistoryResult() {}
+
 }  // namespace browsing_data