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

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

Issue 247433004: sync: remove CreateSharedChangeProcessor from ProfileSyncComponentsFactory (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove SCPFactory Created 6 years, 8 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 | Annotate | Revision Log
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 12 matching lines...) Expand all
23 #include "base/time/time.h" 23 #include "base/time/time.h"
24 #include "chrome/browser/autofill/personal_data_manager_factory.h" 24 #include "chrome/browser/autofill/personal_data_manager_factory.h"
25 #include "chrome/browser/prefs/pref_service_syncable.h" 25 #include "chrome/browser/prefs/pref_service_syncable.h"
26 #include "chrome/browser/signin/fake_profile_oauth2_token_service.h" 26 #include "chrome/browser/signin/fake_profile_oauth2_token_service.h"
27 #include "chrome/browser/signin/fake_profile_oauth2_token_service_builder.h" 27 #include "chrome/browser/signin/fake_profile_oauth2_token_service_builder.h"
28 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" 28 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
29 #include "chrome/browser/signin/signin_manager_factory.h" 29 #include "chrome/browser/signin/signin_manager_factory.h"
30 #include "chrome/browser/sync/abstract_profile_sync_service_test.h" 30 #include "chrome/browser/sync/abstract_profile_sync_service_test.h"
31 #include "chrome/browser/sync/glue/autofill_data_type_controller.h" 31 #include "chrome/browser/sync/glue/autofill_data_type_controller.h"
32 #include "chrome/browser/sync/glue/autofill_profile_data_type_controller.h" 32 #include "chrome/browser/sync/glue/autofill_profile_data_type_controller.h"
33 #include "chrome/browser/sync/glue/shared_change_processor.h"
34 #include "chrome/browser/sync/profile_sync_components_factory.h" 33 #include "chrome/browser/sync/profile_sync_components_factory.h"
35 #include "chrome/browser/sync/profile_sync_service.h" 34 #include "chrome/browser/sync/profile_sync_service.h"
36 #include "chrome/browser/sync/profile_sync_service_factory.h" 35 #include "chrome/browser/sync/profile_sync_service_factory.h"
37 #include "chrome/browser/sync/profile_sync_test_util.h" 36 #include "chrome/browser/sync/profile_sync_test_util.h"
38 #include "chrome/browser/sync/test_profile_sync_service.h" 37 #include "chrome/browser/sync/test_profile_sync_service.h"
39 #include "chrome/browser/webdata/autocomplete_syncable_service.h" 38 #include "chrome/browser/webdata/autocomplete_syncable_service.h"
40 #include "chrome/browser/webdata/web_data_service_factory.h" 39 #include "chrome/browser/webdata/web_data_service_factory.h"
41 #include "chrome/test/base/testing_browser_process.h" 40 #include "chrome/test/base/testing_browser_process.h"
42 #include "chrome/test/base/testing_profile.h" 41 #include "chrome/test/base/testing_profile.h"
43 #include "chrome/test/base/testing_profile_manager.h" 42 #include "chrome/test/base/testing_profile_manager.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 using autofill::AutofillTable; 78 using autofill::AutofillTable;
80 using autofill::AutofillWebDataService; 79 using autofill::AutofillWebDataService;
81 using autofill::PersonalDataManager; 80 using autofill::PersonalDataManager;
82 using base::Time; 81 using base::Time;
83 using base::TimeDelta; 82 using base::TimeDelta;
84 using base::WaitableEvent; 83 using base::WaitableEvent;
85 using browser_sync::AutofillDataTypeController; 84 using browser_sync::AutofillDataTypeController;
86 using browser_sync::AutofillProfileDataTypeController; 85 using browser_sync::AutofillProfileDataTypeController;
87 using browser_sync::DataTypeController; 86 using browser_sync::DataTypeController;
88 using browser_sync::GenericChangeProcessor; 87 using browser_sync::GenericChangeProcessor;
89 using browser_sync::SharedChangeProcessor;
90 using content::BrowserThread; 88 using content::BrowserThread;
91 using syncer::AUTOFILL; 89 using syncer::AUTOFILL;
92 using syncer::BaseNode; 90 using syncer::BaseNode;
93 using syncer::syncable::BASE_VERSION; 91 using syncer::syncable::BASE_VERSION;
94 using syncer::syncable::CREATE; 92 using syncer::syncable::CREATE;
95 using syncer::syncable::GET_BY_SERVER_TAG; 93 using syncer::syncable::GET_BY_SERVER_TAG;
96 using syncer::syncable::MutableEntry; 94 using syncer::syncable::MutableEntry;
97 using syncer::syncable::SERVER_SPECIFICS; 95 using syncer::syncable::SERVER_SPECIFICS;
98 using syncer::syncable::SPECIFICS; 96 using syncer::syncable::SPECIFICS;
99 using syncer::syncable::UNITTEST; 97 using syncer::syncable::UNITTEST;
(...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after
372 ACTION(MakeGenericChangeProcessor) { 370 ACTION(MakeGenericChangeProcessor) {
373 syncer::UserShare* user_share = arg0->GetUserShare(); 371 syncer::UserShare* user_share = arg0->GetUserShare();
374 return new GenericChangeProcessor( 372 return new GenericChangeProcessor(
375 arg1, 373 arg1,
376 arg2, 374 arg2,
377 arg3, 375 arg3,
378 user_share, 376 user_share,
379 syncer::FakeAttachmentService::CreateForTest()); 377 syncer::FakeAttachmentService::CreateForTest());
380 } 378 }
381 379
382 ACTION(MakeSharedChangeProcessor) {
383 return new SharedChangeProcessor();
384 }
385
386 ACTION_P(MakeAutofillProfileSyncComponents, wds) { 380 ACTION_P(MakeAutofillProfileSyncComponents, wds) {
387 EXPECT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::DB)); 381 EXPECT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::DB));
388 if (!BrowserThread::CurrentlyOn(BrowserThread::DB)) 382 if (!BrowserThread::CurrentlyOn(BrowserThread::DB))
389 return base::WeakPtr<syncer::SyncableService>(); 383 return base::WeakPtr<syncer::SyncableService>();
390 return AutofillProfileSyncableService::FromWebDataService(wds)->AsWeakPtr(); 384 return AutofillProfileSyncableService::FromWebDataService(wds)->AsWeakPtr();
391 } 385 }
392 386
393 class AbstractAutofillFactory { 387 class AbstractAutofillFactory {
394 public: 388 public:
395 virtual DataTypeController* CreateDataTypeController( 389 virtual DataTypeController* CreateDataTypeController(
(...skipping 15 matching lines...) Expand all
411 ProfileSyncService* service) OVERRIDE { 405 ProfileSyncService* service) OVERRIDE {
412 return new AutofillDataTypeController(factory, profile, service); 406 return new AutofillDataTypeController(factory, profile, service);
413 } 407 }
414 408
415 virtual void SetExpectation(ProfileSyncComponentsFactoryMock* factory, 409 virtual void SetExpectation(ProfileSyncComponentsFactoryMock* factory,
416 ProfileSyncService* service, 410 ProfileSyncService* service,
417 AutofillWebDataService* wds, 411 AutofillWebDataService* wds,
418 DataTypeController* dtc) OVERRIDE { 412 DataTypeController* dtc) OVERRIDE {
419 EXPECT_CALL(*factory, CreateGenericChangeProcessor(_,_,_,_)). 413 EXPECT_CALL(*factory, CreateGenericChangeProcessor(_,_,_,_)).
420 WillOnce(MakeGenericChangeProcessor()); 414 WillOnce(MakeGenericChangeProcessor());
421 EXPECT_CALL(*factory, CreateSharedChangeProcessor()).
422 WillOnce(MakeSharedChangeProcessor());
423 EXPECT_CALL(*factory, GetSyncableServiceForType(syncer::AUTOFILL)). 415 EXPECT_CALL(*factory, GetSyncableServiceForType(syncer::AUTOFILL)).
424 WillOnce(MakeAutocompleteSyncComponents(wds)); 416 WillOnce(MakeAutocompleteSyncComponents(wds));
425 } 417 }
426 }; 418 };
427 419
428 class AutofillProfileFactory : public AbstractAutofillFactory { 420 class AutofillProfileFactory : public AbstractAutofillFactory {
429 public: 421 public:
430 virtual browser_sync::DataTypeController* CreateDataTypeController( 422 virtual browser_sync::DataTypeController* CreateDataTypeController(
431 ProfileSyncComponentsFactory* factory, 423 ProfileSyncComponentsFactory* factory,
432 TestingProfile* profile, 424 TestingProfile* profile,
433 ProfileSyncService* service) OVERRIDE { 425 ProfileSyncService* service) OVERRIDE {
434 return new AutofillProfileDataTypeController(factory, profile, service); 426 return new AutofillProfileDataTypeController(factory, profile, service);
435 } 427 }
436 428
437 virtual void SetExpectation(ProfileSyncComponentsFactoryMock* factory, 429 virtual void SetExpectation(ProfileSyncComponentsFactoryMock* factory,
438 ProfileSyncService* service, 430 ProfileSyncService* service,
439 AutofillWebDataService* wds, 431 AutofillWebDataService* wds,
440 DataTypeController* dtc) OVERRIDE { 432 DataTypeController* dtc) OVERRIDE {
441 EXPECT_CALL(*factory, CreateGenericChangeProcessor(_,_,_,_)). 433 EXPECT_CALL(*factory, CreateGenericChangeProcessor(_,_,_,_)).
442 WillOnce(MakeGenericChangeProcessor()); 434 WillOnce(MakeGenericChangeProcessor());
443 EXPECT_CALL(*factory, CreateSharedChangeProcessor()).
444 WillOnce(MakeSharedChangeProcessor());
445 EXPECT_CALL(*factory, 435 EXPECT_CALL(*factory,
446 GetSyncableServiceForType(syncer::AUTOFILL_PROFILE)). 436 GetSyncableServiceForType(syncer::AUTOFILL_PROFILE)).
447 WillOnce(MakeAutofillProfileSyncComponents(wds)); 437 WillOnce(MakeAutofillProfileSyncComponents(wds));
448 } 438 }
449 }; 439 };
450 440
451 class MockPersonalDataManager : public PersonalDataManager { 441 class MockPersonalDataManager : public PersonalDataManager {
452 public: 442 public:
453 MockPersonalDataManager() : PersonalDataManager("en-US") {} 443 MockPersonalDataManager() : PersonalDataManager("en-US") {}
454 MOCK_CONST_METHOD0(IsDataLoaded, bool()); 444 MOCK_CONST_METHOD0(IsDataLoaded, bool());
(...skipping 950 matching lines...) Expand 10 before | Expand all | Expand 10 after
1405 std::vector<AutofillEntry> sync_entries; 1395 std::vector<AutofillEntry> sync_entries;
1406 std::vector<AutofillProfile> sync_profiles; 1396 std::vector<AutofillProfile> sync_profiles;
1407 ASSERT_TRUE(GetAutofillEntriesFromSyncDB(&sync_entries, &sync_profiles)); 1397 ASSERT_TRUE(GetAutofillEntriesFromSyncDB(&sync_entries, &sync_profiles));
1408 EXPECT_EQ(3U, sync_entries.size()); 1398 EXPECT_EQ(3U, sync_entries.size());
1409 EXPECT_EQ(0U, sync_profiles.size()); 1399 EXPECT_EQ(0U, sync_profiles.size());
1410 for (size_t i = 0; i < sync_entries.size(); i++) { 1400 for (size_t i = 0; i < sync_entries.size(); i++) {
1411 DVLOG(1) << "Entry " << i << ": " << sync_entries[i].key().name() 1401 DVLOG(1) << "Entry " << i << ": " << sync_entries[i].key().name()
1412 << ", " << sync_entries[i].key().value(); 1402 << ", " << sync_entries[i].key().value();
1413 } 1403 }
1414 } 1404 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698