chrome/browser/sync/test/integration/two_client_preferences_sync_test.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: chrome/browser/sync/test/integration/two_client_preferences_sync_test.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: Move comment. Remove DCHECKs. 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

« chrome/app/generated_resources.grd ('K') | « chrome/browser/resources/options/autofill_options.js ('k') | chrome/browser/ui/autofill/autofill_popup_controller_impl.cc » ('j') | chrome/browser/ui/autofill/autofill_popup_controller_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc

diff --git a/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc b/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc

index a16191c80a46e0d96072085a57fe464ffe4a7d44..eed1b42c22e74cf2ab0afcf7180ac57635af331e 100644

--- a/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc

+++ b/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc

@@ -390,14 +390,14 @@ IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest,

ChangeBooleanPref(0, autofill::prefs::kAutofillAuxiliaryProfilesEnabled);

ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));

- // kAutofillAuxiliaryProfilesEnabled is only synced on Mac.

-#if defined(OS_MACOSX)

+ // kAutofillAuxiliaryProfilesEnabled is only synced on Mac and Android.

+#if defined(OS_MACOSX) || defined(OS_ANDROID)

ASSERT_TRUE(

BooleanPrefMatches(autofill::prefs::kAutofillAuxiliaryProfilesEnabled));

#else

ASSERT_FALSE(

BooleanPrefMatches(autofill::prefs::kAutofillAuxiliaryProfilesEnabled));

-#endif // OS_MACOSX

+#endif // defined(OS_MACOSX) || defined(OS_ANDROID)

}

// TCM ID - 3717298.