| 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 dfacfed306bf2df8d95b093577c5fc398b7a59df..a9b2cc96a9aced746a124b91daceb7edcee23388 100644
|
| --- a/chrome/browser/sync/profile_sync_service_mock.h
|
| +++ b/chrome/browser/sync/profile_sync_service_mock.h
|
| @@ -36,7 +36,7 @@ class ProfileSyncServiceMock : public ProfileSyncService {
|
|
|
| MOCK_METHOD0(DisableForUser, void());
|
| MOCK_METHOD2(OnBackendInitialized,
|
| - void(const csync::WeakHandle<csync::JsBackend>&,
|
| + void(const syncer::WeakHandle<syncer::JsBackend>&,
|
| bool));
|
| MOCK_METHOD0(OnSyncCycleCompleted, void());
|
| MOCK_METHOD0(OnAuthError, void());
|
| @@ -57,16 +57,16 @@ class ProfileSyncServiceMock : public ProfileSyncService {
|
| MOCK_METHOD3(DisableBrokenDatatype, void(syncable::ModelType,
|
| const tracked_objects::Location&,
|
| std::string message));
|
| - MOCK_CONST_METHOD0(GetUserShare, csync::UserShare*());
|
| + MOCK_CONST_METHOD0(GetUserShare, syncer::UserShare*());
|
| MOCK_METHOD3(ActivateDataType,
|
| - void(syncable::ModelType, csync::ModelSafeGroup,
|
| + void(syncable::ModelType, syncer::ModelSafeGroup,
|
| browser_sync::ChangeProcessor*));
|
| MOCK_METHOD1(DeactivateDataType, void(syncable::ModelType));
|
|
|
| MOCK_METHOD0(InitializeBackend, void());
|
| MOCK_METHOD1(AddObserver, void(Observer*));
|
| MOCK_METHOD1(RemoveObserver, void(Observer*));
|
| - MOCK_METHOD0(GetJsController, base::WeakPtr<csync::JsController>());
|
| + MOCK_METHOD0(GetJsController, base::WeakPtr<syncer::JsController>());
|
| MOCK_CONST_METHOD0(HasSyncSetupCompleted, bool());
|
|
|
| MOCK_CONST_METHOD0(EncryptEverythingEnabled, bool());
|
| @@ -77,7 +77,7 @@ class ProfileSyncServiceMock : public ProfileSyncService {
|
| MOCK_CONST_METHOD0(GetPreferredDataTypes, syncable::ModelTypeSet());
|
| MOCK_CONST_METHOD0(GetRegisteredDataTypes, syncable::ModelTypeSet());
|
| MOCK_CONST_METHOD0(GetLastSessionSnapshot,
|
| - csync::sessions::SyncSessionSnapshot());
|
| + syncer::sessions::SyncSessionSnapshot());
|
|
|
| MOCK_METHOD0(QueryDetailedSyncStatus,
|
| browser_sync::SyncBackendHost::Status());
|
| @@ -88,7 +88,7 @@ class ProfileSyncServiceMock : public ProfileSyncService {
|
| MOCK_CONST_METHOD0(sync_initialized, bool());
|
| MOCK_CONST_METHOD0(waiting_for_auth, bool());
|
| MOCK_METHOD1(OnActionableError, void(
|
| - const csync::SyncProtocolError&));
|
| + const syncer::SyncProtocolError&));
|
|
|
| MOCK_METHOD0(IsSyncEnabledAndLoggedIn, bool());
|
| MOCK_METHOD0(IsSyncTokenAvailable, bool());
|
|
|