Chromium Code Reviews| Index: chrome/browser/sync/profile_sync_components_factory_mock.cc |
| diff --git a/chrome/browser/sync/profile_sync_factory_mock.cc b/chrome/browser/sync/profile_sync_components_factory_mock.cc |
| similarity index 64% |
| rename from chrome/browser/sync/profile_sync_factory_mock.cc |
| rename to chrome/browser/sync/profile_sync_components_factory_mock.cc |
| index fc3af4f40f7c93e51254a0a7ddffa8fde3b25479..e29c8ede882f4ffe3e7688b38931443942ceb779 100644 |
| --- a/chrome/browser/sync/profile_sync_factory_mock.cc |
| +++ b/chrome/browser/sync/profile_sync_components_factory_mock.cc |
| @@ -4,16 +4,16 @@ |
| #include "chrome/browser/sync/glue/change_processor.h" |
| #include "chrome/browser/sync/glue/model_associator.h" |
| -#include "chrome/browser/sync/profile_sync_factory_mock.h" |
| +#include "chrome/browser/sync/profile_sync_components_factory_mock.h" |
| using browser_sync::AssociatorInterface; |
| using browser_sync::ChangeProcessor; |
| using testing::_; |
| using testing::InvokeWithoutArgs; |
| -ProfileSyncFactoryMock::ProfileSyncFactoryMock() {} |
| +ProfileSyncComponentsFactoryMock::ProfileSyncComponentsFactoryMock() {} |
| -ProfileSyncFactoryMock::ProfileSyncFactoryMock( |
| +ProfileSyncComponentsFactoryMock::ProfileSyncComponentsFactoryMock( |
| AssociatorInterface* model_associator, ChangeProcessor* change_processor) |
| : model_associator_(model_associator), |
| change_processor_(change_processor) { |
| @@ -21,23 +21,23 @@ ProfileSyncFactoryMock::ProfileSyncFactoryMock( |
| WillByDefault( |
| InvokeWithoutArgs( |
| this, |
| - &ProfileSyncFactoryMock::MakeSyncComponents)); |
| + &ProfileSyncComponentsFactoryMock::MakeSyncComponents)); |
| ON_CALL(*this, CreateSearchEngineSyncComponents(_, _)). |
| WillByDefault( |
| InvokeWithoutArgs( |
| this, |
| - &ProfileSyncFactoryMock::MakeSyncComponents)); |
| + &ProfileSyncComponentsFactoryMock::MakeSyncComponents)); |
| ON_CALL(*this, CreateAppNotificationSyncComponents(_, _)). |
| WillByDefault( |
| InvokeWithoutArgs( |
| this, |
| - &ProfileSyncFactoryMock::MakeSyncComponents)); |
| + &ProfileSyncComponentsFactoryMock::MakeSyncComponents)); |
| } |
| -ProfileSyncFactoryMock::~ProfileSyncFactoryMock() {} |
| +ProfileSyncComponentsFactoryMock::~ProfileSyncComponentsFactoryMock() {} |
| -ProfileSyncFactory::SyncComponents |
| -ProfileSyncFactoryMock::MakeSyncComponents() { |
| +ProfileSyncComponentsFactory::SyncComponents |
| +ProfileSyncComponentsFactoryMock::MakeSyncComponents() { |
|
Nicolas Zea
2011/11/22 00:01:03
and here
|
| return SyncComponents(model_associator_.release(), |
| change_processor_.release()); |
| } |