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 17 matching lines...) Expand all Loading... |
28 #include "chrome/browser/sync/glue/autofill_data_type_controller.h" | 28 #include "chrome/browser/sync/glue/autofill_data_type_controller.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/data_type_controller.h" | 30 #include "chrome/browser/sync/glue/data_type_controller.h" |
31 #include "chrome/browser/sync/glue/generic_change_processor.h" | 31 #include "chrome/browser/sync/glue/generic_change_processor.h" |
32 #include "chrome/browser/sync/glue/shared_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_components_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" |
43 #include "chrome/browser/sync/syncable/model_type.h" | 43 #include "chrome/browser/sync/syncable/model_type.h" |
44 #include "chrome/browser/sync/syncable/syncable.h" | 44 #include "chrome/browser/sync/syncable/syncable.h" |
45 #include "chrome/browser/sync/test/engine/test_id_factory.h" | 45 #include "chrome/browser/sync/test/engine/test_id_factory.h" |
46 #include "chrome/browser/sync/test_profile_sync_service.h" | 46 #include "chrome/browser/sync/test_profile_sync_service.h" |
47 #include "chrome/browser/webdata/autocomplete_syncable_service.h" | 47 #include "chrome/browser/webdata/autocomplete_syncable_service.h" |
48 #include "chrome/browser/webdata/autofill_change.h" | 48 #include "chrome/browser/webdata/autofill_change.h" |
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
244 ACTION_P(MakeAutofillProfileSyncComponents, wds) { | 244 ACTION_P(MakeAutofillProfileSyncComponents, wds) { |
245 EXPECT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::DB)); | 245 EXPECT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::DB)); |
246 if (!BrowserThread::CurrentlyOn(BrowserThread::DB)) | 246 if (!BrowserThread::CurrentlyOn(BrowserThread::DB)) |
247 return base::WeakPtr<SyncableService>();; | 247 return base::WeakPtr<SyncableService>();; |
248 return wds->GetAutofillProfileSyncableService()->AsWeakPtr(); | 248 return wds->GetAutofillProfileSyncableService()->AsWeakPtr(); |
249 } | 249 } |
250 | 250 |
251 class AbstractAutofillFactory { | 251 class AbstractAutofillFactory { |
252 public: | 252 public: |
253 virtual DataTypeController* CreateDataTypeController( | 253 virtual DataTypeController* CreateDataTypeController( |
254 ProfileSyncFactory* factory, | 254 ProfileSyncComponentsFactory* factory, |
255 ProfileMock* profile, | 255 ProfileMock* profile, |
256 ProfileSyncService* service) = 0; | 256 ProfileSyncService* service) = 0; |
257 virtual void SetExpectation(ProfileSyncFactoryMock* factory, | 257 virtual void SetExpectation(ProfileSyncComponentsFactoryMock* factory, |
258 ProfileSyncService* service, | 258 ProfileSyncService* service, |
259 WebDataService* wds, | 259 WebDataService* wds, |
260 DataTypeController* dtc) = 0; | 260 DataTypeController* dtc) = 0; |
261 virtual ~AbstractAutofillFactory() {} | 261 virtual ~AbstractAutofillFactory() {} |
262 }; | 262 }; |
263 | 263 |
264 class AutofillEntryFactory : public AbstractAutofillFactory { | 264 class AutofillEntryFactory : public AbstractAutofillFactory { |
265 public: | 265 public: |
266 browser_sync::DataTypeController* CreateDataTypeController( | 266 browser_sync::DataTypeController* CreateDataTypeController( |
267 ProfileSyncFactory* factory, | 267 ProfileSyncComponentsFactory* factory, |
268 ProfileMock* profile, | 268 ProfileMock* profile, |
269 ProfileSyncService* service) { | 269 ProfileSyncService* service) { |
270 return new AutofillDataTypeController(factory, profile); | 270 return new AutofillDataTypeController(factory, profile); |
271 } | 271 } |
272 | 272 |
273 void SetExpectation(ProfileSyncFactoryMock* factory, | 273 void SetExpectation(ProfileSyncComponentsFactoryMock* factory, |
274 ProfileSyncService* service, | 274 ProfileSyncService* service, |
275 WebDataService* wds, | 275 WebDataService* wds, |
276 DataTypeController* dtc) { | 276 DataTypeController* dtc) { |
277 EXPECT_CALL(*factory, CreateGenericChangeProcessor(_,_,_)). | 277 EXPECT_CALL(*factory, CreateGenericChangeProcessor(_,_,_)). |
278 WillOnce(MakeGenericChangeProcessor()); | 278 WillOnce(MakeGenericChangeProcessor()); |
279 EXPECT_CALL(*factory, CreateSharedChangeProcessor()). | 279 EXPECT_CALL(*factory, CreateSharedChangeProcessor()). |
280 WillOnce(MakeSharedChangeProcessor()); | 280 WillOnce(MakeSharedChangeProcessor()); |
281 EXPECT_CALL(*factory, GetAutocompleteSyncableService(_)). | 281 EXPECT_CALL(*factory, GetAutocompleteSyncableService(_)). |
282 WillOnce(MakeAutocompleteSyncComponents(wds)); | 282 WillOnce(MakeAutocompleteSyncComponents(wds)); |
283 } | 283 } |
284 }; | 284 }; |
285 | 285 |
286 class AutofillProfileFactory : public AbstractAutofillFactory { | 286 class AutofillProfileFactory : public AbstractAutofillFactory { |
287 public: | 287 public: |
288 browser_sync::DataTypeController* CreateDataTypeController( | 288 browser_sync::DataTypeController* CreateDataTypeController( |
289 ProfileSyncFactory* factory, | 289 ProfileSyncComponentsFactory* factory, |
290 ProfileMock* profile, | 290 ProfileMock* profile, |
291 ProfileSyncService* service) { | 291 ProfileSyncService* service) { |
292 return new AutofillProfileDataTypeController(factory, profile); | 292 return new AutofillProfileDataTypeController(factory, profile); |
293 } | 293 } |
294 | 294 |
295 void SetExpectation(ProfileSyncFactoryMock* factory, | 295 void SetExpectation(ProfileSyncComponentsFactoryMock* factory, |
296 ProfileSyncService* service, | 296 ProfileSyncService* service, |
297 WebDataService* wds, | 297 WebDataService* wds, |
298 DataTypeController* dtc) { | 298 DataTypeController* dtc) { |
299 EXPECT_CALL(*factory, CreateGenericChangeProcessor(_,_,_)). | 299 EXPECT_CALL(*factory, CreateGenericChangeProcessor(_,_,_)). |
300 WillOnce(MakeGenericChangeProcessor()); | 300 WillOnce(MakeGenericChangeProcessor()); |
301 EXPECT_CALL(*factory, CreateSharedChangeProcessor()). | 301 EXPECT_CALL(*factory, CreateSharedChangeProcessor()). |
302 WillOnce(MakeSharedChangeProcessor()); | 302 WillOnce(MakeSharedChangeProcessor()); |
303 EXPECT_CALL(*factory, GetAutofillProfileSyncableService(_)). | 303 EXPECT_CALL(*factory, GetAutofillProfileSyncableService(_)). |
304 WillOnce(MakeAutofillProfileSyncComponents(wds)); | 304 WillOnce(MakeAutofillProfileSyncComponents(wds)); |
305 } | 305 } |
(...skipping 820 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1126 std::vector<AutofillEntry> sync_entries; | 1126 std::vector<AutofillEntry> sync_entries; |
1127 std::vector<AutofillProfile> sync_profiles; | 1127 std::vector<AutofillProfile> sync_profiles; |
1128 ASSERT_TRUE(GetAutofillEntriesFromSyncDB(&sync_entries, &sync_profiles)); | 1128 ASSERT_TRUE(GetAutofillEntriesFromSyncDB(&sync_entries, &sync_profiles)); |
1129 EXPECT_EQ(3U, sync_entries.size()); | 1129 EXPECT_EQ(3U, sync_entries.size()); |
1130 EXPECT_EQ(0U, sync_profiles.size()); | 1130 EXPECT_EQ(0U, sync_profiles.size()); |
1131 for (size_t i = 0; i < sync_entries.size(); i++) { | 1131 for (size_t i = 0; i < sync_entries.size(); i++) { |
1132 VLOG(1) << "Entry " << i << ": " << sync_entries[i].key().name() | 1132 VLOG(1) << "Entry " << i << ": " << sync_entries[i].key().name() |
1133 << ", " << sync_entries[i].key().value(); | 1133 << ", " << sync_entries[i].key().value(); |
1134 } | 1134 } |
1135 } | 1135 } |
OLD | NEW |