| Index: chrome/browser/sync/glue/frontend_data_type_controller_mock.h
|
| diff --git a/chrome/browser/sync/glue/frontend_data_type_controller_mock.h b/chrome/browser/sync/glue/frontend_data_type_controller_mock.h
|
| index 82f843cc7784fde8cad8be3d5086a7f8959ac6da..cbc59162250a2eb7c55442ecc036e463336d1617 100644
|
| --- a/chrome/browser/sync/glue/frontend_data_type_controller_mock.h
|
| +++ b/chrome/browser/sync/glue/frontend_data_type_controller_mock.h
|
| @@ -26,7 +26,7 @@ class FrontendDataTypeControllerMock : public FrontendDataTypeController {
|
| MOCK_METHOD0(enabled, bool());
|
| MOCK_CONST_METHOD0(type, syncable::ModelType());
|
| MOCK_CONST_METHOD0(name, std::string());
|
| - MOCK_CONST_METHOD0(model_safe_group, csync::ModelSafeGroup());
|
| + MOCK_CONST_METHOD0(model_safe_group, syncer::ModelSafeGroup());
|
| MOCK_CONST_METHOD0(state, State());
|
| MOCK_METHOD2(OnUnrecoverableError, void(const tracked_objects::Location&,
|
| const std::string&));
|
| @@ -36,7 +36,7 @@ class FrontendDataTypeControllerMock : public FrontendDataTypeController {
|
| MOCK_METHOD0(Associate, bool());
|
| MOCK_METHOD0(CreateSyncComponents, void());
|
| MOCK_METHOD2(StartFailed, void(StartResult result,
|
| - const csync::SyncError& error));
|
| + const syncer::SyncError& error));
|
| MOCK_METHOD1(FinishStart, void(StartResult result));
|
| MOCK_METHOD0(CleanUpState, void());
|
| MOCK_CONST_METHOD0(model_associator, AssociatorInterface*());
|
|
|