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

Side by Side Diff: chrome/browser/sync/profile_sync_components_factory_impl_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 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 <vector> 5 #include <vector>
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
11 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" 11 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
12 #include "chrome/browser/sync/managed_user_signin_manager_wrapper.h"
13 #include "chrome/browser/sync/profile_sync_components_factory_impl.h" 12 #include "chrome/browser/sync/profile_sync_components_factory_impl.h"
14 #include "chrome/browser/sync/profile_sync_service.h" 13 #include "chrome/browser/sync/profile_sync_service.h"
15 #include "chrome/browser/sync/profile_sync_service_factory.h" 14 #include "chrome/browser/sync/profile_sync_service_factory.h"
15 #include "chrome/browser/sync/supervised_user_signin_manager_wrapper.h"
16 #include "chrome/common/chrome_switches.h" 16 #include "chrome/common/chrome_switches.h"
17 #include "chrome/common/chrome_version_info.h" 17 #include "chrome/common/chrome_version_info.h"
18 #include "chrome/test/base/testing_profile.h" 18 #include "chrome/test/base/testing_profile.h"
19 #include "components/signin/core/browser/profile_oauth2_token_service.h" 19 #include "components/signin/core/browser/profile_oauth2_token_service.h"
20 #include "components/sync_driver/data_type_controller.h" 20 #include "components/sync_driver/data_type_controller.h"
21 #include "content/public/test/test_browser_thread_bundle.h" 21 #include "content/public/test/test_browser_thread_bundle.h"
22 #include "google_apis/gaia/gaia_constants.h" 22 #include "google_apis/gaia/gaia_constants.h"
23 #include "google_apis/gaia/oauth2_token_service.h" 23 #include "google_apis/gaia/oauth2_token_service.h"
24 #include "testing/gtest/include/gtest/gtest.h" 24 #include "testing/gtest/include/gtest/gtest.h"
25 #include "ui/app_list/app_list_switches.h" 25 #include "ui/app_list/app_list_switches.h"
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 scoped_ptr<ProfileSyncService> pss(new ProfileSyncService( 109 scoped_ptr<ProfileSyncService> pss(new ProfileSyncService(
110 new ProfileSyncComponentsFactoryImpl( 110 new ProfileSyncComponentsFactoryImpl(
111 profile_.get(), 111 profile_.get(),
112 command_line_.get(), 112 command_line_.get(),
113 ProfileSyncService::GetSyncServiceURL(*command_line_), 113 ProfileSyncService::GetSyncServiceURL(*command_line_),
114 kAccountId, 114 kAccountId,
115 scope_set_, 115 scope_set_,
116 token_service, 116 token_service,
117 profile_->GetRequestContext()), 117 profile_->GetRequestContext()),
118 profile_.get(), 118 profile_.get(),
119 make_scoped_ptr<ManagedUserSigninManagerWrapper>(NULL), 119 make_scoped_ptr<SupervisedUserSigninManagerWrapper>(NULL),
120 token_service, 120 token_service,
121 browser_sync::MANUAL_START)); 121 browser_sync::MANUAL_START));
122 pss->factory()->RegisterDataTypes(pss.get()); 122 pss->factory()->RegisterDataTypes(pss.get());
123 DataTypeController::StateMap controller_states; 123 DataTypeController::StateMap controller_states;
124 pss->GetDataTypeControllerStates(&controller_states); 124 pss->GetDataTypeControllerStates(&controller_states);
125 EXPECT_EQ(DefaultDatatypesCount() - types.Size(), controller_states.size()); 125 EXPECT_EQ(DefaultDatatypesCount() - types.Size(), controller_states.size());
126 CheckDefaultDatatypesInMapExcept(&controller_states, types); 126 CheckDefaultDatatypesInMapExcept(&controller_states, types);
127 } 127 }
128 128
129 content::TestBrowserThreadBundle thread_bundle_; 129 content::TestBrowserThreadBundle thread_bundle_;
130 scoped_ptr<Profile> profile_; 130 scoped_ptr<Profile> profile_;
131 scoped_ptr<CommandLine> command_line_; 131 scoped_ptr<CommandLine> command_line_;
132 OAuth2TokenService::ScopeSet scope_set_; 132 OAuth2TokenService::ScopeSet scope_set_;
133 }; 133 };
134 134
135 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDefault) { 135 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDefault) {
136 ProfileOAuth2TokenService* token_service = 136 ProfileOAuth2TokenService* token_service =
137 ProfileOAuth2TokenServiceFactory::GetForProfile(profile_.get()); 137 ProfileOAuth2TokenServiceFactory::GetForProfile(profile_.get());
138 scoped_ptr<ProfileSyncService> pss(new ProfileSyncService( 138 scoped_ptr<ProfileSyncService> pss(new ProfileSyncService(
139 new ProfileSyncComponentsFactoryImpl( 139 new ProfileSyncComponentsFactoryImpl(
140 profile_.get(), 140 profile_.get(),
141 command_line_.get(), 141 command_line_.get(),
142 ProfileSyncService::GetSyncServiceURL(*command_line_), 142 ProfileSyncService::GetSyncServiceURL(*command_line_),
143 kAccountId, 143 kAccountId,
144 scope_set_, 144 scope_set_,
145 token_service, 145 token_service,
146 profile_->GetRequestContext()), 146 profile_->GetRequestContext()),
147 profile_.get(), 147 profile_.get(),
148 make_scoped_ptr<ManagedUserSigninManagerWrapper>(NULL), 148 make_scoped_ptr<SupervisedUserSigninManagerWrapper>(NULL),
149 token_service, 149 token_service,
150 browser_sync::MANUAL_START)); 150 browser_sync::MANUAL_START));
151 pss->factory()->RegisterDataTypes(pss.get()); 151 pss->factory()->RegisterDataTypes(pss.get());
152 DataTypeController::StateMap controller_states; 152 DataTypeController::StateMap controller_states;
153 pss->GetDataTypeControllerStates(&controller_states); 153 pss->GetDataTypeControllerStates(&controller_states);
154 EXPECT_EQ(DefaultDatatypesCount(), controller_states.size()); 154 EXPECT_EQ(DefaultDatatypesCount(), controller_states.size());
155 CheckDefaultDatatypesInMapExcept(&controller_states, syncer::ModelTypeSet()); 155 CheckDefaultDatatypesInMapExcept(&controller_states, syncer::ModelTypeSet());
156 } 156 }
157 157
158 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDisableOne) { 158 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDisableOne) {
159 TestSwitchDisablesType(syncer::ModelTypeSet(syncer::AUTOFILL)); 159 TestSwitchDisablesType(syncer::ModelTypeSet(syncer::AUTOFILL));
160 } 160 }
161 161
162 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDisableMultiple) { 162 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDisableMultiple) {
163 TestSwitchDisablesType( 163 TestSwitchDisablesType(
164 syncer::ModelTypeSet(syncer::AUTOFILL_PROFILE, syncer::BOOKMARKS)); 164 syncer::ModelTypeSet(syncer::AUTOFILL_PROFILE, syncer::BOOKMARKS));
165 } 165 }
OLDNEW
« no previous file with comments | « chrome/browser/sync/managed_user_signin_manager_wrapper.cc ('k') | chrome/browser/sync/profile_sync_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698