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

chrome/browser/browsing_data/browsing_data_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 "chrome/browser/browsing_data/browsing_data_counter.h"
 
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
 
@@ skipping 35 matching lines @@
       static_cast<BrowsingDataRemover::TimePeriod>(*period_));
 }
 
 void BrowsingDataCounter::Restart() {
   DCHECK(initialized_);
 
   // If this data type was unchecked for deletion, we do not need to count it.
   if (!profile_->GetPrefs()->GetBoolean(GetPrefName()))
     return;
 
-  callback_.Run(false, 0u);
+  callback_.Run(make_scoped_ptr(new Result(this)));
 
   Count();
 }
 
 void BrowsingDataCounter::ReportResult(ResultInt value) {
   DCHECK(initialized_);
-  callback_.Run(true, value);
+  callback_.Run(make_scoped_ptr(new FinishedResult(this, value)));
 }
+
+void BrowsingDataCounter::ReportResult(scoped_ptr<Result> result) {
+  DCHECK(initialized_);
+  callback_.Run(result.Pass());
+}
+
+// BrowsingDataCounter::Result -------------------------------------------------
+
+BrowsingDataCounter::Result::Result(const BrowsingDataCounter* source)
+    : source_(source) {
+}
+
+BrowsingDataCounter::Result::~Result() {
+}
+
+bool BrowsingDataCounter::Result::finished() const {
+  return false;
+}
+
+const BrowsingDataCounter::ResultInt
+    BrowsingDataCounter::Result::value() const {
+  return 0;

[Bernhard Bauer, 2015/11/03 10:11:19]

You could add a NOTREACHED(), or -- depending on how you feel about static casts
-- only implement this method in the subclass.

[msramek, 2015/11/03 10:55:45]

Yes, I wanted to move it to the subclass (if you look at the diff between 2 and
3 you can see a trace of it), but there would be too many static casts. In this
case I'd go with more readable code at callsites rather than semantic
perfection.

But I added a NOTREACHED().

+}
+
+// BrowsingDataCounter::FinishedResult -----------------------------------------
+
+BrowsingDataCounter::FinishedResult::FinishedResult(
+    const BrowsingDataCounter* source, ResultInt value)
+    : Result(source),
+      value_(value) {
+}
+
+BrowsingDataCounter::FinishedResult::~FinishedResult() {
+}
+
+bool BrowsingDataCounter::FinishedResult::finished() const {
+  return true;
+}
+
+const BrowsingDataCounter::ResultInt
+    BrowsingDataCounter::FinishedResult::value() const {
+  return value_;
+}