OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 <set> | 5 #include <set> |
6 #include <string> | 6 #include <string> |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "testing/gtest/include/gtest/gtest.h" | 9 #include "testing/gtest/include/gtest/gtest.h" |
10 | 10 |
(...skipping 11 matching lines...) Expand all Loading... |
22 #include "chrome/browser/autofill/personal_data_manager.h" | 22 #include "chrome/browser/autofill/personal_data_manager.h" |
23 #include "chrome/browser/autofill/personal_data_manager_factory.h" | 23 #include "chrome/browser/autofill/personal_data_manager_factory.h" |
24 #include "chrome/browser/sync/abstract_profile_sync_service_test.h" | 24 #include "chrome/browser/sync/abstract_profile_sync_service_test.h" |
25 #include "chrome/browser/sync/engine/model_changing_syncer_command.h" | 25 #include "chrome/browser/sync/engine/model_changing_syncer_command.h" |
26 #include "chrome/browser/sync/glue/autofill_change_processor.h" | 26 #include "chrome/browser/sync/glue/autofill_change_processor.h" |
27 #include "chrome/browser/sync/glue/autofill_data_type_controller.h" | 27 #include "chrome/browser/sync/glue/autofill_data_type_controller.h" |
28 #include "chrome/browser/sync/glue/autofill_model_associator.h" | 28 #include "chrome/browser/sync/glue/autofill_model_associator.h" |
29 #include "chrome/browser/sync/glue/autofill_profile_data_type_controller.h" | 29 #include "chrome/browser/sync/glue/autofill_profile_data_type_controller.h" |
30 #include "chrome/browser/sync/glue/autofill_profile_syncable_service.h" | 30 #include "chrome/browser/sync/glue/autofill_profile_syncable_service.h" |
31 #include "chrome/browser/sync/glue/data_type_controller.h" | 31 #include "chrome/browser/sync/glue/data_type_controller.h" |
32 #include "chrome/browser/sync/glue/generic_change_processor.h" | 32 #include "chrome/browser/sync/glue/shared_change_processor.h" |
33 #include "chrome/browser/sync/glue/syncable_service_adapter.h" | 33 #include "chrome/browser/sync/glue/syncable_service_adapter.h" |
34 #include "chrome/browser/sync/internal_api/read_node.h" | 34 #include "chrome/browser/sync/internal_api/read_node.h" |
35 #include "chrome/browser/sync/internal_api/read_transaction.h" | 35 #include "chrome/browser/sync/internal_api/read_transaction.h" |
36 #include "chrome/browser/sync/internal_api/write_node.h" | 36 #include "chrome/browser/sync/internal_api/write_node.h" |
37 #include "chrome/browser/sync/internal_api/write_transaction.h" | 37 #include "chrome/browser/sync/internal_api/write_transaction.h" |
38 #include "chrome/browser/sync/profile_sync_factory.h" | 38 #include "chrome/browser/sync/profile_sync_factory.h" |
39 #include "chrome/browser/sync/profile_sync_service.h" | 39 #include "chrome/browser/sync/profile_sync_service.h" |
40 #include "chrome/browser/sync/profile_sync_test_util.h" | 40 #include "chrome/browser/sync/profile_sync_test_util.h" |
41 #include "chrome/browser/sync/protocol/autofill_specifics.pb.h" | 41 #include "chrome/browser/sync/protocol/autofill_specifics.pb.h" |
42 #include "chrome/browser/sync/syncable/directory_manager.h" | 42 #include "chrome/browser/sync/syncable/directory_manager.h" |
(...skipping 12 matching lines...) Expand all Loading... |
55 #include "testing/gmock/include/gmock/gmock.h" | 55 #include "testing/gmock/include/gmock/gmock.h" |
56 | 56 |
57 using base::Time; | 57 using base::Time; |
58 using base::WaitableEvent; | 58 using base::WaitableEvent; |
59 using browser_sync::AutofillChangeProcessor; | 59 using browser_sync::AutofillChangeProcessor; |
60 using browser_sync::AutofillDataTypeController; | 60 using browser_sync::AutofillDataTypeController; |
61 using browser_sync::AutofillModelAssociator; | 61 using browser_sync::AutofillModelAssociator; |
62 using browser_sync::AutofillProfileDataTypeController; | 62 using browser_sync::AutofillProfileDataTypeController; |
63 using browser_sync::AutofillProfileSyncableService; | 63 using browser_sync::AutofillProfileSyncableService; |
64 using browser_sync::DataTypeController; | 64 using browser_sync::DataTypeController; |
65 using browser_sync::GenericChangeProcessor; | 65 using browser_sync::SharedChangeProcessor; |
66 using browser_sync::SyncableServiceAdapter; | 66 using browser_sync::SyncableServiceAdapter; |
67 using browser_sync::GROUP_DB; | 67 using browser_sync::GROUP_DB; |
68 using browser_sync::kAutofillTag; | 68 using browser_sync::kAutofillTag; |
69 using browser_sync::SyncBackendHostForProfileSyncTest; | 69 using browser_sync::SyncBackendHostForProfileSyncTest; |
70 using browser_sync::UnrecoverableErrorHandler; | 70 using browser_sync::UnrecoverableErrorHandler; |
71 using syncable::CREATE_NEW_UPDATE_ITEM; | 71 using syncable::CREATE_NEW_UPDATE_ITEM; |
72 using syncable::AUTOFILL; | 72 using syncable::AUTOFILL; |
73 using syncable::BASE_VERSION; | 73 using syncable::BASE_VERSION; |
74 using syncable::CREATE; | 74 using syncable::CREATE; |
75 using syncable::GET_BY_SERVER_TAG; | 75 using syncable::GET_BY_SERVER_TAG; |
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
172 return ProfileSyncFactory::SyncComponents(NULL, NULL); | 172 return ProfileSyncFactory::SyncComponents(NULL, NULL); |
173 AutofillModelAssociator* model_associator = | 173 AutofillModelAssociator* model_associator = |
174 new AutofillModelAssociator(service, wd, service->profile()); | 174 new AutofillModelAssociator(service, wd, service->profile()); |
175 AutofillChangeProcessor* change_processor = | 175 AutofillChangeProcessor* change_processor = |
176 new AutofillChangeProcessor(model_associator, wd, | 176 new AutofillChangeProcessor(model_associator, wd, |
177 service->profile(), dtc); | 177 service->profile(), dtc); |
178 return ProfileSyncFactory::SyncComponents(model_associator, | 178 return ProfileSyncFactory::SyncComponents(model_associator, |
179 change_processor); | 179 change_processor); |
180 } | 180 } |
181 | 181 |
| 182 ACTION(MakeChangeProcessor) { |
| 183 return new SharedChangeProcessor(arg0); |
| 184 } |
| 185 |
182 ACTION_P3(MakeAutofillProfileSyncComponents, service, wd, dtc) { | 186 ACTION_P3(MakeAutofillProfileSyncComponents, service, wd, dtc) { |
183 EXPECT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::DB)); | 187 EXPECT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::DB)); |
184 if (!BrowserThread::CurrentlyOn(BrowserThread::DB)) | 188 if (!BrowserThread::CurrentlyOn(BrowserThread::DB)) |
185 return ProfileSyncFactory::SyncComponents(NULL, NULL); | 189 return NULL; |
186 AutofillProfileSyncableService* sync_service = | 190 AutofillProfileSyncableService* sync_service = |
187 new AutofillProfileSyncableService(wd, service->profile()); | 191 new AutofillProfileSyncableService(wd, service->profile()); |
188 sync_api::UserShare* user_share = service->GetUserShare(); | 192 return sync_service; |
189 GenericChangeProcessor* change_processor = | |
190 new GenericChangeProcessor(sync_service, dtc, user_share); | |
191 SyncableServiceAdapter* sync_service_adapter = | |
192 new SyncableServiceAdapter(syncable::AUTOFILL_PROFILE, | |
193 sync_service, | |
194 change_processor); | |
195 return ProfileSyncFactory::SyncComponents(sync_service_adapter, | |
196 change_processor); | |
197 } | 193 } |
198 | 194 |
199 class AbstractAutofillFactory { | 195 class AbstractAutofillFactory { |
200 public: | 196 public: |
201 virtual AutofillDataTypeController* CreateDataTypeController( | 197 virtual DataTypeController* CreateDataTypeController( |
202 ProfileSyncFactory* factory, | 198 ProfileSyncFactory* factory, |
203 ProfileMock* profile, | 199 ProfileMock* profile, |
204 ProfileSyncService* service) = 0; | 200 ProfileSyncService* service) = 0; |
205 virtual void SetExpectation(ProfileSyncFactoryMock* factory, | 201 virtual void SetExpectation(ProfileSyncFactoryMock* factory, |
206 ProfileSyncService* service, | 202 ProfileSyncService* service, |
207 WebDatabase* wd, | 203 WebDatabase* wd, |
208 DataTypeController* dtc) = 0; | 204 DataTypeController* dtc) = 0; |
209 virtual ~AbstractAutofillFactory() {} | 205 virtual ~AbstractAutofillFactory() {} |
210 }; | 206 }; |
211 | 207 |
212 class AutofillEntryFactory : public AbstractAutofillFactory { | 208 class AutofillEntryFactory : public AbstractAutofillFactory { |
213 public: | 209 public: |
214 browser_sync::AutofillDataTypeController* CreateDataTypeController( | 210 browser_sync::DataTypeController* CreateDataTypeController( |
215 ProfileSyncFactory* factory, | 211 ProfileSyncFactory* factory, |
216 ProfileMock* profile, | 212 ProfileMock* profile, |
217 ProfileSyncService* service) { | 213 ProfileSyncService* service) { |
218 return new AutofillDataTypeController(factory, | 214 return new AutofillDataTypeController(factory, profile); |
219 profile); | |
220 } | 215 } |
221 | 216 |
222 void SetExpectation(ProfileSyncFactoryMock* factory, | 217 void SetExpectation(ProfileSyncFactoryMock* factory, |
223 ProfileSyncService* service, | 218 ProfileSyncService* service, |
224 WebDatabase* wd, | 219 WebDatabase* wd, |
225 DataTypeController* dtc) { | 220 DataTypeController* dtc) { |
226 EXPECT_CALL(*factory, CreateAutofillSyncComponents(_,_,_)). | 221 EXPECT_CALL(*factory, CreateAutofillSyncComponents(_,_,_)). |
227 WillOnce(MakeAutofillSyncComponents(service, wd, dtc)); | 222 WillOnce(MakeAutofillSyncComponents(service, wd, dtc)); |
228 } | 223 } |
229 }; | 224 }; |
230 | 225 |
231 class AutofillProfileFactory : public AbstractAutofillFactory { | 226 class AutofillProfileFactory : public AbstractAutofillFactory { |
232 public: | 227 public: |
233 browser_sync::AutofillDataTypeController* CreateDataTypeController( | 228 browser_sync::DataTypeController* CreateDataTypeController( |
234 ProfileSyncFactory* factory, | 229 ProfileSyncFactory* factory, |
235 ProfileMock* profile, | 230 ProfileMock* profile, |
236 ProfileSyncService* service) { | 231 ProfileSyncService* service) { |
237 return new AutofillProfileDataTypeController(factory, | 232 return new AutofillProfileDataTypeController(factory, profile); |
238 profile); | |
239 } | 233 } |
240 | 234 |
241 void SetExpectation(ProfileSyncFactoryMock* factory, | 235 void SetExpectation(ProfileSyncFactoryMock* factory, |
242 ProfileSyncService* service, | 236 ProfileSyncService* service, |
243 WebDatabase* wd, | 237 WebDatabase* wd, |
244 DataTypeController* dtc) { | 238 DataTypeController* dtc) { |
245 EXPECT_CALL(*factory, CreateAutofillProfileSyncComponents(_,_,_)). | 239 EXPECT_CALL(*factory, CreateSharedChangeProcessor(_)). |
| 240 WillOnce(MakeChangeProcessor()); |
| 241 EXPECT_CALL(*factory, CreateAutofillProfileSyncComponents(_,_)). |
246 WillOnce(MakeAutofillProfileSyncComponents(service, wd, dtc)); | 242 WillOnce(MakeAutofillProfileSyncComponents(service, wd, dtc)); |
247 } | 243 } |
248 }; | 244 }; |
249 | 245 |
250 class PersonalDataManagerMock: public PersonalDataManager { | 246 class PersonalDataManagerMock: public PersonalDataManager { |
251 public: | 247 public: |
252 static ProfileKeyedService* Build(Profile* profile) { | 248 static ProfileKeyedService* Build(Profile* profile) { |
253 return new PersonalDataManagerMock; | 249 return new PersonalDataManagerMock; |
254 } | 250 } |
255 | 251 |
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
309 | 305 |
310 void StartSyncService(Task* task, | 306 void StartSyncService(Task* task, |
311 bool will_fail_association, | 307 bool will_fail_association, |
312 syncable::ModelType type) { | 308 syncable::ModelType type) { |
313 AbstractAutofillFactory* factory = GetFactory(type); | 309 AbstractAutofillFactory* factory = GetFactory(type); |
314 service_.reset( | 310 service_.reset( |
315 new TestProfileSyncService(&factory_, &profile_, "test_user", false, | 311 new TestProfileSyncService(&factory_, &profile_, "test_user", false, |
316 task)); | 312 task)); |
317 EXPECT_CALL(profile_, GetProfileSyncService()).WillRepeatedly( | 313 EXPECT_CALL(profile_, GetProfileSyncService()).WillRepeatedly( |
318 Return(service_.get())); | 314 Return(service_.get())); |
319 AutofillDataTypeController* data_type_controller = | 315 DataTypeController* data_type_controller = |
320 factory->CreateDataTypeController(&factory_, | 316 factory->CreateDataTypeController(&factory_, |
321 &profile_, | 317 &profile_, |
322 service_.get()); | 318 service_.get()); |
323 SyncBackendHostForProfileSyncTest:: | 319 SyncBackendHostForProfileSyncTest:: |
324 SetDefaultExpectationsForWorkerCreation(&profile_); | 320 SetDefaultExpectationsForWorkerCreation(&profile_); |
325 | 321 |
326 factory->SetExpectation(&factory_, | 322 factory->SetExpectation(&factory_, |
327 service_.get(), | 323 service_.get(), |
328 web_database_.get(), | 324 web_database_.get(), |
329 data_type_controller); | 325 data_type_controller); |
(...skipping 763 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1093 std::vector<AutofillEntry> sync_entries; | 1089 std::vector<AutofillEntry> sync_entries; |
1094 std::vector<AutofillProfile> sync_profiles; | 1090 std::vector<AutofillProfile> sync_profiles; |
1095 ASSERT_TRUE(GetAutofillEntriesFromSyncDB(&sync_entries, &sync_profiles)); | 1091 ASSERT_TRUE(GetAutofillEntriesFromSyncDB(&sync_entries, &sync_profiles)); |
1096 EXPECT_EQ(3U, sync_entries.size()); | 1092 EXPECT_EQ(3U, sync_entries.size()); |
1097 EXPECT_EQ(0U, sync_profiles.size()); | 1093 EXPECT_EQ(0U, sync_profiles.size()); |
1098 for (size_t i = 0; i < sync_entries.size(); i++) { | 1094 for (size_t i = 0; i < sync_entries.size(); i++) { |
1099 VLOG(1) << "Entry " << i << ": " << sync_entries[i].key().name() | 1095 VLOG(1) << "Entry " << i << ": " << sync_entries[i].key().name() |
1100 << ", " << sync_entries[i].key().value(); | 1096 << ", " << sync_entries[i].key().value(); |
1101 } | 1097 } |
1102 } | 1098 } |
OLD | NEW |