diff options
Diffstat (limited to 'chrome/browser/sync')
8 files changed, 27 insertions, 26 deletions
diff --git a/chrome/browser/sync/glue/autofill_change_processor.cc b/chrome/browser/sync/glue/autofill_change_processor.cc index 0b70639..4f18dcb 100644 --- a/chrome/browser/sync/glue/autofill_change_processor.cc +++ b/chrome/browser/sync/glue/autofill_change_processor.cc @@ -295,7 +295,8 @@ void AutofillChangeProcessor::CommitChangesFromSyncModel() { return; } - WebDataService::NotifyOfMultipleAutofillChanges(profile_); + WebDataService::NotifyOfMultipleAutofillChanges( + profile_->GetWebDataService(Profile::EXPLICIT_ACCESS)); StartObserving(); } diff --git a/chrome/browser/sync/glue/autofill_model_associator.cc b/chrome/browser/sync/glue/autofill_model_associator.cc index 464d940..106cc3a 100644 --- a/chrome/browser/sync/glue/autofill_model_associator.cc +++ b/chrome/browser/sync/glue/autofill_model_associator.cc @@ -198,7 +198,8 @@ bool AutofillModelAssociator::AssociateModels(SyncError* error) { return false; } - WebDataService::NotifyOfMultipleAutofillChanges(profile_); + WebDataService::NotifyOfMultipleAutofillChanges( + profile_->GetWebDataService(Profile::EXPLICIT_ACCESS)); return true; } diff --git a/chrome/browser/sync/glue/autofill_profile_data_type_controller.cc b/chrome/browser/sync/glue/autofill_profile_data_type_controller.cc index a731eea..e387ea4 100644 --- a/chrome/browser/sync/glue/autofill_profile_data_type_controller.cc +++ b/chrome/browser/sync/glue/autofill_profile_data_type_controller.cc @@ -25,10 +25,9 @@ void AutofillProfileDataTypeController::CreateSyncComponents() { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB)); ProfileSyncFactory::SyncComponents sync_components = profile_sync_factory()-> - CreateAutofillProfileSyncComponents( - profile_sync_service(), - web_data_service()->GetDatabase(), - this); + CreateAutofillProfileSyncComponents(profile_sync_service(), + web_data_service(), + this); set_model_associator(sync_components.model_associator); set_change_processor(sync_components.change_processor); } diff --git a/chrome/browser/sync/profile_sync_factory.h b/chrome/browser/sync/profile_sync_factory.h index e4bd347..5b652b0 100644 --- a/chrome/browser/sync/profile_sync_factory.h +++ b/chrome/browser/sync/profile_sync_factory.h @@ -20,6 +20,7 @@ class PasswordStore; class PersonalDataManager; class ProfileSyncService; class WebDatabase; +class WebDataService; namespace browser_sync { class DataTypeManager; @@ -84,7 +85,7 @@ class ProfileSyncFactory { // by the caller. virtual SyncComponents CreateAutofillProfileSyncComponents( ProfileSyncService* profile_sync_service, - WebDatabase* web_database, + WebDataService* web_data_service, browser_sync::UnrecoverableErrorHandler* error_handler) = 0; // Instantiates both a model associator and change processor for the diff --git a/chrome/browser/sync/profile_sync_factory_impl.cc b/chrome/browser/sync/profile_sync_factory_impl.cc index 7658635..5f093e3 100644 --- a/chrome/browser/sync/profile_sync_factory_impl.cc +++ b/chrome/browser/sync/profile_sync_factory_impl.cc @@ -220,11 +220,10 @@ ProfileSyncFactoryImpl::CreateAutofillSyncComponents( ProfileSyncFactory::SyncComponents ProfileSyncFactoryImpl::CreateAutofillProfileSyncComponents( ProfileSyncService* profile_sync_service, - WebDatabase* web_database, + WebDataService* web_data_service, browser_sync::UnrecoverableErrorHandler* error_handler) { AutofillProfileSyncableService* sync_service = - new AutofillProfileSyncableService(web_database, - profile_sync_service->profile()); + new AutofillProfileSyncableService(web_data_service); sync_api::UserShare* user_share = profile_sync_service->GetUserShare(); GenericChangeProcessor* change_processor = new GenericChangeProcessor(sync_service, error_handler, user_share); diff --git a/chrome/browser/sync/profile_sync_factory_impl.h b/chrome/browser/sync/profile_sync_factory_impl.h index cab83cf..5d8873b 100644 --- a/chrome/browser/sync/profile_sync_factory_impl.h +++ b/chrome/browser/sync/profile_sync_factory_impl.h @@ -41,7 +41,7 @@ class ProfileSyncFactoryImpl : public ProfileSyncFactory { virtual SyncComponents CreateAutofillProfileSyncComponents( ProfileSyncService* profile_sync_service, - WebDatabase* web_database, + WebDataService* web_data_service, browser_sync::UnrecoverableErrorHandler* error_handler); virtual SyncComponents CreateBookmarkSyncComponents( diff --git a/chrome/browser/sync/profile_sync_factory_mock.h b/chrome/browser/sync/profile_sync_factory_mock.h index 2fb8e12..5bb5445 100644 --- a/chrome/browser/sync/profile_sync_factory_mock.h +++ b/chrome/browser/sync/profile_sync_factory_mock.h @@ -44,7 +44,7 @@ class ProfileSyncFactoryMock : public ProfileSyncFactory { MOCK_METHOD3(CreateAutofillProfileSyncComponents, SyncComponents( ProfileSyncService* profile_sync_service, - WebDatabase* web_database, + WebDataService* web_data_service, browser_sync::UnrecoverableErrorHandler* error_handler)); MOCK_METHOD2(CreateBookmarkSyncComponents, SyncComponents(ProfileSyncService* profile_sync_service, diff --git a/chrome/browser/sync/profile_sync_service_autofill_unittest.cc b/chrome/browser/sync/profile_sync_service_autofill_unittest.cc index d196ce4..b099148 100644 --- a/chrome/browser/sync/profile_sync_service_autofill_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_autofill_unittest.cc @@ -179,12 +179,12 @@ ACTION_P3(MakeAutofillSyncComponents, service, wd, dtc) { change_processor); } -ACTION_P3(MakeAutofillProfileSyncComponents, service, wd, dtc) { +ACTION_P3(MakeAutofillProfileSyncComponents, service, wds, dtc) { EXPECT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::DB)); if (!BrowserThread::CurrentlyOn(BrowserThread::DB)) return ProfileSyncFactory::SyncComponents(NULL, NULL); AutofillProfileSyncableService* sync_service = - new AutofillProfileSyncableService(wd, service->profile()); + new AutofillProfileSyncableService(wds); sync_api::UserShare* user_share = service->GetUserShare(); GenericChangeProcessor* change_processor = new GenericChangeProcessor(sync_service, dtc, user_share); @@ -203,9 +203,9 @@ class AbstractAutofillFactory { ProfileMock* profile, ProfileSyncService* service) = 0; virtual void SetExpectation(ProfileSyncFactoryMock* factory, - ProfileSyncService* service, - WebDatabase* wd, - DataTypeController* dtc) = 0; + ProfileSyncService* service, + WebDataService* wds, + DataTypeController* dtc) = 0; virtual ~AbstractAutofillFactory() {} }; @@ -220,11 +220,11 @@ class AutofillEntryFactory : public AbstractAutofillFactory { } void SetExpectation(ProfileSyncFactoryMock* factory, - ProfileSyncService* service, - WebDatabase* wd, - DataTypeController* dtc) { + ProfileSyncService* service, + WebDataService* wds, + DataTypeController* dtc) { EXPECT_CALL(*factory, CreateAutofillSyncComponents(_,_,_)). - WillOnce(MakeAutofillSyncComponents(service, wd, dtc)); + WillOnce(MakeAutofillSyncComponents(service, wds->GetDatabase(), dtc)); } }; @@ -239,11 +239,11 @@ class AutofillProfileFactory : public AbstractAutofillFactory { } void SetExpectation(ProfileSyncFactoryMock* factory, - ProfileSyncService* service, - WebDatabase* wd, - DataTypeController* dtc) { + ProfileSyncService* service, + WebDataService* wds, + DataTypeController* dtc) { EXPECT_CALL(*factory, CreateAutofillProfileSyncComponents(_,_,_)). - WillOnce(MakeAutofillProfileSyncComponents(service, wd, dtc)); + WillOnce(MakeAutofillProfileSyncComponents(service, wds, dtc)); } }; @@ -325,7 +325,7 @@ class ProfileSyncServiceAutofillTest : public AbstractProfileSyncServiceTest { factory->SetExpectation(&factory_, service_.get(), - web_database_.get(), + web_data_service_.get(), data_type_controller); EXPECT_CALL(factory_, CreateDataTypeManager(_, _)). |