| 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 0485b1f68fb42c9d28647692b4fce99842fea41c..a32f3f5ac7793640b02690150f7131eb3e52d5ae 100644
|
| --- a/chrome/browser/sync/glue/frontend_data_type_controller_mock.h
|
| +++ b/chrome/browser/sync/glue/frontend_data_type_controller_mock.h
|
| @@ -30,12 +30,12 @@ class FrontendDataTypeControllerMock : public FrontendDataTypeController {
|
| // FrontendDataTypeController mocks.
|
| MOCK_METHOD0(StartModels, bool());
|
| MOCK_METHOD0(Associate, bool());
|
| - MOCK_METHOD0(CleanupState, void());
|
| - MOCK_METHOD2(FinishStart, void(StartResult result,
|
| - const tracked_objects::Location& from_here));
|
| + MOCK_METHOD0(CreateSyncComponents, void());
|
| MOCK_METHOD2(StartFailed, void(StartResult result,
|
| const tracked_objects::Location& from_here));
|
| - MOCK_METHOD0(CreateSyncComponents, void());
|
| + MOCK_METHOD2(FinishStart, void(StartResult result,
|
| + const tracked_objects::Location& from_here));
|
| + MOCK_METHOD0(CleanUpState, void());
|
| MOCK_METHOD2(RecordUnrecoverableError, void(const tracked_objects::Location&,
|
| const std::string&));
|
| MOCK_METHOD1(RecordAssociationTime, void(base::TimeDelta time));
|
|
|