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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/sync_file_system/drive_file_sync_service.cc

Issue 14851005: SyncFS: Fix LocalSyncOperationResolverTest to cover all test cases (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review fix Created 7 years, 7 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 | « no previous file | chrome/browser/sync_file_system/local_sync_operation_resolver.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync_file_system/drive_file_sync_service.cc
diff --git a/chrome/browser/sync_file_system/drive_file_sync_service.cc b/chrome/browser/sync_file_system/drive_file_sync_service.cc
index 2a4c9855583fcbda2ba216114c4e76fae3415b50..6113efbd3f1adfa4fd9f4b63dd541d40a4440343 100644
--- a/chrome/browser/sync_file_system/drive_file_sync_service.cc
+++ b/chrome/browser/sync_file_system/drive_file_sync_service.cc
@@ -1074,8 +1074,7 @@ void DriveFileSyncService::ApplyLocalChangeInternal(
LocalSyncOperationType operation =
LocalSyncOperationResolver::Resolve(
local_file_change,
- has_remote_change,
- remote_change.change,
+ has_remote_change ? &remote_change.change : NULL,
param->has_drive_metadata ? &drive_metadata : NULL);
DVLOG(1) << "ApplyLocalChange for " << url.DebugString()
« no previous file with comments | « no previous file | chrome/browser/sync_file_system/local_sync_operation_resolver.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698