chrome/browser/ui/cocoa/profiles/avatar_button_controller_unittest.mm - Issue 323133005: Enable consistent identity on android platform by default.

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/cocoa/profiles/avatar_button_controller_unittest.mm

Issue 323133005: Enable consistent identity on android platform by default. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebased 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/browser_command_controller_unittest.cc ('k') | chrome/browser/ui/cocoa/profiles/profile_chooser_controller_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/profiles/avatar_button_controller_unittest.mm

diff --git a/chrome/browser/ui/cocoa/profiles/avatar_button_controller_unittest.mm b/chrome/browser/ui/cocoa/profiles/avatar_button_controller_unittest.mm

index 6c087c69b5b9a6bd882cc0f1f7acd0648549eb19..b9271cbd344b514ed158733118f5dce00d71142a 100644

--- a/chrome/browser/ui/cocoa/profiles/avatar_button_controller_unittest.mm

+++ b/chrome/browser/ui/cocoa/profiles/avatar_button_controller_unittest.mm

@@ -16,14 +16,15 @@

#include "chrome/browser/ui/cocoa/info_bubble_window.h"

#import "chrome/browser/ui/cocoa/profiles/profile_chooser_controller.h"

#include "chrome/common/chrome_switches.h"

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

const char kDefaultProfileName[] = "default";

class AvatarButtonControllerTest : public CocoaProfileTest {

public:

virtual void SetUp() OVERRIDE {

- CommandLine::ForCurrentProcess()->AppendSwitch(

- switches::kNewProfileManagement);

+ switches::EnableNewProfileManagementForTesting(

+ CommandLine::ForCurrentProcess());

DCHECK(profiles::IsMultipleProfilesEnabled());

CocoaProfileTest::SetUp();