chrome/browser/ui/webui/signin/user_manager_ui_browsertest.cc - Issue 340723002: Revert 277793 "Enable consistent identity on android platform by..."

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/signin/user_manager_ui_browsertest.cc

Issue 340723002: Revert 277793 "Enable consistent identity on android platform by..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/2056/src/

Patch Set: 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 | « chrome/browser/ui/views/profiles/new_avatar_menu_button_browsertest.cc ('k') | components/signin/core/common/profile_management_switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/signin/user_manager_ui_browsertest.cc

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

--- chrome/browser/ui/webui/signin/user_manager_ui_browsertest.cc (revision 277945)

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

@@ -10,7 +10,6 @@

#include "chrome/test/base/in_process_browser_test.h"

#include "chrome/test/base/testing_browser_process.h"

#include "chrome/test/base/ui_test_utils.h"

-#include "components/signin/core/common/profile_management_switches.h"

#include "content/public/browser/web_contents.h"

#include "content/public/test/browser_test_utils.h"

#include "grit/generated_resources.h"

@@ -24,11 +23,12 @@

protected:

virtual void SetUp() OVERRIDE {

InProcessBrowserTest::SetUp();

- DCHECK(switches::IsNewProfileManagement());

+ DCHECK(CommandLine::ForCurrentProcess()->HasSwitch(

+ switches::kNewProfileManagement));

}

virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {

- switches::EnableNewProfileManagementForTesting(command_line);

+ command_line->AppendSwitch(switches::kNewProfileManagement);

}

};