chrome/browser/performance_monitor/performance_monitor_browsertest.cc - Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager

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/performance_monitor/performance_monitor_browsertest.cc

Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 6 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

« no previous file with comments | « chrome/browser/notifications/message_center_settings_controller_unittest.cc ('k') | chrome/browser/policy/cloud/cloud_policy_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/performance_monitor/performance_monitor_browsertest.cc

diff --git a/chrome/browser/performance_monitor/performance_monitor_browsertest.cc b/chrome/browser/performance_monitor/performance_monitor_browsertest.cc

index ee0d5f29435a4fdc2f01f96bb48cfda1b801f1af..81519c9f4cb2162ad1a4b40d1b2c42f21106c000 100644

--- a/chrome/browser/performance_monitor/performance_monitor_browsertest.cc

+++ b/chrome/browser/performance_monitor/performance_monitor_browsertest.cc

@@ -45,9 +45,9 @@

#include "extensions/common/extension.h"

#if defined(OS_CHROMEOS)

-#include "chrome/browser/chromeos/login/users/user_manager.h"

#include "chrome/browser/chromeos/profiles/profile_helper.h"

#include "chromeos/chromeos_switches.h"

+#include "components/user_manager/user_manager.h"

#endif

#if defined(OS_MACOSX)

@@ -359,9 +359,8 @@ class PerformanceMonitorUncleanExitBrowserTest

virtual void AddSecondUserAccount() {

// Add second user account for multi-profile test.

if (GetParam()) {

- chromeos::UserManager::Get()->UserLoggedIn(kSecondProfileAccount,

- kSecondProfileHash,

- false);

+ user_manager::UserManager::Get()->UserLoggedIn(

+ kSecondProfileAccount, kSecondProfileHash, false);

}

#endif