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

Side by Side Diff: chrome/browser/sync/test_profile_sync_service.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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/sync/test_profile_sync_service.h" 5 #include "chrome/browser/sync/test_profile_sync_service.h"
6 6
7 #include "chrome/browser/chrome_notification_types.h" 7 #include "chrome/browser/chrome_notification_types.h"
8 #include "chrome/browser/invalidation/profile_invalidation_provider_factory.h" 8 #include "chrome/browser/invalidation/profile_invalidation_provider_factory.h"
9 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" 10 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
11 #include "chrome/browser/signin/signin_manager_factory.h" 11 #include "chrome/browser/signin/signin_manager_factory.h"
12 #include "chrome/browser/sync/glue/sync_backend_host.h" 12 #include "chrome/browser/sync/glue/sync_backend_host.h"
13 #include "chrome/browser/sync/glue/sync_backend_host_core.h" 13 #include "chrome/browser/sync/glue/sync_backend_host_core.h"
14 #include "chrome/browser/sync/managed_user_signin_manager_wrapper.h"
15 #include "chrome/browser/sync/profile_sync_components_factory.h" 14 #include "chrome/browser/sync/profile_sync_components_factory.h"
16 #include "chrome/browser/sync/profile_sync_components_factory_mock.h" 15 #include "chrome/browser/sync/profile_sync_components_factory_mock.h"
17 #include "chrome/browser/sync/profile_sync_service_factory.h" 16 #include "chrome/browser/sync/profile_sync_service_factory.h"
17 #include "chrome/browser/sync/supervised_user_signin_manager_wrapper.h"
18 #include "chrome/browser/sync/test/test_http_bridge_factory.h" 18 #include "chrome/browser/sync/test/test_http_bridge_factory.h"
19 #include "components/invalidation/profile_invalidation_provider.h" 19 #include "components/invalidation/profile_invalidation_provider.h"
20 #include "components/signin/core/browser/signin_manager.h" 20 #include "components/signin/core/browser/signin_manager.h"
21 #include "sync/internal_api/public/test/sync_manager_factory_for_profile_sync_te st.h" 21 #include "sync/internal_api/public/test/sync_manager_factory_for_profile_sync_te st.h"
22 #include "sync/internal_api/public/test/test_internal_components_factory.h" 22 #include "sync/internal_api/public/test/test_internal_components_factory.h"
23 #include "sync/internal_api/public/user_share.h" 23 #include "sync/internal_api/public/user_share.h"
24 #include "sync/protocol/encryption.pb.h" 24 #include "sync/protocol/encryption.pb.h"
25 #include "testing/gmock/include/gmock/gmock.h" 25 #include "testing/gmock/include/gmock/gmock.h"
26 26
27 using syncer::InternalComponentsFactory; 27 using syncer::InternalComponentsFactory;
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 102
103 TestProfileSyncService::TestProfileSyncService( 103 TestProfileSyncService::TestProfileSyncService(
104 ProfileSyncComponentsFactory* factory, 104 ProfileSyncComponentsFactory* factory,
105 Profile* profile, 105 Profile* profile,
106 SigninManagerBase* signin, 106 SigninManagerBase* signin,
107 ProfileOAuth2TokenService* oauth2_token_service, 107 ProfileOAuth2TokenService* oauth2_token_service,
108 browser_sync::ProfileSyncServiceStartBehavior behavior) 108 browser_sync::ProfileSyncServiceStartBehavior behavior)
109 : ProfileSyncService( 109 : ProfileSyncService(
110 factory, 110 factory,
111 profile, 111 profile,
112 make_scoped_ptr(new ManagedUserSigninManagerWrapper(profile, signin)), 112 make_scoped_ptr(new SupervisedUserSigninManagerWrapper(profile,
113 signin)),
113 oauth2_token_service, 114 oauth2_token_service,
114 behavior) { 115 behavior) {
115 SetSyncSetupCompleted(); 116 SetSyncSetupCompleted();
116 } 117 }
117 118
118 TestProfileSyncService::~TestProfileSyncService() { 119 TestProfileSyncService::~TestProfileSyncService() {
119 } 120 }
120 121
121 // static 122 // static
122 KeyedService* TestProfileSyncService::TestFactoryFunction( 123 KeyedService* TestProfileSyncService::TestFactoryFunction(
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 166
166 void TestProfileSyncService::OnConfigureDone( 167 void TestProfileSyncService::OnConfigureDone(
167 const browser_sync::DataTypeManager::ConfigureResult& result) { 168 const browser_sync::DataTypeManager::ConfigureResult& result) {
168 ProfileSyncService::OnConfigureDone(result); 169 ProfileSyncService::OnConfigureDone(result);
169 base::MessageLoop::current()->Quit(); 170 base::MessageLoop::current()->Quit();
170 } 171 }
171 172
172 UserShare* TestProfileSyncService::GetUserShare() const { 173 UserShare* TestProfileSyncService::GetUserShare() const {
173 return backend_->GetUserShare(); 174 return backend_->GetUserShare();
174 } 175 }
OLDNEW
« no previous file with comments | « chrome/browser/sync/supervised_user_signin_manager_wrapper.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698