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(_, _)) |