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

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

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

index b883a4ccf518400cb672fe746c66103393f416de..8676ed4f374c59a8ce37654d4c72e53fa1b92c96 100644

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

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

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

#include "base/memory/scoped_ptr.h"

#include "base/run_loop.h"

#include "base/values.h"

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

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

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

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

@@ -26,6 +25,7 @@

#include "components/policy/core/common/mock_configuration_policy_provider.h"

#include "components/policy/core/common/policy_map.h"

#include "components/policy/core/common/policy_service_impl.h"

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

#include "components/user_manager/user_type.h"

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

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

@@ -51,7 +51,7 @@ namespace {

const char kFakeUserEmail[] = "fake email";

const char kFakeUsernameHash[] = "fake hash";

-class FakeUser : public chromeos::User {

+class FakeUser : public user_manager::User {

public:

FakeUser() : User(kFakeUserEmail) {

set_display_email(kFakeUserEmail);