| Index: chrome/browser/sync/glue/model_associator_mock.h
|
| diff --git a/chrome/browser/sync/glue/model_associator_mock.h b/chrome/browser/sync/glue/model_associator_mock.h
|
| index 620823352ed070a45910472726f743c87b41cd61..696ff25cc7567418be79ef376f430403ebced3c2 100644
|
| --- a/chrome/browser/sync/glue/model_associator_mock.h
|
| +++ b/chrome/browser/sync/glue/model_associator_mock.h
|
| @@ -22,8 +22,8 @@ class ModelAssociatorMock : public AssociatorInterface {
|
| ModelAssociatorMock();
|
| virtual ~ModelAssociatorMock();
|
|
|
| - MOCK_METHOD1(AssociateModels, bool(SyncError* error));
|
| - MOCK_METHOD1(DisassociateModels, bool(SyncError* error));
|
| + MOCK_METHOD0(AssociateModels, SyncError());
|
| + MOCK_METHOD0(DisassociateModels, SyncError());
|
| MOCK_METHOD1(SyncModelHasUserCreatedNodes, bool(bool* has_nodes));
|
| MOCK_METHOD0(AbortAssociation, void());
|
| MOCK_METHOD0(CryptoReadyIfNecessary, bool());
|
|
|