chrome/browser/chromeos/profiles/profile_list_chromeos_unittest.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/chromeos/profiles/profile_list_chromeos_unittest.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:

Index: chrome/browser/chromeos/profiles/profile_list_chromeos_unittest.cc

diff --git a/chrome/browser/chromeos/profiles/profile_list_chromeos_unittest.cc b/chrome/browser/chromeos/profiles/profile_list_chromeos_unittest.cc

index 6f47d2eeb6d1073c06b930e3bb25bd07e9e03ecd..398aa3e530587dc4023790976486a4a39bb34522 100644

--- a/chrome/browser/chromeos/profiles/profile_list_chromeos_unittest.cc

+++ b/chrome/browser/chromeos/profiles/profile_list_chromeos_unittest.cc

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

#include "base/strings/string16.h"

#include "base/strings/utf_string_conversions.h"

#include "chrome/browser/chromeos/login/users/fake_user_manager.h"

+#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"

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

#include "chrome/browser/prefs/pref_service_syncable.h"

#include "chrome/browser/profiles/avatar_menu.h"

@@ -69,7 +70,7 @@ class ProfileListChromeOSTest : public testing::Test {

}

FakeUserManager* GetFakeUserManager() {

- return static_cast<FakeUserManager*>(UserManager::Get());

+ return static_cast<FakeUserManager*>(user_manager::UserManager::Get());

}

void AddProfile(base::string16 name, bool log_in) {