Convert BrowsingDataRemover Test Utils from MessageLoopRunner to RunLoop

This makes migrating to FlushAsyncForTesting() clearer.

BUG=668707,749312

Change-Id: I074c71c21e2cbbc3fc2b1ea87d08ebd957b6c7f7
Reviewed-on: https://chromium-review.googlesource.com/978839Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Robert Liao <robliao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#546130}

content/public/test/browsing_data_remover_test_util.cc

@@ -3,13 +3,15 @@
 // found in the LICENSE file.
 
 #include "content/public/test/browsing_data_remover_test_util.h"
+
+#include "base/bind.h"
 #include "base/task_scheduler/task_scheduler.h"
 
 namespace content {
 
 BrowsingDataRemoverCompletionObserver::BrowsingDataRemoverCompletionObserver(
     BrowsingDataRemover* remover)
-    : message_loop_runner_(new MessageLoopRunner()), observer_(this) {
+    : observer_(this) {
   observer_.Add(remover);
 }
 
@@ -18,17 +20,17 @@ BrowsingDataRemoverCompletionObserver::
 
 void BrowsingDataRemoverCompletionObserver::BlockUntilCompletion() {
   base::TaskScheduler::GetInstance()->FlushForTesting();
-  message_loop_runner_->Run();
+  run_loop_.Run();
 }
 
 void BrowsingDataRemoverCompletionObserver::OnBrowsingDataRemoverDone() {
   observer_.RemoveAll();
-  message_loop_runner_->Quit();
+  run_loop_.QuitWhenIdle();
 }
 
 BrowsingDataRemoverCompletionInhibitor::BrowsingDataRemoverCompletionInhibitor(
     BrowsingDataRemover* remover)
-    : remover_(remover), message_loop_runner_(new content::MessageLoopRunner) {
+    : remover_(remover), run_loop_(new base::RunLoop) {
   DCHECK(remover);
   remover_->SetWouldCompleteCallbackForTesting(
       base::Bind(&BrowsingDataRemoverCompletionInhibitor::
@@ -51,8 +53,8 @@ void BrowsingDataRemoverCompletionInhibitor::Reset() {
 
 void BrowsingDataRemoverCompletionInhibitor::BlockUntilNearCompletion() {
   base::TaskScheduler::GetInstance()->FlushForTesting();
-  message_loop_runner_->Run();
-  message_loop_runner_ = new MessageLoopRunner();
+  run_loop_->Run();
+  run_loop_ = std::make_unique<base::RunLoop>();
 }
 
 void BrowsingDataRemoverCompletionInhibitor::ContinueToCompletion() {
@@ -65,7 +67,7 @@ void BrowsingDataRemoverCompletionInhibitor::OnBrowsingDataRemoverWouldComplete(
     const base::Closure& continue_to_completion) {
   DCHECK(continue_to_completion_callback_.is_null());
   continue_to_completion_callback_ = continue_to_completion;
-  message_loop_runner_->Quit();
+  run_loop_->QuitWhenIdle();
 }
 
 }  // namespace content

content/public/test/browsing_data_remover_test_util.h

@@ -5,11 +5,12 @@
 #ifndef CONTENT_PUBLIC_TEST_BROWSING_DATA_REMOVER_TEST_UTIL_H_
 #define CONTENT_PUBLIC_TEST_BROWSING_DATA_REMOVER_TEST_UTIL_H_
 
+#include <memory>
+
 #include "base/macros.h"
-#include "base/memory/ref_counted.h"
+#include "base/run_loop.h"
 #include "base/scoped_observer.h"
 #include "content/public/browser/browsing_data_remover.h"
-#include "content/public/test/test_utils.h"
 
 namespace content {
 
@@ -28,7 +29,7 @@ class BrowsingDataRemoverCompletionObserver
   void OnBrowsingDataRemoverDone() override;
 
  private:
-  scoped_refptr<MessageLoopRunner> message_loop_runner_;
+  base::RunLoop run_loop_;
   ScopedObserver<BrowsingDataRemover, BrowsingDataRemover::Observer> observer_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowsingDataRemoverCompletionObserver);
@@ -60,7 +61,7 @@ class BrowsingDataRemoverCompletionInhibitor {
   // this class is responsible for calling Reset().
   BrowsingDataRemover* remover_;
 
-  scoped_refptr<content::MessageLoopRunner> message_loop_runner_;
+  std::unique_ptr<base::RunLoop> run_loop_;
   base::Closure continue_to_completion_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowsingDataRemoverCompletionInhibitor);