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

chrome/browser/browsing_data/passwords_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.
 
 #include "chrome/browser/browsing_data/passwords_counter.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/password_manager/password_store_factory.h"
@@ skipping 69 matching lines @@
       return;
     run_loop_.reset(new base::RunLoop());
     run_loop_->Run();
   }
 
   BrowsingDataCounter::ResultInt GetResult() {
     DCHECK(finished_);
     return result_;
   }
 
-  void Callback(bool finished, BrowsingDataCounter::ResultInt count) {
-    finished_ = finished;
-    result_ = count;
-    if (run_loop_ && finished)
+  void Callback(scoped_ptr<BrowsingDataCounter::Result> result) {
+    finished_ = result->Finished();
+
+    if (finished_) {
+      result_ = static_cast<BrowsingDataCounter::FinishedResult*>(
+          result.get())->Value();
+    }
+
+    if (run_loop_ && finished_)
       run_loop_->Quit();
   }
 
  private:
   PasswordForm CreateCredentials(const std::string& origin,
                                  const std::string& username,
                                  bool blacklisted) {
     PasswordForm result;
     result.signon_realm = origin;
     result.origin = GURL(origin);
@@ skipping 134 matching lines @@
   SetDeletionPeriodPref(BrowsingDataRemover::FOUR_WEEKS);
   WaitForCounting();
   EXPECT_EQ(3u, GetResult());
 
   SetDeletionPeriodPref(BrowsingDataRemover::EVERYTHING);
   WaitForCounting();
   EXPECT_EQ(4u, GetResult());
 }
 
 }  // namespace