Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(168)

Side by Side Diff: chrome/browser/sync/profile_sync_service_autofill_unittest.cc

Issue 1314903004: Sync: Refactoring DataTypeController to make the design shareable with USS datatypes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed CR comments Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 const scoped_refptr<AutofillWebDataService>& web_data_service) 151 const scoped_refptr<AutofillWebDataService>& web_data_service)
152 : pdm_(pdm), 152 : pdm_(pdm),
153 sync_service_(nullptr),
153 web_data_service_(web_data_service) {} 154 web_data_service_(web_data_service) {}
154 ~TestSyncClient() override {} 155 ~TestSyncClient() override {}
155 156
156 // FakeSyncClient overrides. 157 // FakeSyncClient overrides.
157 autofill::PersonalDataManager* GetPersonalDataManager() override { 158 autofill::PersonalDataManager* GetPersonalDataManager() override {
158 return pdm_; 159 return pdm_;
159 } 160 }
161 sync_driver::SyncService* GetSyncService() override {
162 DCHECK(sync_service_);
163 return sync_service_;
164 }
160 scoped_refptr<autofill::AutofillWebDataService> GetWebDataService() override { 165 scoped_refptr<autofill::AutofillWebDataService> GetWebDataService() override {
161 return web_data_service_; 166 return web_data_service_;
162 } 167 }
163 base::WeakPtr<syncer::SyncableService> GetSyncableServiceForType( 168 base::WeakPtr<syncer::SyncableService> GetSyncableServiceForType(
164 syncer::ModelType type) override { 169 syncer::ModelType type) override {
165 DCHECK(type == AUTOFILL || type == AUTOFILL_PROFILE); 170 DCHECK(type == AUTOFILL || type == AUTOFILL_PROFILE);
166 if (type == AUTOFILL) { 171 if (type == AUTOFILL) {
167 return AutocompleteSyncableService::FromWebDataService( 172 return AutocompleteSyncableService::FromWebDataService(
168 web_data_service_.get())->AsWeakPtr(); 173 web_data_service_.get())->AsWeakPtr();
169 } else { 174 } else {
170 return AutofillProfileSyncableService::FromWebDataService( 175 return AutofillProfileSyncableService::FromWebDataService(
171 web_data_service_.get())->AsWeakPtr(); 176 web_data_service_.get())->AsWeakPtr();
172 } 177 }
173 } 178 }
174 179
180 void SetSyncService(sync_driver::SyncService* sync_service) {
181 sync_service_ = sync_service;
182 }
183
175 private: 184 private:
176 PersonalDataManager* pdm_; 185 PersonalDataManager* pdm_;
186 sync_driver::SyncService* sync_service_;
177 scoped_refptr<AutofillWebDataService> web_data_service_; 187 scoped_refptr<AutofillWebDataService> web_data_service_;
178 }; 188 };
179 189
180 class WebDatabaseFake : public WebDatabase { 190 class WebDatabaseFake : public WebDatabase {
181 public: 191 public:
182 explicit WebDatabaseFake(AutofillTable* autofill_table) { 192 explicit WebDatabaseFake(AutofillTable* autofill_table) {
183 AddTable(autofill_table); 193 AddTable(autofill_table);
184 } 194 }
185 }; 195 };
186 196
(...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after
492 return node.GetTotalNodeCount() - 1; 502 return node.GetTotalNodeCount() - 1;
493 } 503 }
494 504
495 void StartSyncService(const base::Closure& callback, 505 void StartSyncService(const base::Closure& callback,
496 bool will_fail_association, 506 bool will_fail_association,
497 syncer::ModelType type) { 507 syncer::ModelType type) {
498 SigninManagerBase* signin = SigninManagerFactory::GetForProfile(profile_); 508 SigninManagerBase* signin = SigninManagerFactory::GetForProfile(profile_);
499 signin->SetAuthenticatedAccountInfo("12345", "test_user@gmail.com"); 509 signin->SetAuthenticatedAccountInfo("12345", "test_user@gmail.com");
500 sync_service_ = TestProfileSyncService::BuildAutoStartAsyncInit(profile_, 510 sync_service_ = TestProfileSyncService::BuildAutoStartAsyncInit(profile_,
501 callback); 511 callback);
512 sync_client_->SetSyncService(sync_service_);
502 513
503 ProfileSyncComponentsFactoryMock* components = 514 ProfileSyncComponentsFactoryMock* components =
504 sync_service_->components_factory_mock(); 515 sync_service_->components_factory_mock();
505 516
506 EXPECT_CALL(*components, CreateDataTypeManager(_, _, _, _, _)). 517 EXPECT_CALL(*components, CreateDataTypeManager(_, _, _, _, _)).
507 WillOnce(ReturnNewDataTypeManagerWithDebugListener( 518 WillOnce(ReturnNewDataTypeManagerWithDebugListener(
508 syncer::MakeWeakHandle(debug_ptr_factory_.GetWeakPtr()))); 519 syncer::MakeWeakHandle(debug_ptr_factory_.GetWeakPtr())));
509 520
510 EXPECT_CALL(*personal_data_manager_, IsDataLoaded()). 521 EXPECT_CALL(*personal_data_manager_, IsDataLoaded()).
511 WillRepeatedly(Return(true)); 522 WillRepeatedly(Return(true));
(...skipping 779 matching lines...) Expand 10 before | Expand all | Expand 10 after
1291 std::vector<AutofillEntry> sync_entries; 1302 std::vector<AutofillEntry> sync_entries;
1292 std::vector<AutofillProfile> sync_profiles; 1303 std::vector<AutofillProfile> sync_profiles;
1293 ASSERT_TRUE(GetAutofillEntriesFromSyncDB(&sync_entries, &sync_profiles)); 1304 ASSERT_TRUE(GetAutofillEntriesFromSyncDB(&sync_entries, &sync_profiles));
1294 EXPECT_EQ(3U, sync_entries.size()); 1305 EXPECT_EQ(3U, sync_entries.size());
1295 EXPECT_EQ(0U, sync_profiles.size()); 1306 EXPECT_EQ(0U, sync_profiles.size());
1296 for (size_t i = 0; i < sync_entries.size(); i++) { 1307 for (size_t i = 0; i < sync_entries.size(); i++) {
1297 DVLOG(1) << "Entry " << i << ": " << sync_entries[i].key().name() 1308 DVLOG(1) << "Entry " << i << ": " << sync_entries[i].key().name()
1298 << ", " << sync_entries[i].key().value(); 1309 << ", " << sync_entries[i].key().value();
1299 } 1310 }
1300 } 1311 }
OLDNEW
« no previous file with comments | « chrome/browser/sync/profile_sync_service.cc ('k') | chrome/browser/sync/profile_sync_service_bookmark_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698