drive: Use UploadNewFile from EntryUpdatePerformer

chrome/browser/chromeos/drive/job_scheduler_unittest.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/job_scheduler.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/file_util.h"
@@ skipping 953 matching lines @@
   google_apis::GDataErrorCode upload_error =
       google_apis::GDATA_OTHER_ERROR;
   scoped_ptr<google_apis::ResourceEntry> entry;
 
   scheduler_->UploadNewFile(
       fake_drive_service_->GetRootResourceId(),
       base::FilePath::FromUTF8Unsafe("drive/new_file.txt"),
       path,
       "dummy title",
       "plain/plain",
+      DriveUploader::UploadNewFileOptions(),
       ClientContext(BACKGROUND),
       google_apis::test_util::CreateCopyResultCallback(&upload_error, &entry));
   base::RunLoop().RunUntilIdle();
 
   std::vector<int64> upload_progress;
   logger.GetProgressInfo(TYPE_UPLOAD_NEW_FILE, &upload_progress);
   ASSERT_TRUE(!upload_progress.empty());
   EXPECT_TRUE(base::STLIsSorted(upload_progress));
   EXPECT_GE(upload_progress.front(), 0);
   EXPECT_LE(upload_progress.back(), 13);
@@ skipping 12 matching lines @@
 
   // Start the first job and record its job ID.
   google_apis::GDataErrorCode error1 = google_apis::GDATA_OTHER_ERROR;
   scoped_ptr<google_apis::ResourceEntry> entry;
   scheduler_->UploadNewFile(
       fake_drive_service_->GetRootResourceId(),
       base::FilePath::FromUTF8Unsafe("dummy/path"),
       upload_path,
       "dummy title 1",
       "text/plain",
+      DriveUploader::UploadNewFileOptions(),
       ClientContext(BACKGROUND),
       google_apis::test_util::CreateCopyResultCallback(&error1, &entry));
 
   const std::vector<JobInfo>& jobs = scheduler_->GetJobInfoList();
   ASSERT_EQ(1u, jobs.size());
   ASSERT_EQ(STATE_NONE, jobs[0].state);  // Not started yet.
   JobID first_job_id = jobs[0].job_id;
 
   // Start the second job.
   google_apis::GDataErrorCode error2 = google_apis::GDATA_OTHER_ERROR;
   scheduler_->UploadNewFile(
       fake_drive_service_->GetRootResourceId(),
       base::FilePath::FromUTF8Unsafe("dummy/path"),
       upload_path,
       "dummy title 2",
       "text/plain",
+      DriveUploader::UploadNewFileOptions(),
       ClientContext(BACKGROUND),
       google_apis::test_util::CreateCopyResultCallback(&error2, &entry));
 
   // Cancel the first one.
   scheduler_->CancelJob(first_job_id);
 
   // Only the first job should be cancelled.
   ConnectToWifi();
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(google_apis::GDATA_CANCELLED, error1);
@@ skipping 12 matching lines @@
   // Run as a cancelable task.
   fake_drive_service_->set_upload_new_file_cancelable(true);
   google_apis::GDataErrorCode error1 = google_apis::GDATA_OTHER_ERROR;
   scoped_ptr<google_apis::ResourceEntry> entry;
   scheduler_->UploadNewFile(
       fake_drive_service_->GetRootResourceId(),
       base::FilePath::FromUTF8Unsafe("dummy/path"),
       upload_path,
       "dummy title 1",
       "text/plain",
+      DriveUploader::UploadNewFileOptions(),
       ClientContext(USER_INITIATED),
       google_apis::test_util::CreateCopyResultCallback(&error1, &entry));
 
   const std::vector<JobInfo>& jobs = scheduler_->GetJobInfoList();
   ASSERT_EQ(1u, jobs.size());
   ASSERT_EQ(STATE_RUNNING, jobs[0].state);  // It's running.
   JobID first_job_id = jobs[0].job_id;
 
   // Start the second job normally.
   fake_drive_service_->set_upload_new_file_cancelable(false);
   google_apis::GDataErrorCode error2 = google_apis::GDATA_OTHER_ERROR;
   scheduler_->UploadNewFile(
       fake_drive_service_->GetRootResourceId(),
       base::FilePath::FromUTF8Unsafe("dummy/path"),
       upload_path,
       "dummy title 2",
       "text/plain",
+      DriveUploader::UploadNewFileOptions(),
       ClientContext(USER_INITIATED),
       google_apis::test_util::CreateCopyResultCallback(&error2, &entry));
 
   // Cancel the first one.
   scheduler_->CancelJob(first_job_id);
 
   // Only the first job should be cancelled.
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(google_apis::GDATA_CANCELLED, error1);
   EXPECT_EQ(google_apis::HTTP_SUCCESS, error2);
   EXPECT_TRUE(scheduler_->GetJobInfoList().empty());
 }
 
 }  // namespace drive