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

Unified Diff: chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc

Issue 100883004: ConflictResolver: fix reversed should_success check (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc
diff --git a/chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc b/chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc
index 29df92525d0c9581dada7c727acbbc25f873a030..e7e49658d0b880bc688fdc0d3d969bf9a0cb0807 100644
--- a/chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc
+++ b/chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc
@@ -61,7 +61,7 @@ void ConflictResolver::Run(const SyncStatusCallback& callback) {
FileTracker parent_tracker;
bool should_success = metadata_database()->FindTrackerByTrackerID(
tracker.parent_tracker_id(), &parent_tracker);
- if (should_success) {
+ if (!should_success) {
NOTREACHED();
callback.Run(SYNC_STATUS_FAILED);
return;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698