chrome/browser/sync_file_system/mock_remote_file_sync_service.cc - Issue 11421197: Implement SyncFileSystemService::GetFileSyncStatus method

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.cc

Issue 11421197: Implement SyncFileSystemService::GetFileSyncStatus method (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: indent fix Created 8 years ago

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

Jump to:

Index: chrome/browser/sync_file_system/mock_remote_file_sync_service.cc

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

index ff20804807b2f834b7ab814844bf8601ed4054e7..c577d896d545d3eae39c8a5880c3087793ef1750 100644

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

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

@@ -32,6 +32,8 @@ MockRemoteFileSyncService::MockRemoteFileSyncService() {

.WillByDefault(Invoke(this, &self::ProcessRemoteChangeStub));

ON_CALL(*this, GetLocalChangeProcessor())

.WillByDefault(Return(&mock_local_change_processor_));

+ ON_CALL(*this, IsConflicting(_))

+ .WillByDefault(Return(false));

ON_CALL(*this, GetConflictFiles(_, _))

.WillByDefault(Invoke(this, &self::GetConflictFilesStub));

ON_CALL(*this, GetRemoteFileMetadata(_, _))