[SyncFS] Force activate folder tracker on folder creation conflict case

chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.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/local_to_remote_syncer.h"
 
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
@@ skipping 611 matching lines @@
   if (status == SYNC_FILE_ERROR_NOT_FOUND)
     needs_remote_change_listing_ = true;
 
   scoped_ptr<FolderCreator> deleter = folder_creator_.Pass();
   if (status != SYNC_STATUS_OK) {
     callback.Run(status);
     return;
   }
 
   MetadataDatabase::ActivationStatus activation_status =
-      metadata_database()->TryNoSideEffectActivation(
+      metadata_database()->TryActivateTracker(
           remote_parent_folder_tracker_->tracker_id(),
           file_id, callback);
   switch (activation_status) {
     case MetadataDatabase::ACTIVATION_PENDING:
       // |callback| will be invoked by MetadataDatabase later in this case.
       return;
     case MetadataDatabase::ACTIVATION_FAILED_ANOTHER_ACTIVE_TRACKER:
       // The activation failed due to another tracker that has another parent.
       // Detach the folder from the current parent to avoid using this folder as
       // active folder.
       drive_service()->RemoveResourceFromDirectory(
           remote_parent_folder_tracker_->file_id(), file_id,
           base::Bind(&LocalToRemoteSyncer::DidDetachResourceForCreationConflict,
                      weak_ptr_factory_.GetWeakPtr(),
                      callback));
       return;
-    case MetadataDatabase::ACTIVATION_FAILED_SAME_PATH_TRACKER:
-      callback.Run(SYNC_STATUS_FILE_BUSY);
-      return;
   }
 
   NOTREACHED();
   callback.Run(SYNC_STATUS_FAILED);
   return;
 }
 
 void LocalToRemoteSyncer::DidDetachResourceForCreationConflict(
     const SyncStatusCallback& callback,
     google_apis::GDataErrorCode error) {
@@ skipping 21 matching lines @@
   set_used_network(true);
   return sync_context_->GetDriveUploader();
 }
 
 MetadataDatabase* LocalToRemoteSyncer::metadata_database() {
   return sync_context_->GetMetadataDatabase();
 }
 
 }  // namespace drive_backend
 }  // namespace sync_file_system