Fix AutofillDialogCocoaBrowserTest.DisplayUI.

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

 // Copyright (c) 2013 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.
 #import "chrome/browser/ui/cocoa/autofill/autofill_dialog_cocoa.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_controller_impl.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_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 {
 
 void MockCallback(const FormStructure*, const std::string&) {}
 
 class TestAutofillDialogController : public AutofillDialogControllerImpl {
  public:
   TestAutofillDialogController(
       content::WebContents* contents,
@@ skipping 41 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(TestAutofillDialogController);
 };
 
 class AutofillDialogCocoaBrowserTest : public InProcessBrowserTest {
  public:
   AutofillDialogCocoaBrowserTest() : 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;
     form_data.fields.push_back(field);
     runner_ = new content::MessageLoopRunner;
     controller_ = new TestAutofillDialogController(
         browser()->tab_strip_model()->GetActiveWebContents(),
         form_data,
         metric_logger_,
         runner_,
         DIALOG_TYPE_REQUEST_AUTOCOMPLETE);
   }
 
   TestAutofillDialogController* controller() { return controller_; }
 
  private:
   // The controller owns itself.
   TestAutofillDialogController* controller_;
 
   // The following members must outlive the controller.
   AutofillMetrics metric_logger_;
   scoped_refptr<content::MessageLoopRunner> runner_;
 
   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();
 
   controller()->RunMessageLoop();
 }
 
 }  // namespace
 
 }  // namespace autofill