| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 <stddef.h> | 5 #include <stddef.h> |
| 6 #include <stdint.h> | 6 #include <stdint.h> |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 320 } | 320 } |
| 321 | 321 |
| 322 private: | 322 private: |
| 323 ~WebDataServiceFake() override {} | 323 ~WebDataServiceFake() override {} |
| 324 | 324 |
| 325 void CreateSyncableService( | 325 void CreateSyncableService( |
| 326 const base::Closure& on_changed_callback, | 326 const base::Closure& on_changed_callback, |
| 327 const base::Callback<void(syncer::ModelType)>& on_sync_started) { | 327 const base::Callback<void(syncer::ModelType)>& on_sync_started) { |
| 328 ASSERT_TRUE(db_thread_->RunsTasksOnCurrentThread()); | 328 ASSERT_TRUE(db_thread_->RunsTasksOnCurrentThread()); |
| 329 // These services are deleted in DestroySyncableService(). | 329 // These services are deleted in DestroySyncableService(). |
| 330 backend_.reset(new MockAutofillBackend(GetDatabase(), on_changed_callback, | 330 backend_ = base::MakeUnique<MockAutofillBackend>( |
| 331 on_sync_started, ui_thread_.get())); | 331 GetDatabase(), on_changed_callback, on_sync_started, ui_thread_.get()); |
| 332 AutocompleteSyncableService::CreateForWebDataServiceAndBackend( | 332 AutocompleteSyncableService::CreateForWebDataServiceAndBackend( |
| 333 this, backend_.get()); | 333 this, backend_.get()); |
| 334 AutofillProfileSyncableService::CreateForWebDataServiceAndBackend( | 334 AutofillProfileSyncableService::CreateForWebDataServiceAndBackend( |
| 335 this, backend_.get(), "en-US"); | 335 this, backend_.get(), "en-US"); |
| 336 | 336 |
| 337 autocomplete_syncable_service_ = | 337 autocomplete_syncable_service_ = |
| 338 AutocompleteSyncableService::FromWebDataService(this); | 338 AutocompleteSyncableService::FromWebDataService(this); |
| 339 autofill_profile_syncable_service_ = | 339 autofill_profile_syncable_service_ = |
| 340 AutofillProfileSyncableService::FromWebDataService(this); | 340 AutofillProfileSyncableService::FromWebDataService(this); |
| 341 | 341 |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 395 protected: | 395 protected: |
| 396 ProfileSyncServiceAutofillTest() : debug_ptr_factory_(this) { | 396 ProfileSyncServiceAutofillTest() : debug_ptr_factory_(this) { |
| 397 autofill::CountryNames::SetLocaleString("en-US"); | 397 autofill::CountryNames::SetLocaleString("en-US"); |
| 398 RegisterAutofillPrefs( | 398 RegisterAutofillPrefs( |
| 399 profile_sync_service_bundle()->pref_service()->registry()); | 399 profile_sync_service_bundle()->pref_service()->registry()); |
| 400 | 400 |
| 401 data_type_thread()->Start(); | 401 data_type_thread()->Start(); |
| 402 profile_sync_service_bundle()->set_db_thread( | 402 profile_sync_service_bundle()->set_db_thread( |
| 403 data_type_thread()->task_runner()); | 403 data_type_thread()->task_runner()); |
| 404 | 404 |
| 405 web_database_.reset(new WebDatabaseFake(&autofill_table_)); | 405 web_database_ = base::MakeUnique<WebDatabaseFake>(&autofill_table_); |
| 406 web_data_wrapper_ = base::MakeUnique<MockWebDataServiceWrapper>( | 406 web_data_wrapper_ = base::MakeUnique<MockWebDataServiceWrapper>( |
| 407 new WebDataServiceFake(base::ThreadTaskRunnerHandle::Get(), | 407 new WebDataServiceFake(base::ThreadTaskRunnerHandle::Get(), |
| 408 data_type_thread()->task_runner()), | 408 data_type_thread()->task_runner()), |
| 409 new TokenWebDataServiceFake(base::ThreadTaskRunnerHandle::Get(), | 409 new TokenWebDataServiceFake(base::ThreadTaskRunnerHandle::Get(), |
| 410 data_type_thread()->task_runner())); | 410 data_type_thread()->task_runner())); |
| 411 web_data_service_ = static_cast<WebDataServiceFake*>( | 411 web_data_service_ = static_cast<WebDataServiceFake*>( |
| 412 web_data_wrapper_->GetAutofillWebData().get()); | 412 web_data_wrapper_->GetAutofillWebData().get()); |
| 413 web_data_service_->SetDatabase(web_database_.get()); | 413 web_data_service_->SetDatabase(web_database_.get()); |
| 414 | 414 |
| 415 personal_data_manager_ = base::MakeUnique<MockPersonalDataManager>(); | 415 personal_data_manager_ = base::MakeUnique<MockPersonalDataManager>(); |
| (...skipping 1049 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1465 ASSERT_TRUE(GetAutofillEntriesFromSyncDB(&sync_entries, &sync_profiles)); | 1465 ASSERT_TRUE(GetAutofillEntriesFromSyncDB(&sync_entries, &sync_profiles)); |
| 1466 EXPECT_EQ(3U, sync_entries.size()); | 1466 EXPECT_EQ(3U, sync_entries.size()); |
| 1467 EXPECT_EQ(0U, sync_profiles.size()); | 1467 EXPECT_EQ(0U, sync_profiles.size()); |
| 1468 for (size_t i = 0; i < sync_entries.size(); i++) { | 1468 for (size_t i = 0; i < sync_entries.size(); i++) { |
| 1469 DVLOG(1) << "Entry " << i << ": " << sync_entries[i].key().name() << ", " | 1469 DVLOG(1) << "Entry " << i << ": " << sync_entries[i].key().name() << ", " |
| 1470 << sync_entries[i].key().value(); | 1470 << sync_entries[i].key().value(); |
| 1471 } | 1471 } |
| 1472 } | 1472 } |
| 1473 | 1473 |
| 1474 } // namespace browser_sync | 1474 } // namespace browser_sync |
| OLD | NEW |