| 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 76977051c2160b94dc49fb0d346ed9d2f0f769cc..7252267db2417a5fdfc60f5b4a3c2e78a422e9df 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_METHOD0(AssociateModels, SyncError());
|
| - MOCK_METHOD0(DisassociateModels, SyncError());
|
| + MOCK_METHOD0(AssociateModels, csync::SyncError());
|
| + MOCK_METHOD0(DisassociateModels, csync::SyncError());
|
| MOCK_METHOD1(SyncModelHasUserCreatedNodes, bool(bool* has_nodes));
|
| MOCK_METHOD0(AbortAssociation, void());
|
| MOCK_METHOD0(CryptoReadyIfNecessary, bool());
|
|
|