| Index: chrome/browser/sync/glue/non_frontend_data_type_controller_mock.h
|
| diff --git a/chrome/browser/sync/glue/non_frontend_data_type_controller_mock.h b/chrome/browser/sync/glue/non_frontend_data_type_controller_mock.h
|
| index f5d40bef342aba88bc6c0701619641b7f7b8d344..8a1afb93a5b05c9b5930d3734461b65bf2ae7b0b 100644
|
| --- a/chrome/browser/sync/glue/non_frontend_data_type_controller_mock.h
|
| +++ b/chrome/browser/sync/glue/non_frontend_data_type_controller_mock.h
|
| @@ -39,13 +39,13 @@ class NonFrontendDataTypeControllerMock : public NonFrontendDataTypeController {
|
| MOCK_METHOD0(StartAssociation, void());
|
| MOCK_METHOD0(CreateSyncComponents, void());
|
| MOCK_METHOD2(StartFailed, void(StartResult result,
|
| - const SyncError& error));
|
| + const csync::SyncError& error));
|
| MOCK_METHOD3(StartDone, void(DataTypeController::StartResult result,
|
| DataTypeController::State new_state,
|
| - const SyncError& error));
|
| + const csync::SyncError& error));
|
| MOCK_METHOD3(StartDoneImpl, void(DataTypeController::StartResult result,
|
| DataTypeController::State new_state,
|
| - const SyncError& error));
|
| + const csync::SyncError& error));
|
| MOCK_METHOD0(StopModels, void());
|
| MOCK_METHOD0(StopAssociation, void());
|
| MOCK_METHOD2(OnUnrecoverableErrorImpl, void(const tracked_objects::Location&,
|
|
|