| Index: chrome/browser/sync/profile_sync_service_mock.h
|
| diff --git a/chrome/browser/sync/profile_sync_service_mock.h b/chrome/browser/sync/profile_sync_service_mock.h
|
| index 52cedb45e6bc7230f588d599a21f307513d4d9bf..808fee061a0ffaa9ce416e037947f07b6be5f121 100644
|
| --- a/chrome/browser/sync/profile_sync_service_mock.h
|
| +++ b/chrome/browser/sync/profile_sync_service_mock.h
|
| @@ -70,6 +70,7 @@ class ProfileSyncServiceMock : public ProfileSyncService {
|
| MOCK_METHOD0(GetJsController, base::WeakPtr<syncer::JsController>());
|
| MOCK_CONST_METHOD0(HasSyncSetupCompleted, bool());
|
|
|
| + MOCK_CONST_METHOD0(EncryptEverythingAllowed, bool());
|
| MOCK_CONST_METHOD0(EncryptEverythingEnabled, bool());
|
| MOCK_METHOD0(EnableEncryptEverything, void());
|
|
|
| @@ -91,8 +92,7 @@ class ProfileSyncServiceMock : public ProfileSyncService {
|
| MOCK_CONST_METHOD0(backend_initialized, bool());
|
| MOCK_CONST_METHOD0(IsStartSuppressed, bool());
|
| MOCK_CONST_METHOD0(waiting_for_auth, bool());
|
| - MOCK_METHOD1(OnActionableError, void(
|
| - const syncer::SyncProtocolError&));
|
| + MOCK_METHOD1(OnActionableError, void(const syncer::SyncProtocolError&));
|
| MOCK_METHOD1(SetSetupInProgress, void(bool));
|
| MOCK_CONST_METHOD1(IsDataTypeControllerRunning, bool(syncer::ModelType));
|
|
|
|
|