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 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
70 using autofill::AutofillProfileSyncableService; | 70 using autofill::AutofillProfileSyncableService; |
71 using autofill::AutofillTable; | 71 using autofill::AutofillTable; |
72 using autofill::AutofillWebDataService; | 72 using autofill::AutofillWebDataService; |
73 using autofill::NAME_FULL; | 73 using autofill::NAME_FULL; |
74 using autofill::PersonalDataManager; | 74 using autofill::PersonalDataManager; |
75 using autofill::ServerFieldType; | 75 using autofill::ServerFieldType; |
76 using base::ASCIIToUTF16; | 76 using base::ASCIIToUTF16; |
77 using base::Time; | 77 using base::Time; |
78 using base::TimeDelta; | 78 using base::TimeDelta; |
79 using base::WaitableEvent; | 79 using base::WaitableEvent; |
80 using browser_sync::AutofillDataTypeController; | |
81 using browser_sync::AutofillProfileDataTypeController; | |
82 using syncer::AUTOFILL; | 80 using syncer::AUTOFILL; |
83 using syncer::AUTOFILL_PROFILE; | 81 using syncer::AUTOFILL_PROFILE; |
84 using syncer::BaseNode; | 82 using syncer::BaseNode; |
85 using syncer::syncable::CREATE; | 83 using syncer::syncable::CREATE; |
86 using syncer::syncable::GET_TYPE_ROOT; | 84 using syncer::syncable::GET_TYPE_ROOT; |
87 using syncer::syncable::MutableEntry; | 85 using syncer::syncable::MutableEntry; |
88 using syncer::syncable::UNITTEST; | 86 using syncer::syncable::UNITTEST; |
89 using syncer::syncable::WriterTag; | 87 using syncer::syncable::WriterTag; |
90 using syncer::syncable::WriteTransaction; | 88 using syncer::syncable::WriteTransaction; |
91 using testing::_; | 89 using testing::_; |
92 using testing::DoAll; | 90 using testing::DoAll; |
93 using testing::ElementsAre; | 91 using testing::ElementsAre; |
94 using testing::Not; | 92 using testing::Not; |
95 using testing::SetArgumentPointee; | 93 using testing::SetArgumentPointee; |
96 using testing::Return; | 94 using testing::Return; |
97 | 95 |
| 96 namespace browser_sync { |
| 97 |
98 namespace { | 98 namespace { |
99 | 99 |
100 void RegisterAutofillPrefs(user_prefs::PrefRegistrySyncable* registry) { | 100 void RegisterAutofillPrefs(user_prefs::PrefRegistrySyncable* registry) { |
101 registry->RegisterBooleanPref(autofill::prefs::kAutofillEnabled, true); | 101 registry->RegisterBooleanPref(autofill::prefs::kAutofillEnabled, true); |
102 registry->RegisterBooleanPref(autofill::prefs::kAutofillWalletImportEnabled, | 102 registry->RegisterBooleanPref(autofill::prefs::kAutofillWalletImportEnabled, |
103 true); | 103 true); |
104 registry->RegisterBooleanPref(autofill::prefs::kAutofillProfileUseDatesFixed, | 104 registry->RegisterBooleanPref(autofill::prefs::kAutofillProfileUseDatesFixed, |
105 true); | 105 true); |
106 registry->RegisterIntegerPref(autofill::prefs::kAutofillLastVersionDeduped, | 106 registry->RegisterIntegerPref(autofill::prefs::kAutofillLastVersionDeduped, |
107 atoi(version_info::GetVersionNumber().c_str())); | 107 atoi(version_info::GetVersionNumber().c_str())); |
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
417 EXPECT_CALL(personal_data_manager(), LoadProfiles()); | 417 EXPECT_CALL(personal_data_manager(), LoadProfiles()); |
418 EXPECT_CALL(personal_data_manager(), LoadCreditCards()); | 418 EXPECT_CALL(personal_data_manager(), LoadCreditCards()); |
419 | 419 |
420 personal_data_manager_->Init( | 420 personal_data_manager_->Init( |
421 web_data_service_, profile_sync_service_bundle()->pref_service(), | 421 web_data_service_, profile_sync_service_bundle()->pref_service(), |
422 profile_sync_service_bundle()->account_tracker(), | 422 profile_sync_service_bundle()->account_tracker(), |
423 profile_sync_service_bundle()->signin_manager(), false); | 423 profile_sync_service_bundle()->signin_manager(), false); |
424 | 424 |
425 web_data_service_->StartSyncableService(); | 425 web_data_service_->StartSyncableService(); |
426 | 426 |
427 browser_sync::ProfileSyncServiceBundle::SyncClientBuilder builder( | 427 ProfileSyncServiceBundle::SyncClientBuilder builder( |
428 profile_sync_service_bundle()); | 428 profile_sync_service_bundle()); |
429 builder.SetPersonalDataManager(personal_data_manager_.get()); | 429 builder.SetPersonalDataManager(personal_data_manager_.get()); |
430 builder.SetSyncServiceCallback(GetSyncServiceCallback()); | 430 builder.SetSyncServiceCallback(GetSyncServiceCallback()); |
431 builder.SetSyncableServiceCallback( | 431 builder.SetSyncableServiceCallback( |
432 base::Bind(&ProfileSyncServiceAutofillTest::GetSyncableServiceForType, | 432 base::Bind(&ProfileSyncServiceAutofillTest::GetSyncableServiceForType, |
433 base::Unretained(this))); | 433 base::Unretained(this))); |
434 builder.set_activate_model_creation(); | 434 builder.set_activate_model_creation(); |
435 sync_client_owned_ = builder.Build(); | 435 sync_client_owned_ = builder.Build(); |
436 sync_client_ = sync_client_owned_.get(); | 436 sync_client_ = sync_client_owned_.get(); |
437 | 437 |
(...skipping 1025 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1463 std::vector<AutofillEntry> sync_entries; | 1463 std::vector<AutofillEntry> sync_entries; |
1464 std::vector<AutofillProfile> sync_profiles; | 1464 std::vector<AutofillProfile> sync_profiles; |
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 |
| 1474 } // namespace browser_sync |
OLD | NEW |