Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4302)

Unified Diff: chrome/browser/sync_file_system/mock_remote_file_sync_service.h

Issue 11421197: Implement SyncFileSystemService::GetFileSyncStatus method (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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:
View side-by-side diff with in-line comments
Download patch
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 6bce1053994a6d59a45e722379a6919ab8c86d38..448cd21cb4b34bc0c73220c655a462d8c3371dc7 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
@@ -37,6 +37,7 @@ class MockRemoteFileSyncService : public RemoteFileSyncService {
void(RemoteChangeProcessor* processor,
const fileapi::SyncOperationCallback& callback));
MOCK_METHOD0(GetLocalChangeProcessor, LocalChangeProcessor*());
+ MOCK_METHOD1(IsConflicting, bool(const fileapi::FileSystemURL& url));
MOCK_METHOD2(GetConflictFiles,
void(const GURL& origin,
const fileapi::SyncFileSetCallback& callback));

Powered by Google App Engine
This is Rietveld 408576698