chrome/browser/ui/webui/sync_setup_handler_unittest.cc - Issue 10825297: Merge 150797 - Revert 148201 - Re-enable OTP sign in on trunk by reverting most of 147297.

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/ui/webui/sync_setup_handler_unittest.cc

Issue 10825297: Merge 150797 - Revert 148201 - Re-enable OTP sign in on trunk by reverting most of 147297. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1229/src/

Patch Set: Created 8 years, 4 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

Index: chrome/browser/ui/webui/sync_setup_handler_unittest.cc

===================================================================

--- chrome/browser/ui/webui/sync_setup_handler_unittest.cc (revision 151028)

+++ chrome/browser/ui/webui/sync_setup_handler_unittest.cc (working copy)

@@ -358,11 +358,11 @@

// If the parameter is true, then use ClientOAuth for the tests. Otherwise

// use ClientLogin for the tests.

if (GetParam()) {

+ CommandLine::ForCurrentProcess()->AppendSwitch(

+ switches::kEnableClientOAuthSignin);

+ } else {

ASSERT_FALSE(CommandLine::ForCurrentProcess()->HasSwitch(

- switches::kDisableClientOAuthSignin));

- } else {

- CommandLine::ForCurrentProcess()->AppendSwitch(

- switches::kDisableClientOAuthSignin);

+ switches::kEnableClientOAuthSignin));

}

error_ = GoogleServiceAuthError::None();

« no previous file with comments | « chrome/browser/ui/webui/sync_setup_handler.cc ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »