Index: chrome/browser/sync/profile_sync_service_autofill_unittest.cc |
diff --git a/chrome/browser/sync/profile_sync_service_autofill_unittest.cc b/chrome/browser/sync/profile_sync_service_autofill_unittest.cc |
index 2a58e4bbb8e01af6fa2b95de5a17c311ae538560..d1bb9a970661265ad579b200d036663c74de9942 100644 |
--- a/chrome/browser/sync/profile_sync_service_autofill_unittest.cc |
+++ b/chrome/browser/sync/profile_sync_service_autofill_unittest.cc |
@@ -30,6 +30,7 @@ |
#include "chrome/browser/sync/glue/autofill_profile_syncable_service.h" |
#include "chrome/browser/sync/glue/data_type_controller.h" |
#include "chrome/browser/sync/glue/generic_change_processor.h" |
+#include "chrome/browser/sync/glue/shared_change_processor.h" |
#include "chrome/browser/sync/glue/syncable_service_adapter.h" |
#include "chrome/browser/sync/internal_api/read_node.h" |
#include "chrome/browser/sync/internal_api/read_transaction.h" |
@@ -63,6 +64,7 @@ using browser_sync::AutofillProfileDataTypeController; |
using browser_sync::AutofillProfileSyncableService; |
using browser_sync::DataTypeController; |
using browser_sync::GenericChangeProcessor; |
+using browser_sync::SharedChangeProcessor; |
using browser_sync::SyncableServiceAdapter; |
using browser_sync::GROUP_DB; |
using browser_sync::kAutofillTag; |
@@ -179,26 +181,27 @@ ACTION_P3(MakeAutofillSyncComponents, service, wd, dtc) { |
change_processor); |
} |
+ACTION(MakeGenericChangeProcessor) { |
+ sync_api::UserShare* user_share = arg0->GetUserShare(); |
+ return new GenericChangeProcessor(arg1, arg2, user_share); |
+} |
+ |
+ACTION(MakeSharedChangeProcessor) { |
+ return new SharedChangeProcessor(); |
+} |
+ |
ACTION_P3(MakeAutofillProfileSyncComponents, service, wd, dtc) { |
EXPECT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::DB)); |
if (!BrowserThread::CurrentlyOn(BrowserThread::DB)) |
- return ProfileSyncFactory::SyncComponents(NULL, NULL); |
+ return NULL; |
AutofillProfileSyncableService* sync_service = |
new AutofillProfileSyncableService(wd, service->profile()); |
- sync_api::UserShare* user_share = service->GetUserShare(); |
- GenericChangeProcessor* change_processor = |
- new GenericChangeProcessor(sync_service, dtc, user_share); |
- SyncableServiceAdapter* sync_service_adapter = |
- new SyncableServiceAdapter(syncable::AUTOFILL_PROFILE, |
- sync_service, |
- change_processor); |
- return ProfileSyncFactory::SyncComponents(sync_service_adapter, |
- change_processor); |
+ return sync_service; |
} |
class AbstractAutofillFactory { |
public: |
- virtual AutofillDataTypeController* CreateDataTypeController( |
+ virtual DataTypeController* CreateDataTypeController( |
ProfileSyncFactory* factory, |
ProfileMock* profile, |
ProfileSyncService* service) = 0; |
@@ -211,12 +214,11 @@ class AbstractAutofillFactory { |
class AutofillEntryFactory : public AbstractAutofillFactory { |
public: |
- browser_sync::AutofillDataTypeController* CreateDataTypeController( |
+ browser_sync::DataTypeController* CreateDataTypeController( |
ProfileSyncFactory* factory, |
ProfileMock* profile, |
ProfileSyncService* service) { |
- return new AutofillDataTypeController(factory, |
- profile); |
+ return new AutofillDataTypeController(factory, profile); |
} |
void SetExpectation(ProfileSyncFactoryMock* factory, |
@@ -230,19 +232,22 @@ class AutofillEntryFactory : public AbstractAutofillFactory { |
class AutofillProfileFactory : public AbstractAutofillFactory { |
public: |
- browser_sync::AutofillDataTypeController* CreateDataTypeController( |
+ browser_sync::DataTypeController* CreateDataTypeController( |
ProfileSyncFactory* factory, |
ProfileMock* profile, |
ProfileSyncService* service) { |
- return new AutofillProfileDataTypeController(factory, |
- profile); |
+ return new AutofillProfileDataTypeController(factory, profile); |
} |
void SetExpectation(ProfileSyncFactoryMock* factory, |
ProfileSyncService* service, |
WebDatabase* wd, |
DataTypeController* dtc) { |
- EXPECT_CALL(*factory, CreateAutofillProfileSyncComponents(_,_,_)). |
+ EXPECT_CALL(*factory, CreateGenericChangeProcessor(_,_,_)). |
+ WillOnce(MakeGenericChangeProcessor()); |
+ EXPECT_CALL(*factory, CreateSharedChangeProcessor()). |
+ WillOnce(MakeSharedChangeProcessor()); |
+ EXPECT_CALL(*factory, CreateAutofillProfileSyncComponents(_,_)). |
WillOnce(MakeAutofillProfileSyncComponents(service, wd, dtc)); |
} |
}; |
@@ -316,7 +321,7 @@ class ProfileSyncServiceAutofillTest : public AbstractProfileSyncServiceTest { |
task)); |
EXPECT_CALL(profile_, GetProfileSyncService()).WillRepeatedly( |
Return(service_.get())); |
- AutofillDataTypeController* data_type_controller = |
+ DataTypeController* data_type_controller = |
factory->CreateDataTypeController(&factory_, |
&profile_, |
service_.get()); |