chrome/browser/sync_file_system/mock_remote_file_sync_service.h - Issue 185563011: [SyncFS] Change RemoteFileSyncService interface to accept per-app conflict resolution policy

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_file_system/mock_remote_file_sync_service.h

Issue 185563011: [SyncFS] Change RemoteFileSyncService interface to accept per-app conflict resolution policy (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 9 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_file_system/drive_backend_v1/drive_file_sync_service.cc ('k') | chrome/browser/sync_file_system/mock_remote_file_sync_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync_file_system/mock_remote_file_sync_service.h

diff --git a/chrome/browser/sync_file_system/mock_remote_file_sync_service.h b/chrome/browser/sync_file_system/mock_remote_file_sync_service.h

index 1a94938eb0923246de3ea0e93d25beb48e29da70..687c5cab9bccf8a1f6eb4af2d8990c7a6916d6a0 100644

--- a/chrome/browser/sync_file_system/mock_remote_file_sync_service.h

+++ b/chrome/browser/sync_file_system/mock_remote_file_sync_service.h

@@ -53,10 +53,14 @@ class MockRemoteFileSyncService : public RemoteFileSyncService {

MOCK_METHOD1(GetOriginStatusMap,

void(RemoteFileSyncService::OriginStatusMap* status_map));

MOCK_METHOD1(SetSyncEnabled, void(bool enabled));

- MOCK_METHOD1(SetConflictResolutionPolicy,

+ MOCK_METHOD1(SetDefaultConflictResolutionPolicy,

SyncStatusCode(ConflictResolutionPolicy));

- MOCK_CONST_METHOD0(GetConflictResolutionPolicy,

+ MOCK_METHOD2(SetConflictResolutionPolicy,

+ SyncStatusCode(const GURL&, ConflictResolutionPolicy));

+ MOCK_CONST_METHOD0(GetDefaultConflictResolutionPolicy,

ConflictResolutionPolicy());

+ MOCK_CONST_METHOD1(GetConflictResolutionPolicy,

+ ConflictResolutionPolicy(const GURL&));

MOCK_METHOD2(GetRemoteVersions,

void(const fileapi::FileSystemURL&,

const RemoteVersionsCallback&));

@@ -92,9 +96,14 @@ class MockRemoteFileSyncService : public RemoteFileSyncService {

const GURL& origin, UninstallFlag flag,

const SyncStatusCallback& callback);

void ProcessRemoteChangeStub(const SyncFileCallback& callback);

+ SyncStatusCode SetDefaultConflictResolutionPolicyStub(

+ ConflictResolutionPolicy policy);

SyncStatusCode SetConflictResolutionPolicyStub(

+ const GURL& origin,

ConflictResolutionPolicy policy);

- ConflictResolutionPolicy GetConflictResolutionPolicyStub() const;

+ ConflictResolutionPolicy GetDefaultConflictResolutionPolicyStub() const;

+ ConflictResolutionPolicy GetConflictResolutionPolicyStub(

+ const GURL& origin) const;

RemoteServiceState GetCurrentStateStub() const;

// For default implementation.