chrome/browser/sync/profile_sync_service_mock.h - Issue 10696087: [Sync] Move ModelType and related classes to 'syncer' namespace

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/sync/profile_sync_service_mock.h

Issue 10696087: [Sync] Move ModelType and related classes to 'syncer' namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: sort headers, update copyrights Created 8 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/sync/profile_sync_service_harness.cc ('k') | chrome/browser/sync/profile_sync_service_password_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 1a0578f34e41480172edd5839d94c3fa2d6b730a..fd6f4549cd68cd9835864f57e3507dd86ef316a6 100644

--- a/chrome/browser/sync/profile_sync_service_mock.h

+++ b/chrome/browser/sync/profile_sync_service_mock.h

@@ -49,19 +49,19 @@ class ProfileSyncServiceMock : public ProfileSyncService {

MOCK_CONST_METHOD0(GetAuthenticatedUsername, string16());

MOCK_METHOD2(OnUserChoseDatatypes,

void(bool sync_everything,

- syncable::ModelTypeSet chosen_types));

+ syncer::ModelTypeSet chosen_types));

MOCK_METHOD2(OnUnrecoverableError,

void(const tracked_objects::Location& location,

const std::string& message));

- MOCK_METHOD3(DisableBrokenDatatype, void(syncable::ModelType,

+ MOCK_METHOD3(DisableBrokenDatatype, void(syncer::ModelType,

const tracked_objects::Location&,

std::string message));

MOCK_CONST_METHOD0(GetUserShare, syncer::UserShare*());

MOCK_METHOD3(ActivateDataType,

- void(syncable::ModelType, syncer::ModelSafeGroup,

+ void(syncer::ModelType, syncer::ModelSafeGroup,

browser_sync::ChangeProcessor*));

- MOCK_METHOD1(DeactivateDataType, void(syncable::ModelType));

+ MOCK_METHOD1(DeactivateDataType, void(syncer::ModelType));

MOCK_METHOD0(InitializeBackend, void());

MOCK_METHOD1(AddObserver, void(Observer*));

@@ -73,9 +73,9 @@ class ProfileSyncServiceMock : public ProfileSyncService {

MOCK_METHOD0(EnableEncryptEverything, void());

MOCK_METHOD1(ChangePreferredDataTypes,

- void(syncable::ModelTypeSet preferred_types));

- MOCK_CONST_METHOD0(GetPreferredDataTypes, syncable::ModelTypeSet());

- MOCK_CONST_METHOD0(GetRegisteredDataTypes, syncable::ModelTypeSet());

+ void(syncer::ModelTypeSet preferred_types));

+ MOCK_CONST_METHOD0(GetPreferredDataTypes, syncer::ModelTypeSet());

+ MOCK_CONST_METHOD0(GetRegisteredDataTypes, syncer::ModelTypeSet());

MOCK_CONST_METHOD0(GetLastSessionSnapshot,

syncer::sessions::SyncSessionSnapshot());