[SyncFS] Replace callback with token in UploadNewFile

chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.h

 // Copyright 2013 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_SYNC_FILE_SYSTEM_DRIVE_BACKEND_LOCAL_TO_REMOTE_SYNCER_H_
 #define CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_LOCAL_TO_REMOTE_SYNCER_H_
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 66 matching lines @@
   void DidUpdateDatabaseForUploadExistingFile(
       scoped_ptr<SyncTaskToken> token,
       SyncStatusCode status);
   void UpdateRemoteMetadata(const std::string& file_id,
                             const SyncStatusCallback& callback);
   void DidGetRemoteMetadata(const std::string& file_id,
                             const SyncStatusCallback& callback,
                             google_apis::GDataErrorCode error,
                             scoped_ptr<google_apis::FileResource> entry);
 
-  void DidDeleteForUploadNewFile(const SyncStatusCallback& callback,
+  void DidDeleteForUploadNewFile(scoped_ptr<SyncTaskToken> token,
                                  SyncStatusCode status);
   void DidDeleteForCreateFolder(scoped_ptr<SyncTaskToken> token,
                                 SyncStatusCode status);
 
-  void UploadNewFile(const SyncStatusCallback& callback);
-  void DidUploadNewFile(const SyncStatusCallback& callback,
+  void UploadNewFile(scoped_ptr<SyncTaskToken> token);
+  void DidUploadNewFile(scoped_ptr<SyncTaskToken> token,
                         google_apis::GDataErrorCode error,
                         const GURL& upload_location,
                         scoped_ptr<google_apis::FileResource> entry);
 
   void CreateRemoteFolder(scoped_ptr<SyncTaskToken> token);
   void DidCreateRemoteFolder(scoped_ptr<SyncTaskToken> token,
                              const std::string& file_id,
                              SyncStatusCode status);
-  void DidDetachResourceForCreationConflict(const SyncStatusCallback& callback,
+  void DidDetachResourceForCreationConflict(scoped_ptr<SyncTaskToken> token,
                                             google_apis::GDataErrorCode error);
 
   bool IsContextReady();
   drive::DriveServiceInterface* drive_service();
   drive::DriveUploaderInterface* drive_uploader();
   MetadataDatabase* metadata_database();
 
   SyncEngineContext* sync_context_;  // Not owned.
 
   FileChange local_change_;
@@ skipping 12 matching lines @@
 
   base::WeakPtrFactory<LocalToRemoteSyncer> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(LocalToRemoteSyncer);
 };
 
 }  // namespace drive_backend
 }  // namespace sync_file_system
 
 #endif  // CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_LOCAL_TO_REMOTE_SYNCER_H_