chrome/browser/chromeos/policy/consumer_management_notifier_factory_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/policy/consumer_management_notifier_factory_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/policy/consumer_enrollment_handler_unittest.cc ('k') | chrome/browser/chromeos/power/extension_event_observer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/policy/consumer_management_notifier_factory_unittest.cc

diff --git a/chrome/browser/chromeos/policy/consumer_management_notifier_factory_unittest.cc b/chrome/browser/chromeos/policy/consumer_management_notifier_factory_unittest.cc

index d29be20f2e9f91621b2400e6cf71415ef6c2961c..ca78a43d27f7c525bb239d3a3ec86cbf43864609 100644

--- a/chrome/browser/chromeos/policy/consumer_management_notifier_factory_unittest.cc

+++ b/chrome/browser/chromeos/policy/consumer_management_notifier_factory_unittest.cc

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

#include "chrome/browser/browser_process.h"

#include "chrome/browser/browser_process_platform_part.h"

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

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

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

#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"

#include "chrome/browser/chromeos/policy/consumer_management_service.h"

@@ -27,10 +27,10 @@ class ConsumerManagementNotifierFactoryTest : public testing::Test {

public:

ConsumerManagementNotifierFactoryTest()

: fake_service_(new FakeConsumerManagementService()),

- fake_user_manager_(new chromeos::FakeUserManager()),

+ fake_user_manager_(new chromeos::FakeChromeUserManager()),

scoped_user_manager_enabler_(fake_user_manager_),

- testing_profile_manager_(new TestingProfileManager(

- TestingBrowserProcess::GetGlobal())) {

+ testing_profile_manager_(

+ new TestingProfileManager(TestingBrowserProcess::GetGlobal())) {

// Set up FakeConsumerManagementService.

fake_service_->SetStatusAndStage(

ConsumerManagementService::STATUS_UNENROLLED,

@@ -42,7 +42,7 @@ class ConsumerManagementNotifierFactoryTest : public testing::Test {

connector->SetConsumerManagementServiceForTesting(

make_scoped_ptr(fake_service_));

- // Set up FakeUserManager.

+ // Set up FakeChromeUserManager.

fake_user_manager_->AddUser(kTestOwner);

fake_user_manager_->AddUser(kTestUser);

fake_user_manager_->set_owner_email(kTestOwner);

@@ -53,7 +53,7 @@ class ConsumerManagementNotifierFactoryTest : public testing::Test {

}

FakeConsumerManagementService* fake_service_;

- chromeos::FakeUserManager* fake_user_manager_;

+ chromeos::FakeChromeUserManager* fake_user_manager_;

chromeos::ScopedUserManagerEnabler scoped_user_manager_enabler_;

scoped_ptr<TestingProfileManager> testing_profile_manager_;

};