| Index: chrome/browser/sync/test_profile_sync_service.h
|
| diff --git a/chrome/browser/sync/test_profile_sync_service.h b/chrome/browser/sync/test_profile_sync_service.h
|
| index 09dc1c6481e51b10bb888d86431ba47722be3c5c..7767d917a9c6b94084b84578bc00e38da5454dbc 100644
|
| --- a/chrome/browser/sync/test_profile_sync_service.h
|
| +++ b/chrome/browser/sync/test_profile_sync_service.h
|
| @@ -24,13 +24,13 @@ class ProfileSyncComponentsFactory;
|
| class ProfileSyncComponentsFactoryMock;
|
|
|
| ACTION(ReturnNewDataTypeManager) {
|
| - return new browser_sync::DataTypeManagerImpl(base::Closure(),
|
| - arg0,
|
| - arg1,
|
| - arg2,
|
| - arg3,
|
| - arg4,
|
| - arg5);
|
| + return new sync_driver::DataTypeManagerImpl(base::Closure(),
|
| + arg0,
|
| + arg1,
|
| + arg2,
|
| + arg3,
|
| + arg4,
|
| + arg5);
|
| }
|
|
|
| namespace browser_sync {
|
| @@ -82,7 +82,7 @@ class TestProfileSyncService : public ProfileSyncService {
|
| virtual ~TestProfileSyncService();
|
|
|
| virtual void OnConfigureDone(
|
| - const browser_sync::DataTypeManager::ConfigureResult& result) OVERRIDE;
|
| + const sync_driver::DataTypeManager::ConfigureResult& result) OVERRIDE;
|
|
|
| // We implement our own version to avoid some DCHECKs.
|
| virtual syncer::UserShare* GetUserShare() const OVERRIDE;
|
|
|