Polish the result communication and display of the browsing data counters.

chrome/browser/browsing_data/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 <limits.h>
 #include <stdint.h>
 
 #include "base/timer/timer.h"
 #include "chrome/browser/browsing_data/history_counter.h"
 #include "chrome/browser/history/history_service_factory.h"
@@ skipping 10 matching lines @@
 HistoryCounter::HistoryCounter() : pref_name_(prefs::kDeleteBrowsingHistory),
                                    has_synced_visits_(false),
                                    local_counting_finished_(false),
                                    web_counting_finished_(false),
                                    testing_web_history_service_(nullptr) {
 }
 
 HistoryCounter::~HistoryCounter() {
 }
 
-// Note that the local counting done by |VisitDatabase::GetHistoryCount|
-// returns an int, which is at most a signed 64-bit number. On the other hand,
-// ResultInt is an unsigned 64-bit number, so the range 2^63..2^64-1 is unused
-// and we can use it to encode special values.
-// static
-const BrowsingDataCounter::ResultInt HistoryCounter::kOnlySyncedHistory =
-    std::numeric_limits<BrowsingDataCounter::ResultInt>::max();
-COMPILE_ASSERT(
-    std::numeric_limits<int>::digits <
-        std::numeric_limits<BrowsingDataCounter::ResultInt>::digits,
-    "BrowsingDataCounter::ResultInt must be wider than int.");
-
 const std::string& HistoryCounter::GetPrefName() const {
   return pref_name_;
 }
 
 bool HistoryCounter::HasTrackedTasks() {
   return cancelable_task_tracker_.HasTrackedTasks();
 }
 
 void HistoryCounter::SetWebHistoryServiceForTesting(
     history::WebHistoryService* service) {
@@ skipping 101 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;
 
-  if (!local_result_ && has_synced_visits_)
-    ReportResult(kOnlySyncedHistory);
-  else
-    ReportResult(local_result_);
+  ReportResult(make_scoped_ptr(new HistoryResult(
+      this, local_result_, 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() {
+}