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

chrome/browser/browsing_data/cache_counter_browsertest.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.
 //
 // Note that this file only tests the basic behavior of the cache counter, as in
 // when it counts and when not, when result is nonzero and when not. It does not
 // test whether the result of the counting is correct. This is the
 // responsibility of a lower layer, and is tested in
 // DiskCacheBackendTest.CalculateSizeOfAllEntries in net_unittests.
 
@@ skipping 111 matching lines @@
   }
 
   // General completion callback.
   void Callback() {
     DCHECK_CURRENTLY_ON(BrowserThread::UI);
     if (run_loop_)
       run_loop_->Quit();
   }
 
   // Callback from the counter.
-  void CountingCallback(bool finished, BrowsingDataCounter::ResultInt count) {
+  void CountingCallback(scoped_ptr<BrowsingDataCounter::Result> result) {
     DCHECK_CURRENTLY_ON(BrowserThread::UI);
-    finished_ = finished;
-    result_ = count;
-    if (run_loop_ && finished)
+    finished_ = result->Finished();
+
+    if (finished_) {
+      result_ = static_cast<BrowsingDataCounter::FinishedResult*>(

[Bernhard Bauer, 2015/11/03 14:13:46]

Basically, now anytime you call Value(), the call is guarded by Finished(), so
you could in principle add Value() back on the base class instead. I'll leave
that up to you though.

[msramek, 2015/11/03 14:54:09]

I'll leave it as it is now. We'd get rid of the casts, but not of the additional
Finished() checks anyway, so at least the Result semantics are now clear :)

+          result.get())->Value();
+    }
+
+    if (run_loop_ && finished_)
       run_loop_->Quit();
   }
 
   BrowsingDataCounter::ResultInt GetResult() {
     DCHECK(finished_);
     return result_;
   }
 
  private:
   enum CacheEntryCreationStep {
@@ skipping 115 matching lines @@
   SetDeletionPeriodPref(BrowsingDataRemover::FOUR_WEEKS);
   WaitForIOThread();
   EXPECT_EQ(result, GetResult());
 
   SetDeletionPeriodPref(BrowsingDataRemover::EVERYTHING);
   WaitForIOThread();
   EXPECT_EQ(result, GetResult());
 }
 
 }  // namespace