components/autofill/core/browser/autofill_test_utils.cc - Issue 301343002: mac: Clean up autofill integration with Address Book.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: components/autofill/core/browser/autofill_test_utils.cc

Issue 301343002: mac: Clean up autofill integration with Address Book. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@autofill_cleanup2_base

Patch Set: Autofill test failures on Android. Undo a change to autofill_test_utils.cc. Created 6 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « components/autofill/core/browser/autofill_manager_unittest.cc ('k') | components/autofill/core/browser/personal_data_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/autofill/core/browser/autofill_test_utils.cc

diff --git a/components/autofill/core/browser/autofill_test_utils.cc b/components/autofill/core/browser/autofill_test_utils.cc

index 081defa337a6781650b195de46a744b8207b6b3f..0393d867e922b5bda1fe673bddaa2d63decb46ee 100644

--- a/components/autofill/core/browser/autofill_test_utils.cc

+++ b/components/autofill/core/browser/autofill_test_utils.cc

@@ -206,12 +206,17 @@ void DisableSystemServices(PrefService* prefs) {

// Use a mock Keychain rather than the OS one to store credit card data.

#if defined(OS_MACOSX)

OSCrypt::UseMockKeychain(true);

-#endif

+#endif // defined(OS_MACOSX)

- // Disable auxiliary profiles for unit testing. These reach out to system

- // services on the Mac.

+#if defined(OS_MACOSX) && !defined(OS_IOS)

+ // Don't use the Address Book on Mac, as it reaches out to system services.

+ if (prefs)

+ prefs->SetBoolean(prefs::kAutofillUseMacAddressBook, false);

+#else

+ // Disable auxiliary profiles for unit testing by default.

if (prefs)

prefs->SetBoolean(prefs::kAutofillAuxiliaryProfilesEnabled, false);

+#endif // defined(OS_MACOSX) && !defined(OS_IOS)

}

} // namespace test