chrome/browser/chromeos/login/managed/managed_user_test_base.h - Issue 335833003: Rename "managed (mode|user)" to "supervised user" (part 2)

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/login/managed/managed_user_test_base.h

Issue 335833003: Rename "managed (mode|user)" to "supervised user" (part 2) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: review comments (+ a few other cleanups) Created 6 years, 6 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/login/managed/managed_user_password_browsertest.cc ('k') | chrome/browser/chromeos/login/managed/managed_user_test_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/managed/managed_user_test_base.h

diff --git a/chrome/browser/chromeos/login/managed/managed_user_test_base.h b/chrome/browser/chromeos/login/managed/managed_user_test_base.h

index de4242f82e73cdb290571ee17119edda645d3e6c..b4d6760342db49c1653be22bcc76bffeedf906bb 100644

--- a/chrome/browser/chromeos/login/managed/managed_user_test_base.h

+++ b/chrome/browser/chromeos/login/managed/managed_user_test_base.h

@@ -9,8 +9,8 @@

#include "base/compiler_specific.h"

#include "chrome/browser/chromeos/login/login_manager_test.h"

#include "chrome/browser/chromeos/net/network_portal_detector_test_impl.h"

-#include "chrome/browser/managed_mode/managed_user_registration_utility_stub.h"

#include "chrome/browser/profiles/profile.h"

+#include "chrome/browser/supervised_user/supervised_user_registration_utility_stub.h"

#include "chromeos/cryptohome/mock_async_method_caller.h"

#include "chromeos/cryptohome/mock_homedir_methods.h"

#include "sync/api/fake_sync_change_processor.h"

@@ -40,7 +40,7 @@ class ManagedUsersSyncTestAdapter {

void AddChange(const ::sync_pb::ManagedUserSpecifics& proto, bool update);

syncer::FakeSyncChangeProcessor* processor_;

- ManagedUserSyncService* service_;

+ SupervisedUserSyncService* service_;

int next_sync_data_id_;

};

@@ -62,7 +62,7 @@ class ManagedUsersSharedSettingsSyncTestAdapter {

bool update);

syncer::FakeSyncChangeProcessor* processor_;

- ManagedUserSharedSettingsService* service_;

+ SupervisedUserSharedSettingsService* service_;

int next_sync_data_id_;

};

@@ -102,8 +102,8 @@ class ManagedUserTestBase : public chromeos::LoginManagerTest {

cryptohome::MockAsyncMethodCaller* mock_async_method_caller_;

cryptohome::MockHomedirMethods* mock_homedir_methods_;

NetworkPortalDetectorTestImpl* network_portal_detector_;

- ManagedUserRegistrationUtilityStub* registration_utility_stub_;

- scoped_ptr<ScopedTestingManagedUserRegistrationUtility> scoped_utility_;

+ SupervisedUserRegistrationUtilityStub* registration_utility_stub_;

+ scoped_ptr<ScopedTestingSupervisedUserRegistrationUtility> scoped_utility_;

scoped_ptr<ManagedUsersSharedSettingsSyncTestAdapter>

shared_settings_adapter_;

scoped_ptr<ManagedUsersSyncTestAdapter> managed_users_adapter_;