Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3209)

Unified Diff: chrome/browser/sync/profile_sync_service_startup_unittest.cc

Issue 335273005: Rename "managed (mode|user)" to "supervised user" (part 3) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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
Index: chrome/browser/sync/profile_sync_service_startup_unittest.cc
diff --git a/chrome/browser/sync/profile_sync_service_startup_unittest.cc b/chrome/browser/sync/profile_sync_service_startup_unittest.cc
index 85c211cbd4a23e19314043525bdc4627d8e06fc4..91ed7f8413ef30785be0303d1d39f422e229f396 100644
--- a/chrome/browser/sync/profile_sync_service_startup_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_startup_unittest.cc
@@ -13,10 +13,10 @@
#include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
#include "chrome/browser/signin/signin_manager_factory.h"
#include "chrome/browser/sync/glue/sync_backend_host_mock.h"
-#include "chrome/browser/sync/managed_user_signin_manager_wrapper.h"
#include "chrome/browser/sync/profile_sync_components_factory_mock.h"
#include "chrome/browser/sync/profile_sync_service_factory.h"
#include "chrome/browser/sync/profile_sync_test_util.h"
+#include "chrome/browser/sync/supervised_user_signin_manager_wrapper.h"
#include "chrome/common/pref_names.h"
#include "chrome/test/base/testing_browser_process.h"
#include "chrome/test/base/testing_profile.h"
@@ -101,7 +101,7 @@ class ProfileSyncServiceStartupTest : public testing::Test {
return new ProfileSyncService(
new ProfileSyncComponentsFactoryMock(),
profile,
- make_scoped_ptr(new ManagedUserSigninManagerWrapper(
+ make_scoped_ptr(new SupervisedUserSigninManagerWrapper(
profile, SigninManagerFactory::GetForProfile(profile))),
ProfileOAuth2TokenServiceFactory::GetForProfile(profile),
browser_sync::MANUAL_START);
@@ -185,7 +185,8 @@ class ProfileSyncServiceStartupCrosTest : public ProfileSyncServiceStartupTest {
return new ProfileSyncService(
new ProfileSyncComponentsFactoryMock(),
profile,
- make_scoped_ptr(new ManagedUserSigninManagerWrapper(profile, signin)),
+ make_scoped_ptr(new SupervisedUserSigninManagerWrapper(profile,
+ signin)),
oauth2_token_service,
browser_sync::AUTO_START);
}
« no previous file with comments | « chrome/browser/sync/profile_sync_service_mock.cc ('k') | chrome/browser/sync/profile_sync_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698