SyncFS: Fix conflict resolver for multiple parents

chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sync_file_system/drive_backend/conflict_resolver.h"
 
 #include "base/callback.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "chrome/browser/drive/drive_api_util.h"
@@ skipping 39 matching lines @@
     if (!trackers.has_active()) {
       NOTREACHED();
       callback.Run(SYNC_STATUS_FAILED);
       return;
     }
 
     DCHECK(trackers.has_active());
     for (TrackerSet::const_iterator itr = trackers.begin();
          itr != trackers.end(); ++itr) {
       const FileTracker& tracker = **itr;
+      if (tracker.active())
+        continue;
 
       FileTracker parent_tracker;
       bool should_success = metadata_database()->FindTrackerByTrackerID(
           tracker.parent_tracker_id(), &parent_tracker);
       if (!should_success) {
         NOTREACHED();
         callback.Run(SYNC_STATUS_FAILED);
         return;
       }
       parents_to_remove_.push_back(parent_tracker.file_id());
@@ skipping 22 matching lines @@
 
 void ConflictResolver::DetachFromNonPrimaryParents(
     const SyncStatusCallback& callback) {
   DCHECK(!parents_to_remove_.empty());
 
   // TODO(tzik): Check if ETag match is available for
   // RemoteResourceFromDirectory.
   std::string parent_folder_id = parents_to_remove_.back();
   parents_to_remove_.pop_back();
   drive_service()->RemoveResourceFromDirectory(
-      target_file_id_, parent_folder_id,
+      parent_folder_id, target_file_id_,
       base::Bind(&ConflictResolver::DidDetachFromParent,
                  weak_ptr_factory_.GetWeakPtr(),
                  callback));
 }
 
 void ConflictResolver::DidDetachFromParent(const SyncStatusCallback& callback,
                                            google_apis::GDataErrorCode error) {
   if (error != google_apis::HTTP_SUCCESS) {
     callback.Run(GDataErrorCodeToSyncStatusCode(error));
     return;
@@ skipping 117 matching lines @@
   set_used_network(true);
   return sync_context_->GetDriveService();
 }
 
 MetadataDatabase* ConflictResolver::metadata_database() {
   return sync_context_->GetMetadataDatabase();
 }
 
 }  // namespace drive_backend
 }  // namespace sync_file_system