chrome/browser/chromeos/settings/device_settings_provider_unittest.cc - Issue 398753004: [cros] Move User class to user_manager component.

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/device_settings_provider_unittest.cc

Issue 398753004: [cros] Move User class to user_manager component. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

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

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

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

index 9cb25511c87dfed90f654a4de691c5955ee853a4..ba796cf11880d2a730b0c9998b4497ec5d194507 100644

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

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

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

#include "base/test/scoped_path_override.h"

#include "base/values.h"

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

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

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

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

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

@@ -24,6 +23,7 @@

#include "chrome/test/base/testing_browser_process.h"

#include "chrome/test/base/testing_profile.h"

#include "chromeos/settings/cros_settings_names.h"

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

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

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

#include "testing/gtest/include/gtest/gtest.h"