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 c61d0208bac105f0cba8bc61a0a1c80e6937b624..221b37a2065d1501769a50dc1cb3be94b3ceeb64 100644 |
--- a/chrome/browser/sync/profile_sync_service_autofill_unittest.cc |
+++ b/chrome/browser/sync/profile_sync_service_autofill_unittest.cc |
@@ -81,7 +81,6 @@ using base::TimeDelta; |
using base::WaitableEvent; |
using browser_sync::AutofillDataTypeController; |
using browser_sync::AutofillProfileDataTypeController; |
-using browser_sync::DataTypeController; |
using content::BrowserThread; |
using syncer::AUTOFILL; |
using syncer::AUTOFILL_PROFILE; |
@@ -95,6 +94,7 @@ using syncer::syncable::SPECIFICS; |
using syncer::syncable::UNITTEST; |
using syncer::syncable::WriterTag; |
using syncer::syncable::WriteTransaction; |
+using sync_driver::DataTypeController; |
using testing::_; |
using testing::DoAll; |
using testing::ElementsAre; |
@@ -356,7 +356,7 @@ ACTION_P(MakeAutocompleteSyncComponents, wds) { |
} |
ACTION_P(ReturnNewDataTypeManagerWithDebugListener, debug_listener) { |
- return new browser_sync::DataTypeManagerImpl( |
+ return new sync_driver::DataTypeManagerImpl( |
base::Closure(), |
debug_listener, |
arg1, |
@@ -375,31 +375,33 @@ ACTION_P(MakeAutofillProfileSyncComponents, wds) { |
class AbstractAutofillFactory { |
public: |
- virtual DataTypeController* CreateDataTypeController( |
+ virtual sync_driver::DataTypeController* CreateDataTypeController( |
maxbogue
2014/07/21 22:14:21
Covered by 'using'; also applies to most of the ch
Nicolas Zea
2014/07/21 22:23:31
Done.
|
ProfileSyncComponentsFactory* factory, |
TestingProfile* profile, |
ProfileSyncService* service) = 0; |
virtual void SetExpectation(ProfileSyncComponentsFactoryMock* factory, |
ProfileSyncService* service, |
AutofillWebDataService* wds, |
- DataTypeController* dtc) = 0; |
+ sync_driver::DataTypeController* dtc) = 0; |
virtual ~AbstractAutofillFactory() {} |
}; |
class AutofillEntryFactory : public AbstractAutofillFactory { |
public: |
- virtual browser_sync::DataTypeController* CreateDataTypeController( |
+ virtual sync_driver::DataTypeController* CreateDataTypeController( |
ProfileSyncComponentsFactory* factory, |
TestingProfile* profile, |
ProfileSyncService* service) OVERRIDE { |
return new AutofillDataTypeController( |
- factory, profile, DataTypeController::DisableTypeCallback()); |
+ factory, |
+ profile, |
+ sync_driver::DataTypeController::DisableTypeCallback()); |
} |
virtual void SetExpectation(ProfileSyncComponentsFactoryMock* factory, |
ProfileSyncService* service, |
AutofillWebDataService* wds, |
- DataTypeController* dtc) OVERRIDE { |
+ sync_driver::DataTypeController* dtc) OVERRIDE { |
EXPECT_CALL(*factory, GetSyncableServiceForType(syncer::AUTOFILL)). |
WillOnce(MakeAutocompleteSyncComponents(wds)); |
} |
@@ -407,18 +409,20 @@ class AutofillEntryFactory : public AbstractAutofillFactory { |
class AutofillProfileFactory : public AbstractAutofillFactory { |
public: |
- virtual browser_sync::DataTypeController* CreateDataTypeController( |
+ virtual sync_driver::DataTypeController* CreateDataTypeController( |
ProfileSyncComponentsFactory* factory, |
TestingProfile* profile, |
ProfileSyncService* service) OVERRIDE { |
return new AutofillProfileDataTypeController( |
- factory, profile, DataTypeController::DisableTypeCallback()); |
+ factory, |
+ profile, |
+ sync_driver::DataTypeController::DisableTypeCallback()); |
} |
virtual void SetExpectation(ProfileSyncComponentsFactoryMock* factory, |
ProfileSyncService* service, |
AutofillWebDataService* wds, |
- DataTypeController* dtc) OVERRIDE { |
+ sync_driver::DataTypeController* dtc) OVERRIDE { |
EXPECT_CALL(*factory, |
GetSyncableServiceForType(syncer::AUTOFILL_PROFILE)). |
WillOnce(MakeAutofillProfileSyncComponents(wds)); |
@@ -552,7 +556,7 @@ class ProfileSyncServiceAutofillTest |
ProfileSyncComponentsFactoryMock* components = |
sync_service_->components_factory_mock(); |
- DataTypeController* data_type_controller = |
+ sync_driver::DataTypeController* data_type_controller = |
factory->CreateDataTypeController(components, profile_, sync_service_); |
factory->SetExpectation(components, |
sync_service_, |