drive: Merge ContentUpdatePerformer to EntryUpdatePerformer

chrome/browser/chromeos/drive/job_scheduler.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_DRIVE_JOB_SCHEDULER_H_
 #define CHROME_BROWSER_CHROMEOS_DRIVE_JOB_SCHEDULER_H_
 
 #include <vector>
 
 #include "base/id_map.h"
@@ skipping 166 matching lines @@
                      const std::string& content_type,
                      const ClientContext& context,
                      const google_apis::GetResourceEntryCallback& callback);
 
   // Adds an UploadExistingFile operation to the queue.
   void UploadExistingFile(
       const std::string& resource_id,
       const base::FilePath& drive_file_path,
       const base::FilePath& local_file_path,
       const std::string& content_type,
-      const std::string& etag,
+      const drive::DriveUploader::UploadExistingFileOptions& options,
       const ClientContext& context,
       const google_apis::GetResourceEntryCallback& callback);
 
   // Adds a CreateFile operation to the queue.
   void CreateFile(const std::string& parent_resource_id,
                   const base::FilePath& drive_file_path,
                   const std::string& title,
                   const std::string& content_type,
                   const ClientContext& context,
                   const google_apis::GetResourceEntryCallback& callback);
@@ skipping 193 matching lines @@
 
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
   base::WeakPtrFactory<JobScheduler> weak_ptr_factory_;
   DISALLOW_COPY_AND_ASSIGN(JobScheduler);
 };
 
 }  // namespace drive
 
 #endif  // CHROME_BROWSER_CHROMEOS_DRIVE_JOB_SCHEDULER_H_