Fix AutofillDialogCocoaBrowserTest.DisplayUI.

chrome/browser/ui/cocoa/autofill/autofill_dialog_cocoa_browsertest.mm

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 f6f5165ff03df6fc97989d4297b477a1913fd77a..c160448b4dd3fa9fc0deaf8c160a0902fe5be99d 100644
--- a/chrome/browser/ui/cocoa/autofill/autofill_dialog_cocoa_browsertest.mm
+++ b/chrome/browser/ui/cocoa/autofill/autofill_dialog_cocoa_browsertest.mm
@@ -10,12 +10,16 @@
 #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_common_test.h"
 #include "components/autofill/common/form_data.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "content/public/test/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+// TODO(groby): This entire file can be removed once the dialog supports the
+// cross-platform tests at AutofillDialogControllerTest.*
+
 namespace autofill {
 
 namespace {
@@ -77,6 +81,9 @@ class AutofillDialogCocoaBrowserTest : public InProcessBrowserTest {
   virtual ~AutofillDialogCocoaBrowserTest() {}
 
   virtual void SetUpOnMainThread() OVERRIDE {
+    // Ensure Mac OS X does not pop up a modal dialog for the Address Book.
+    autofill::test::DisableSystemServices(browser()->profile());

[Avi (use Gerrit), 2013/05/24 16:21:24]

Passing a real profile here, rather than NULL as you did in
https://chromiumcodereview.appspot.com/13996022 , is key here. If we look at
DisableSystemServices, it only properly disables auxiliary profiles if you pass
the profile. If you pass NULL, as the previous version of this patch did,
nothing happens.

+
     FormFieldData field;
     field.autocomplete_attribute = "cc-number";
     FormData form_data;
@@ -103,15 +110,7 @@ class AutofillDialogCocoaBrowserTest : public InProcessBrowserTest {
   DISALLOW_COPY_AND_ASSIGN(AutofillDialogCocoaBrowserTest);
 };
 
-// The following test fails under ASAN. Disabling until root cause is found.
-// This can pop up a "browser_tests would like access to your Contacts" dialog.
-// See also 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();