drive: Merge ContentUpdatePerformer to EntryUpdatePerformer

chrome/browser/chromeos/drive/sync_client.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_SYNC_CLIENT_H_
 #define CHROME_BROWSER_CHROMEOS_DRIVE_SYNC_CLIENT_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 11 matching lines @@
 namespace drive {
 
 class FileCacheEntry;
 class JobScheduler;
 class ResourceEntry;
 struct ClientContext;
 
 namespace file_system {
 class DownloadOperation;
 class OperationObserver;
-class ContentUpdatePerformer;
 }
 
 namespace internal {
 
 class EntryUpdatePerformer;
 class FileCache;
 class ResourceMetadata;
 
 // The SyncClient is used to synchronize pinned files on Drive and the
 // cache on the local drive.
@@ skipping 38 matching lines @@
     delay_ = delay;
   }
 
   // Starts the sync loop if it's not running.
   void StartSyncLoop();
 
  private:
   // Types of sync tasks.
   enum SyncType {
     FETCH,  // Fetch a file from the Drive server.
-    UPLOAD,  // Upload a file to the Drive server.
-    UPDATE,  // Updates an entry's metadata on the Drive server.
+    UPDATE,  // Updates an entry's metadata or content on the Drive server.
   };
 
   // States of sync tasks.
   enum SyncState {
     PENDING,
     RUNNING,
   };
 
   struct SyncTask {
     SyncTask();
     ~SyncTask();
     SyncState state;
     base::Closure task;
     bool should_run_again;
   };
 
   typedef std::map<std::pair<SyncType, std::string>, SyncTask> SyncTasks;
 
   // Adds a FETCH task.
   void AddFetchTaskInternal(const std::string& local_id,
                             const base::TimeDelta& delay);
 
-  // Adds a UPLOAD task.
-  void AddUploadTaskInternal(const ClientContext& context,
-                             const std::string& local_id,
-                             const base::TimeDelta& delay);
-
   // Adds a UPDATE task.
   void AddUpdateTaskInternal(const ClientContext& context,
                              const std::string& local_id,
                              const base::TimeDelta& delay);
 
   // Adds the given task. If the same task is found, does nothing.
   void AddTask(const SyncTasks::key_type& key,
                const SyncTask& task,
                const base::TimeDelta& delay);
 
   // Called when a task is ready to start.
   void StartTask(const SyncTasks::key_type& key);
 
   // Called when the local IDs of files in the backlog are obtained.
   void OnGetLocalIdsOfBacklog(const std::vector<std::string>* to_fetch,
-                              const std::vector<std::string>* to_upload,
                               const std::vector<std::string>* to_update);
 
   // Adds fetch tasks.
   void AddFetchTasks(const std::vector<std::string>* local_ids);
 
   // Erases the task and returns true if task is completed.
   bool OnTaskComplete(SyncType type, const std::string& local_id);
 
   // Called when the file for |local_id| is fetched.
   // Calls DoSyncLoop() to go back to the sync loop.
@@ skipping 10 matching lines @@
   void OnUpdateComplete(const std::string& local_id, FileError error);
 
   scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_;
   file_system::OperationObserver* operation_observer_;
   ResourceMetadata* metadata_;
   FileCache* cache_;
 
   // Used to fetch pinned files.
   scoped_ptr<file_system::DownloadOperation> download_operation_;
 
-  // Used to upload committed files.
-  scoped_ptr<file_system::ContentUpdatePerformer> content_update_performer_;
-
   // Used to update entry metadata.
   scoped_ptr<EntryUpdatePerformer> entry_update_performer_;
 
   // Sync tasks to be processed.
   SyncTasks tasks_;
 
   // The delay is used for delaying processing tasks in AddTask().
   base::TimeDelta delay_;
 
   // The delay is used for delaying retry of tasks on server errors.
   base::TimeDelta long_delay_;
 
   // 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<SyncClient> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncClient);
 };
 
 }  // namespace internal
 }  // namespace drive
 
 #endif  // CHROME_BROWSER_CHROMEOS_DRIVE_SYNC_CLIENT_H_