Use CopyResourceOnServer to upload JSON GDoc file on Drive API v2.

chrome/browser/chromeos/drive/file_system/copy_operation.cc

 // Copyright (c) 2012 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/chromeos/drive/file_system/copy_operation.h"
 
 #include <string>
 
 #include "base/file_util.h"
 #include "base/task_runner_util.h"
@@ skipping 109 matching lines @@
 
   return FILE_ERROR_OK;
 }
 
 // Gets the file size of the |local_path|, and the ResourceEntry for the parent
 // of |remote_path| to prepare the necessary information for transfer.
 FileError PrepareTransferFileFromLocalToRemote(
     internal::ResourceMetadata* metadata,
     const base::FilePath& local_src_path,
     const base::FilePath& remote_dest_path,
-    std::string* gdoc_resource_id) {
+    std::string* gdoc_resource_id,
+    std::string* parent_resource_id) {
   ResourceEntry parent_entry;
   FileError error = metadata->GetResourceEntryByPath(
       remote_dest_path.DirName(), &parent_entry);
   if (error != FILE_ERROR_OK)
     return error;
 
   // The destination's parent must be a directory.
   if (!parent_entry.file_info().is_directory())
     return FILE_ERROR_NOT_A_DIRECTORY;
 
   // Try to parse GDoc File and extract the resource id, if necessary.
   // Failing isn't problem. It'd be handled as a regular file, then.
-  if (util::HasGDocFileExtension(local_src_path))
+  if (util::HasGDocFileExtension(local_src_path)) {
     *gdoc_resource_id = util::ReadResourceIdFromGDocFile(local_src_path);
+    *parent_resource_id = parent_entry.resource_id();
+  }
 
   return FILE_ERROR_OK;
 }
 
 }  // namespace
 
 CopyOperation::CopyOperation(base::SequencedTaskRunner* blocking_task_runner,
                              OperationObserver* observer,
                              JobScheduler* scheduler,
                              internal::ResourceMetadata* metadata,
@@ skipping 122 matching lines @@
 }
 
 void CopyOperation::TransferFileFromLocalToRemote(
     const base::FilePath& local_src_path,
     const base::FilePath& remote_dest_path,
     const FileOperationCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
   std::string* gdoc_resource_id = new std::string;
+  std::string* parent_resource_id = new std::string;
   base::PostTaskAndReplyWithResult(
       blocking_task_runner_.get(),
       FROM_HERE,
       base::Bind(
           &PrepareTransferFileFromLocalToRemote,
-          metadata_, local_src_path, remote_dest_path, gdoc_resource_id),
+          metadata_, local_src_path, remote_dest_path,
+          gdoc_resource_id, parent_resource_id),
       base::Bind(
           &CopyOperation::TransferFileFromLocalToRemoteAfterPrepare,
           weak_ptr_factory_.GetWeakPtr(),
           local_src_path, remote_dest_path, callback,
-          base::Owned(gdoc_resource_id)));
+          base::Owned(gdoc_resource_id), base::Owned(parent_resource_id)));
 }
 
 void CopyOperation::TransferFileFromLocalToRemoteAfterPrepare(
     const base::FilePath& local_src_path,
     const base::FilePath& remote_dest_path,
     const FileOperationCallback& callback,
     std::string* gdoc_resource_id,
+    std::string* parent_resource_id,
     FileError error) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
   if (error != FILE_ERROR_OK) {
     callback.Run(error);
     return;
   }
 
   // For regular files, schedule the transfer.
   if (gdoc_resource_id->empty()) {
     ScheduleTransferRegularFile(local_src_path, remote_dest_path, callback);
     return;
   }
 
   // This is uploading a JSON file representing a hosted document.
   // Copy the document on the Drive server.
 
   // GDoc file may contain a resource ID in the old format.
   const std::string canonicalized_resource_id =
       drive_service_->CanonicalizeResourceId(*gdoc_resource_id);
 
-  // TODO(hidehiko): Use CopyResource for Drive API v2.
+  // If Drive API v2 is enabled, we can copy resources on server side.
+  if (util::IsDriveV2ApiEnabled()) {
+    CopyResourceOnServer(
+        *gdoc_resource_id, *parent_resource_id,
+        // Drop the document extension, which should not be in the title.
+        // TODO(yoshiki): Remove this code with crbug.com/223304.
+        remote_dest_path.BaseName().RemoveExtension().AsUTF8Unsafe(),
+        callback);
+    return;
+  }
 
   CopyHostedDocument(
       canonicalized_resource_id,
       // Drop the document extension, which should not be
       // in the document title.
       // TODO(yoshiki): Remove this code with crbug.com/223304.
       remote_dest_path.RemoveExtension(),
       callback);
 }
 
@@ skipping 217 matching lines @@
   }
 
   DCHECK_EQ(util::GetDriveMyDriveRootPath().value(),
             file_path->DirName().value()) << file_path->value();
 
   move_operation_->Move(*file_path, dest_path, callback);
 }
 
 }  // namespace file_system
 }  // namespace drive