chrome/browser/chromeos/system/device_disabling_manager_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/system/device_disabling_manager_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, 11 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/session_manager_operation_unittest.cc ('k') | chrome/browser/extensions/crx_installer_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/system/device_disabling_manager_unittest.cc

diff --git a/chrome/browser/chromeos/system/device_disabling_manager_unittest.cc b/chrome/browser/chromeos/system/device_disabling_manager_unittest.cc

index 54532674009b6da56096f877f3f0add22c0dec51..771b71910c47f72d9e0b02080350cee85f63faf9 100644

--- a/chrome/browser/chromeos/system/device_disabling_manager_unittest.cc

+++ b/chrome/browser/chromeos/system/device_disabling_manager_unittest.cc

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

#include "base/prefs/testing_pref_service.h"

#include "base/run_loop.h"

#include "chrome/browser/browser_process_platform_part.h"

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

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

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

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

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

#include "chromeos/chromeos_switches.h"

#include "components/ownership/mock_owner_key_util.h"

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

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

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

#include "policy/proto/device_management_backend.pb.h"

#include "testing/gmock/include/gmock/gmock.h"

@@ -73,7 +73,7 @@ class DeviceDisablingManagerTestBase : public testing::Test,

policy::ScopedStubEnterpriseInstallAttributes install_attributes_;

chromeos::ScopedTestDeviceSettingsService test_device_settings_service_;

chromeos::ScopedTestCrosSettings test_cros_settings_;

- FakeUserManager fake_user_manager_;

+ user_manager::FakeUserManager fake_user_manager_;

scoped_ptr<DeviceDisablingManager> device_disabling_manager_;

DISALLOW_COPY_AND_ASSIGN(DeviceDisablingManagerTestBase);