chrome/browser/profiles/profile_manager_unittest.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/profiles/profile_manager_unittest.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/extensions/api/screenlock_private/screenlock_private_apitest.cc ('k') | chrome/browser/profiles/profile_window.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/profiles/profile_manager_unittest.cc

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

--- chrome/browser/profiles/profile_manager_unittest.cc (revision 277945)

+++ chrome/browser/profiles/profile_manager_unittest.cc (working copy)

@@ -35,7 +35,6 @@

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

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

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

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

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

#include "content/public/common/content_switches.h"

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

@@ -891,8 +890,8 @@

return;

// The command line is reset at the end of every test by the test suite.

- switches::EnableNewProfileManagementForTesting(

- CommandLine::ForCurrentProcess());

+ CommandLine::ForCurrentProcess()->AppendSwitch(

+ switches::kNewProfileManagement);

ProfileManager* profile_manager = g_browser_process->profile_manager();

ProfileInfoCache& cache = profile_manager->GetProfileInfoCache();

@@ -926,8 +925,8 @@

return;

// The command line is reset at the end of every test by the test suite.

- switches::EnableNewProfileManagementForTesting(

- CommandLine::ForCurrentProcess());

+ CommandLine::ForCurrentProcess()->AppendSwitch(

+ switches::kNewProfileManagement);

ProfileManager* profile_manager = g_browser_process->profile_manager();

ProfileInfoCache& cache = profile_manager->GetProfileInfoCache();

@@ -966,9 +965,9 @@

if (!profiles::IsMultipleProfilesEnabled())

return;

- // The command line is reset at the end of every test by the test suite.

- switches::EnableNewProfileManagementForTesting(

- CommandLine::ForCurrentProcess());

+ // The command line is reset at the end of every test by the test suite.

+ CommandLine::ForCurrentProcess()->AppendSwitch(

+ switches::kNewProfileManagement);

ProfileManager* profile_manager = g_browser_process->profile_manager();

ProfileInfoCache& cache = profile_manager->GetProfileInfoCache();