chrome/browser/chromeos/settings/session_manager_operation_unittest.cc - Issue 824683002: UserManager stack refactoring.

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/settings/session_manager_operation_unittest.cc

Issue 824683002: UserManager stack refactoring. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Test fixed. Created 5 years, 10 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/chromeos/settings/device_settings_test_helper.cc ('k') | chrome/browser/chromeos/system/device_disabling_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/settings/session_manager_operation_unittest.cc

diff --git a/chrome/browser/chromeos/settings/session_manager_operation_unittest.cc b/chrome/browser/chromeos/settings/session_manager_operation_unittest.cc

index e3186fb1d331909dd553570e060ff17bc0b5b2e3..9eda36b16a1139416557a78a82b88dc1f1b6eaae 100644

--- a/chrome/browser/chromeos/settings/session_manager_operation_unittest.cc

+++ b/chrome/browser/chromeos/settings/session_manager_operation_unittest.cc

@@ -14,7 +14,6 @@

#include "base/memory/scoped_ptr.h"

#include "base/message_loop/message_loop.h"

#include "base/time/time.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/ownership/owner_settings_service_chromeos.h"

#include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h"

@@ -25,6 +24,7 @@

#include "components/policy/core/common/cloud/cloud_policy_constants.h"

#include "components/policy/core/common/cloud/cloud_policy_validator.h"

#include "components/policy/core/common/cloud/policy_builder.h"

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

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

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

#include "crypto/rsa_private_key.h"

@@ -45,7 +45,7 @@ class SessionManagerOperationTest : public testing::Test {

: ui_thread_(content::BrowserThread::UI, &message_loop_),

file_thread_(content::BrowserThread::FILE, &message_loop_),

owner_key_util_(new ownership::MockOwnerKeyUtil()),

- user_manager_(new FakeUserManager()),

+ user_manager_(new user_manager::FakeUserManager()),

user_manager_enabler_(user_manager_),

validated_(false) {

OwnerSettingsServiceChromeOSFactory::GetInstance()

@@ -91,7 +91,7 @@ class SessionManagerOperationTest : public testing::Test {

DeviceSettingsTestHelper device_settings_test_helper_;

scoped_refptr<ownership::MockOwnerKeyUtil> owner_key_util_;

- FakeUserManager* user_manager_;

+ user_manager::FakeUserManager* user_manager_;

ScopedUserManagerEnabler user_manager_enabler_;

scoped_ptr<TestingProfile> profile_;