Index: chrome/browser/ui/cocoa/autofill/autofill_dialog_cocoa_browsertest.mm |
diff --git a/chrome/browser/ui/cocoa/autofill/autofill_dialog_cocoa_browsertest.mm b/chrome/browser/ui/cocoa/autofill/autofill_dialog_cocoa_browsertest.mm |
index 888087f64754e25329083c26a7d172cefc87a2dc..7e768486ad9260b05dbffd13087055c00896c051 100644 |
--- a/chrome/browser/ui/cocoa/autofill/autofill_dialog_cocoa_browsertest.mm |
+++ b/chrome/browser/ui/cocoa/autofill/autofill_dialog_cocoa_browsertest.mm |
@@ -45,13 +45,8 @@ class TestAutofillDialogController : public AutofillDialogControllerImpl { |
virtual void ViewClosed() OVERRIDE { |
DCHECK(runner_); |
- AutofillDialogControllerImpl::ViewClosed(); |
runner_->Quit(); |
- } |
- |
- void RunMessageLoop() { |
- DCHECK(runner_); |
- runner_->Run(); |
+ AutofillDialogControllerImpl::ViewClosed(); |
} |
AutofillDialogCocoa* GetView() { |
@@ -96,6 +91,11 @@ class AutofillDialogCocoaBrowserTest : public InProcessBrowserTest { |
TestAutofillDialogController* controller() { return controller_; } |
+ void RunMessageLoop() { |
+ DCHECK(runner_); |
+ runner_->Run(); |
+ } |
+ |
private: |
// The controller owns itself. |
TestAutofillDialogController* controller_; |
@@ -107,19 +107,12 @@ class AutofillDialogCocoaBrowserTest : public InProcessBrowserTest { |
DISALLOW_COPY_AND_ASSIGN(AutofillDialogCocoaBrowserTest); |
}; |
-// The following test fails under ASAN due to a read-after-free. |
-// http://crbug.com/234008 |
-#if defined(ADDRESS_SANITIZER) |
-#define MAYBE_DisplayUI DISABLED_DisplayUI |
-#else |
-#define MAYBE_DisplayUI DisplayUI |
-#endif |
-IN_PROC_BROWSER_TEST_F(AutofillDialogCocoaBrowserTest, MAYBE_DisplayUI) { |
+IN_PROC_BROWSER_TEST_F(AutofillDialogCocoaBrowserTest, DisplayUI) { |
controller()->Show(); |
controller()->OnCancel(); |
controller()->Hide(); |
- controller()->RunMessageLoop(); |
+ RunMessageLoop(); |
} |
} // namespace |