[Autofill] Fix MessageLoop in test.

chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc

 // Copyright (c) 2012 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 "base/bind.h"
+#include "base/memory/ref_counted.h"
 #include "base/message_loop.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_controller_impl.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_view.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "components/autofill/browser/autofill_metrics.h"
 #include "components/autofill/common/form_data.h"
@@ skipping 51 matching lines @@
   AutofillMetrics::AutocheckoutCompletionStatus autocheckout_status_;
 
   DISALLOW_COPY_AND_ASSIGN(MockAutofillMetrics);
 };
 
 class TestAutofillDialogController : public AutofillDialogControllerImpl {
  public:
   TestAutofillDialogController(content::WebContents* contents,
                                const FormData& form_data,
                                const AutofillMetrics& metric_logger,
+                               scoped_refptr<content::MessageLoopRunner> runner,
                                const DialogType dialog_type)
       : AutofillDialogControllerImpl(contents,
                                      form_data,
                                      GURL(),
                                      dialog_type,
                                      base::Bind(&MockCallback)),
-        metric_logger_(metric_logger) {
+        metric_logger_(metric_logger),
+        message_loop_runner_(runner) {
     DisableWallet();
   }
 
   virtual ~TestAutofillDialogController() {}
 
   virtual void ViewClosed() OVERRIDE {
+    message_loop_runner_->Quit();
     AutofillDialogControllerImpl::ViewClosed();
-    MessageLoop::current()->Quit();
   }
 
   virtual bool InputIsValid(AutofillFieldType type,
                             const string16& value) OVERRIDE {
     return true;
   }
 
   virtual std::vector<AutofillFieldType> InputsAreValid(
       const DetailOutputMap& inputs, ValidationType validation_type) OVERRIDE {
     return std::vector<AutofillFieldType>();
   }
 
   // Increase visibility for testing.
   AutofillDialogView* view() { return AutofillDialogControllerImpl::view(); }
 
  private:
   // To specify our own metric logger.
   virtual const AutofillMetrics& GetMetricLogger() const OVERRIDE {
     return metric_logger_;
   }
 
   const AutofillMetrics& metric_logger_;
+  scoped_refptr<content::MessageLoopRunner> message_loop_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(TestAutofillDialogController);
 };
 
 }  // namespace
 
 class AutofillDialogControllerTest : public InProcessBrowserTest {
  public:
   AutofillDialogControllerTest() {}
   virtual ~AutofillDialogControllerTest() {}
 
   content::WebContents* GetActiveWebContents() {
     return browser()->tab_strip_model()->GetActiveWebContents();
   }
 
+  TestAutofillDialogController* CreateController(
+      const FormData& form,
+      const AutofillMetrics& metric_logger,
+      const DialogType dialog_type) {
+    message_loop_runner_ = new content::MessageLoopRunner;
+    return new TestAutofillDialogController(
+        GetActiveWebContents(), form, metric_logger, message_loop_runner_,
+        dialog_type);
+  }
+
+  void RunMessageLoop() {
+    message_loop_runner_->Run();
+  }

[Ilya Sherman, 2013/04/20 01:19:07]

nit: Please leave a blank line after this one.

[groby-ooo-7-16, 2013/04/20 02:28:37]

Done.

  private:
+  scoped_refptr<content::MessageLoopRunner> message_loop_runner_;
   DISALLOW_COPY_AND_ASSIGN(AutofillDialogControllerTest);
 };
 
 // TODO(isherman): Enable this test on other platforms once the UI is
 // implemented on those platforms.
 #if defined(TOOLKIT_VIEWS)
 #define MAYBE_RequestAutocompleteUiDurationMetrics \
     RequestAutocompleteUiDurationMetrics
 #else
 #define MAYBE_RequestAutocompleteUiDurationMetrics \
     DISABLED_RequestAutocompleteUiDurationMetrics
 #endif  // defined(TOOLKIT_VIEWS)
 IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest,
                        MAYBE_RequestAutocompleteUiDurationMetrics) {
   FormData form;
   form.name = ASCIIToUTF16("TestForm");
   form.method = ASCIIToUTF16("POST");
   form.origin = GURL("http://example.com/form.html");
   form.action = GURL("http://example.com/submit.html");
   form.user_submitted = true;
 
   FormFieldData field;
   field.autocomplete_attribute = "email";
   form.fields.push_back(field);
 
   // Submit the form data.
   {
     MockAutofillMetrics metric_logger;
-    TestAutofillDialogController* dialog_controller =
-        new TestAutofillDialogController(
-            GetActiveWebContents(), form, metric_logger,
-            DIALOG_TYPE_REQUEST_AUTOCOMPLETE);
+    TestAutofillDialogController* dialog_controller = CreateController(
+        form, metric_logger, DIALOG_TYPE_REQUEST_AUTOCOMPLETE);
     dialog_controller->Show();
     dialog_controller->view()->SubmitForTesting();
 
-    content::RunMessageLoop();
+    RunMessageLoop();
 
     EXPECT_EQ(AutofillMetrics::DIALOG_ACCEPTED,
               metric_logger.dialog_dismissal_action());
     EXPECT_EQ(DIALOG_TYPE_REQUEST_AUTOCOMPLETE, metric_logger.dialog_type());
   }
 
   // Cancel out of the dialog.
   {
     MockAutofillMetrics metric_logger;
-    TestAutofillDialogController* dialog_controller =
-        new TestAutofillDialogController(
-            GetActiveWebContents(), form, metric_logger,
-            DIALOG_TYPE_AUTOCHECKOUT);
+    TestAutofillDialogController* dialog_controller = CreateController(
+        form, metric_logger, DIALOG_TYPE_AUTOCHECKOUT);
     dialog_controller->Show();
     dialog_controller->view()->CancelForTesting();
 
-    content::RunMessageLoop();
+    RunMessageLoop();
 
     EXPECT_EQ(AutofillMetrics::DIALOG_CANCELED,
               metric_logger.dialog_dismissal_action());
     EXPECT_EQ(DIALOG_TYPE_AUTOCHECKOUT, metric_logger.dialog_type());
   }
 
   // Take some other action that dismisses the dialog.
   {
     MockAutofillMetrics metric_logger;
-    TestAutofillDialogController* dialog_controller =
-        new TestAutofillDialogController(
-            GetActiveWebContents(), form, metric_logger,
-            DIALOG_TYPE_AUTOCHECKOUT);
+    TestAutofillDialogController* dialog_controller = CreateController(
+        form, metric_logger, DIALOG_TYPE_AUTOCHECKOUT);
     dialog_controller->Show();
     dialog_controller->Hide();
 
-    content::RunMessageLoop();
+    RunMessageLoop();
 
     EXPECT_EQ(AutofillMetrics::DIALOG_CANCELED,
               metric_logger.dialog_dismissal_action());
     EXPECT_EQ(DIALOG_TYPE_AUTOCHECKOUT, metric_logger.dialog_type());
   }
 
   // Test Autocheckout success metrics.
   {
     MockAutofillMetrics metric_logger;
-    TestAutofillDialogController* dialog_controller =
-        new TestAutofillDialogController(
-            GetActiveWebContents(), form, metric_logger,
-            DIALOG_TYPE_AUTOCHECKOUT);
+    TestAutofillDialogController* dialog_controller = CreateController(
+        form, metric_logger, DIALOG_TYPE_AUTOCHECKOUT);
     dialog_controller->Show();
     dialog_controller->view()->SubmitForTesting();
 
     EXPECT_EQ(AutofillMetrics::DIALOG_ACCEPTED,
               metric_logger.dialog_dismissal_action());
     EXPECT_EQ(DIALOG_TYPE_AUTOCHECKOUT, metric_logger.dialog_type());
 
     dialog_controller->Hide();
 
-    content::RunMessageLoop();
+    RunMessageLoop();
 
     EXPECT_EQ(AutofillMetrics::AUTOCHECKOUT_SUCCEEDED,
               metric_logger.autocheckout_status());
   }
 
   // Test Autocheckout failure metric.
   {
     MockAutofillMetrics metric_logger;
-    TestAutofillDialogController* dialog_controller =
-        new TestAutofillDialogController(
-            GetActiveWebContents(), form, metric_logger,
-            DIALOG_TYPE_AUTOCHECKOUT);
+    TestAutofillDialogController* dialog_controller = CreateController(
+        form, metric_logger, DIALOG_TYPE_AUTOCHECKOUT);
     dialog_controller->Show();
     dialog_controller->view()->SubmitForTesting();
 
     EXPECT_EQ(AutofillMetrics::DIALOG_ACCEPTED,
               metric_logger.dialog_dismissal_action());
     EXPECT_EQ(DIALOG_TYPE_AUTOCHECKOUT, metric_logger.dialog_type());
 
     dialog_controller->OnAutocheckoutError();
     dialog_controller->view()->CancelForTesting();
 
-    content::RunMessageLoop();
+    RunMessageLoop();
 
     EXPECT_EQ(AutofillMetrics::AUTOCHECKOUT_FAILED,
               metric_logger.autocheckout_status());
   }
 }
 
 }  // namespace autofill