[Autofill] Fix MessageLoop in test.

chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc

Index: chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc
diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc b/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc
index 80128388ff403cc8646a573a79c84a24cba62dca..b5ae3717a218e789a50d26b2f81911f3dee9cec5 100644
--- a/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc
+++ b/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/bind.h"
+#include "base/memory/ref_counted.h"
 #include "base/message_loop.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
@@ -80,7 +81,8 @@ class TestAutofillDialogController : public AutofillDialogControllerImpl {
                                      GURL(),
                                      dialog_type,
                                      base::Bind(&MockCallback)),
-        metric_logger_(metric_logger) {
+        metric_logger_(metric_logger),
+        message_loop_runner_(new content::MessageLoopRunner) {
     DisableWallet();
   }
 
@@ -88,7 +90,7 @@ class TestAutofillDialogController : public AutofillDialogControllerImpl {
 
   virtual void ViewClosed() OVERRIDE {
     AutofillDialogControllerImpl::ViewClosed();
-    MessageLoop::current()->Quit();
+    message_loop_runner_->Quit();
   }
 
   virtual bool InputIsValid(AutofillFieldType type,
@@ -104,6 +106,10 @@ class TestAutofillDialogController : public AutofillDialogControllerImpl {
   // Increase visibility for testing.
   AutofillDialogView* view() { return AutofillDialogControllerImpl::view(); }
 
+  void RunMessageLoop(void) {

[Ilya Sherman, 2013/04/17 00:03:55]

nit: Docs

[Ilya Sherman, 2013/04/17 00:03:55]

nit: Omit the second "void"

+    message_loop_runner_->Run();
+  }
+
  private:
   // To specify our own metric logger.
   virtual const AutofillMetrics& GetMetricLogger() const OVERRIDE {
@@ -111,6 +117,7 @@ class TestAutofillDialogController : public AutofillDialogControllerImpl {
   }
 
   const AutofillMetrics& metric_logger_;
+  scoped_refptr<content::MessageLoopRunner> message_loop_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(TestAutofillDialogController);
 };
@@ -162,7 +169,7 @@ IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest,
     dialog_controller->Show();
     dialog_controller->view()->SubmitForTesting();
 
-    content::RunMessageLoop();
+    dialog_controller->RunMessageLoop();
 
     EXPECT_EQ(AutofillMetrics::DIALOG_ACCEPTED,
               metric_logger.dialog_dismissal_action());
@@ -179,7 +186,7 @@ IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest,
     dialog_controller->Show();
     dialog_controller->view()->CancelForTesting();
 
-    content::RunMessageLoop();
+    dialog_controller->RunMessageLoop();
 
     EXPECT_EQ(AutofillMetrics::DIALOG_CANCELED,
               metric_logger.dialog_dismissal_action());
@@ -196,7 +203,7 @@ IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest,
     dialog_controller->Show();
     dialog_controller->Hide();
 
-    content::RunMessageLoop();
+    dialog_controller->RunMessageLoop();
 
     EXPECT_EQ(AutofillMetrics::DIALOG_CANCELED,
               metric_logger.dialog_dismissal_action());
@@ -219,7 +226,7 @@ IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest,
 
     dialog_controller->Hide();
 
-    content::RunMessageLoop();
+    dialog_controller->RunMessageLoop();
 
     EXPECT_EQ(AutofillMetrics::AUTOCHECKOUT_SUCCEEDED,
               metric_logger.autocheckout_status());
@@ -242,7 +249,7 @@ IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest,
     dialog_controller->OnAutocheckoutError();
     dialog_controller->view()->CancelForTesting();
 
-    content::RunMessageLoop();
+    dialog_controller->RunMessageLoop();
 
     EXPECT_EQ(AutofillMetrics::AUTOCHECKOUT_FAILED,
               metric_logger.autocheckout_status());