summaryrefslogtreecommitdiffstats
path: root/components
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-28 21:48:37 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-28 21:48:37 +0000
commitb158c097e0d0af3ccc3c836a2f3c13ac35686549 (patch)
treed4529d92ff82da15923b99f4f00d53057f37dba1 /components
parent211a3f36ec6238cee49cea6e9801ab444d238871 (diff)
downloadchromium_src-b158c097e0d0af3ccc3c836a2f3c13ac35686549.zip
chromium_src-b158c097e0d0af3ccc3c836a2f3c13ac35686549.tar.gz
chromium_src-b158c097e0d0af3ccc3c836a2f3c13ac35686549.tar.bz2
Fix AutofillDialogCocoaBrowserTest, AutofillMetricsTest.
BUG=242659, 234008 TEST=Mac 64 tester bot doesn't time out Review URL: https://chromiumcodereview.appspot.com/15840012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202659 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components')
-rw-r--r--components/autofill/browser/autofill_metrics_unittest.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/components/autofill/browser/autofill_metrics_unittest.cc b/components/autofill/browser/autofill_metrics_unittest.cc
index 14c5c19..c2beac7 100644
--- a/components/autofill/browser/autofill_metrics_unittest.cc
+++ b/components/autofill/browser/autofill_metrics_unittest.cc
@@ -295,9 +295,13 @@ AutofillMetricsTest::~AutofillMetricsTest() {
void AutofillMetricsTest::SetUp() {
TestingProfile* profile = new TestingProfile();
+
+ // Ensure Mac OS X does not pop up a modal dialog for the Address Book.
+ autofill::test::DisableSystemServices(profile);
+
profile->CreateRequestContext();
browser_context_.reset(profile);
- PersonalDataManagerFactory::GetInstance()->SetTestingFactory( profile, NULL);
+ PersonalDataManagerFactory::GetInstance()->SetTestingFactory(profile, NULL);
ChromeRenderViewHostTestHarness::SetUp();
io_thread_.StartIOThread();