Chromium Code Reviews| 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 <set> | 5 #include <set> |
| 6 #include <string> | 6 #include <string> |
| 7 #include <utility> | 7 #include <utility> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "testing/gtest/include/gtest/gtest.h" | 10 #include "testing/gtest/include/gtest/gtest.h" |
| (...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 141 bool(const std::string&)); // NOLINT | 141 bool(const std::string&)); // NOLINT |
| 142 }; | 142 }; |
| 143 | 143 |
| 144 MATCHER_P(MatchProfiles, profile, "") { | 144 MATCHER_P(MatchProfiles, profile, "") { |
| 145 return (profile.Compare(arg) == 0); | 145 return (profile.Compare(arg) == 0); |
| 146 } | 146 } |
| 147 | 147 |
| 148 class TestSyncClient : public sync_driver::FakeSyncClient { | 148 class TestSyncClient : public sync_driver::FakeSyncClient { |
| 149 public: | 149 public: |
| 150 TestSyncClient(PersonalDataManager* pdm, | 150 TestSyncClient(PersonalDataManager* pdm, |
| 151 | |
|
stanisc
2015/09/02 17:27:05
Will remove this empty line before landing the pat
Nicolas Zea
2015/09/02 22:52:45
Acknowledged.
stanisc
2015/09/03 01:17:42
Done.
| |
| 151 const scoped_refptr<AutofillWebDataService>& web_data_service) | 152 const scoped_refptr<AutofillWebDataService>& web_data_service) |
| 152 : pdm_(pdm), | 153 : pdm_(pdm), |
| 154 sync_service_(nullptr), | |
| 153 web_data_service_(web_data_service) {} | 155 web_data_service_(web_data_service) {} |
| 154 ~TestSyncClient() override {} | 156 ~TestSyncClient() override {} |
| 155 | 157 |
| 156 // FakeSyncClient overrides. | 158 // FakeSyncClient overrides. |
| 157 autofill::PersonalDataManager* GetPersonalDataManager() override { | 159 autofill::PersonalDataManager* GetPersonalDataManager() override { |
| 158 return pdm_; | 160 return pdm_; |
| 159 } | 161 } |
| 162 sync_driver::SyncService* GetSyncService() override { | |
| 163 DCHECK(sync_service_); | |
| 164 return sync_service_; | |
| 165 } | |
| 160 scoped_refptr<autofill::AutofillWebDataService> GetWebDataService() override { | 166 scoped_refptr<autofill::AutofillWebDataService> GetWebDataService() override { |
| 161 return web_data_service_; | 167 return web_data_service_; |
| 162 } | 168 } |
| 163 base::WeakPtr<syncer::SyncableService> GetSyncableServiceForType( | 169 base::WeakPtr<syncer::SyncableService> GetSyncableServiceForType( |
| 164 syncer::ModelType type) override { | 170 syncer::ModelType type) override { |
| 165 DCHECK(type == AUTOFILL || type == AUTOFILL_PROFILE); | 171 DCHECK(type == AUTOFILL || type == AUTOFILL_PROFILE); |
| 166 if (type == AUTOFILL) { | 172 if (type == AUTOFILL) { |
| 167 return AutocompleteSyncableService::FromWebDataService( | 173 return AutocompleteSyncableService::FromWebDataService( |
| 168 web_data_service_.get())->AsWeakPtr(); | 174 web_data_service_.get())->AsWeakPtr(); |
| 169 } else { | 175 } else { |
| 170 return AutofillProfileSyncableService::FromWebDataService( | 176 return AutofillProfileSyncableService::FromWebDataService( |
| 171 web_data_service_.get())->AsWeakPtr(); | 177 web_data_service_.get())->AsWeakPtr(); |
| 172 } | 178 } |
| 173 } | 179 } |
| 174 | 180 |
| 181 void SetSyncService(sync_driver::SyncService* sync_service) { | |
| 182 sync_service_ = sync_service; | |
| 183 } | |
| 184 | |
| 175 private: | 185 private: |
| 176 PersonalDataManager* pdm_; | 186 PersonalDataManager* pdm_; |
| 187 sync_driver::SyncService* sync_service_; | |
| 177 scoped_refptr<AutofillWebDataService> web_data_service_; | 188 scoped_refptr<AutofillWebDataService> web_data_service_; |
| 178 }; | 189 }; |
| 179 | 190 |
| 180 class WebDatabaseFake : public WebDatabase { | 191 class WebDatabaseFake : public WebDatabase { |
| 181 public: | 192 public: |
| 182 explicit WebDatabaseFake(AutofillTable* autofill_table) { | 193 explicit WebDatabaseFake(AutofillTable* autofill_table) { |
| 183 AddTable(autofill_table); | 194 AddTable(autofill_table); |
| 184 } | 195 } |
| 185 }; | 196 }; |
| 186 | 197 |
| (...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 492 return node.GetTotalNodeCount() - 1; | 503 return node.GetTotalNodeCount() - 1; |
| 493 } | 504 } |
| 494 | 505 |
| 495 void StartSyncService(const base::Closure& callback, | 506 void StartSyncService(const base::Closure& callback, |
| 496 bool will_fail_association, | 507 bool will_fail_association, |
| 497 syncer::ModelType type) { | 508 syncer::ModelType type) { |
| 498 SigninManagerBase* signin = SigninManagerFactory::GetForProfile(profile_); | 509 SigninManagerBase* signin = SigninManagerFactory::GetForProfile(profile_); |
| 499 signin->SetAuthenticatedAccountInfo("12345", "test_user@gmail.com"); | 510 signin->SetAuthenticatedAccountInfo("12345", "test_user@gmail.com"); |
| 500 sync_service_ = TestProfileSyncService::BuildAutoStartAsyncInit(profile_, | 511 sync_service_ = TestProfileSyncService::BuildAutoStartAsyncInit(profile_, |
| 501 callback); | 512 callback); |
| 513 sync_client_->SetSyncService(sync_service_); | |
| 502 | 514 |
| 503 ProfileSyncComponentsFactoryMock* components = | 515 ProfileSyncComponentsFactoryMock* components = |
| 504 sync_service_->components_factory_mock(); | 516 sync_service_->components_factory_mock(); |
| 505 | 517 |
| 506 EXPECT_CALL(*components, CreateDataTypeManager(_, _, _, _, _)). | 518 EXPECT_CALL(*components, CreateDataTypeManager(_, _, _, _, _)). |
| 507 WillOnce(ReturnNewDataTypeManagerWithDebugListener( | 519 WillOnce(ReturnNewDataTypeManagerWithDebugListener( |
| 508 syncer::MakeWeakHandle(debug_ptr_factory_.GetWeakPtr()))); | 520 syncer::MakeWeakHandle(debug_ptr_factory_.GetWeakPtr()))); |
| 509 | 521 |
| 510 EXPECT_CALL(*personal_data_manager_, IsDataLoaded()). | 522 EXPECT_CALL(*personal_data_manager_, IsDataLoaded()). |
| 511 WillRepeatedly(Return(true)); | 523 WillRepeatedly(Return(true)); |
| (...skipping 779 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1291 std::vector<AutofillEntry> sync_entries; | 1303 std::vector<AutofillEntry> sync_entries; |
| 1292 std::vector<AutofillProfile> sync_profiles; | 1304 std::vector<AutofillProfile> sync_profiles; |
| 1293 ASSERT_TRUE(GetAutofillEntriesFromSyncDB(&sync_entries, &sync_profiles)); | 1305 ASSERT_TRUE(GetAutofillEntriesFromSyncDB(&sync_entries, &sync_profiles)); |
| 1294 EXPECT_EQ(3U, sync_entries.size()); | 1306 EXPECT_EQ(3U, sync_entries.size()); |
| 1295 EXPECT_EQ(0U, sync_profiles.size()); | 1307 EXPECT_EQ(0U, sync_profiles.size()); |
| 1296 for (size_t i = 0; i < sync_entries.size(); i++) { | 1308 for (size_t i = 0; i < sync_entries.size(); i++) { |
| 1297 DVLOG(1) << "Entry " << i << ": " << sync_entries[i].key().name() | 1309 DVLOG(1) << "Entry " << i << ": " << sync_entries[i].key().name() |
| 1298 << ", " << sync_entries[i].key().value(); | 1310 << ", " << sync_entries[i].key().value(); |
| 1299 } | 1311 } |
| 1300 } | 1312 } |
| OLD | NEW |