chrome/browser/chromeos/policy/device_status_collector_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/chromeos/policy/device_status_collector_browsertest.cc

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

Patch Set: similarity 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

« chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc ('K') | « chrome/browser/chromeos/policy/device_status_collector.cc ('k') | chrome/browser/chromeos/policy/policy_cert_service.h » ('j') | chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 6e4a1f5903d93b5c1805aeac44c1ddab57b6b245..79eb36174b27b5c48cb524f1ac5ff1b16f54df36 100644

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

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

@@ -13,7 +13,7 @@

#include "base/run_loop.h"

#include "base/threading/sequenced_worker_pool.h"

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

-#include "chrome/browser/chromeos/login/users/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/stub_enterprise_install_attributes.h"

#include "chrome/browser/chromeos/settings/cros_settings.h"

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

#include "chromeos/settings/cros_settings_names.h"

#include "chromeos/settings/cros_settings_provider.h"

#include "chromeos/system/mock_statistics_provider.h"

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

#include "content/public/browser/browser_thread.h"

#include "content/public/browser/geolocation_provider.h"

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