Add DriveScheduler::UploadNewFile.

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/json/json_file_value_serializer.h"
 #include "chrome/browser/chromeos/drive/drive.pb.h"
 #include "chrome/browser/chromeos/drive/drive_cache.h"
 #include "chrome/browser/chromeos/drive/drive_file_system_interface.h"
 #include "chrome/browser/chromeos/drive/drive_file_system_util.h"
 #include "chrome/browser/chromeos/drive/drive_scheduler.h"
 #include "chrome/browser/chromeos/drive/file_system/move_operation.h"
 #include "chrome/browser/chromeos/drive/file_system/operation_observer.h"
 #include "chrome/browser/chromeos/drive/resource_entry_conversion.h"
 #include "chrome/browser/google_apis/drive_upload_error.h"
-#include "chrome/browser/google_apis/drive_uploader.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/base/mime_util.h"
 
 using content::BrowserThread;
 using google_apis::ResourceEntry;
 using google_apis::GDataErrorCode;
 
 namespace drive {
 namespace file_system {
 
@@ skipping 41 matching lines @@
 
   const base::FilePath local_file_path;
   const base::FilePath remote_file_path;
   const FileOperationCallback callback;
 };
 
 CopyOperation::CopyOperation(
     DriveScheduler* drive_scheduler,
     DriveFileSystemInterface* drive_file_system,
     DriveResourceMetadata* metadata,
-    google_apis::DriveUploaderInterface* uploader,
     scoped_refptr<base::SequencedTaskRunner> blocking_task_runner,
     OperationObserver* observer)
   : drive_scheduler_(drive_scheduler),
     drive_file_system_(drive_file_system),
     metadata_(metadata),
-    uploader_(uploader),
     blocking_task_runner_(blocking_task_runner),
     observer_(observer),
     move_operation_(new MoveOperation(drive_scheduler,
                                       metadata,
                                       observer)),
     weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 }
 
 CopyOperation::~CopyOperation() {
@@ skipping 256 matching lines @@
 
   if (entry_proto.get() && !entry_proto->file_info().is_directory())
     error = DRIVE_FILE_ERROR_NOT_A_DIRECTORY;
 
   if (error != DRIVE_FILE_OK) {
     params.callback.Run(error);
     return;
   }
   DCHECK(entry_proto.get());
 
-  uploader_->UploadNewFile(entry_proto->resource_id(),
-                           params.remote_file_path,
-                           params.local_file_path,
-                           params.remote_file_path.BaseName().value(),
-                           content_type,
-                           base::Bind(&CopyOperation::OnTransferCompleted,
-                                      weak_ptr_factory_.GetWeakPtr(),
-                                      params.callback));
+  drive_scheduler_->UploadNewFile(
+      entry_proto->resource_id(),
+      params.remote_file_path,
+      params.local_file_path,
+      params.remote_file_path.BaseName().value(),
+      content_type,
+      DriveClientContext(USER_INITIATED),
+      base::Bind(&CopyOperation::OnTransferCompleted,
+                 weak_ptr_factory_.GetWeakPtr(),
+                 params.callback));
 }
 
 void CopyOperation::OnTransferCompleted(
     const FileOperationCallback& callback,
     google_apis::DriveUploadError error,
     const base::FilePath& drive_path,
     const base::FilePath& file_path,
     scoped_ptr<ResourceEntry> resource_entry) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
@@ skipping 59 matching lines @@
       remote_dest_file_path.DirName(),
       resource_id,
       // Drop the document extension, which should not be
       // in the document title.
       remote_dest_file_path.BaseName().RemoveExtension().value(),
       callback);
 }
 
 }  // namespace file_system
 }  // namespace drive