Convert Pass()→std::move() in //chrome/browser/ui

chrome/browser/sync_file_system/local/syncable_file_system_operation.cc

 // 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.
 
 #include "chrome/browser/sync_file_system/local/syncable_file_system_operation.h"
 
+#include <utility>
+
 #include "base/logging.h"
 #include "base/macros.h"
 #include "chrome/browser/sync_file_system/local/local_file_sync_context.h"
 #include "chrome/browser/sync_file_system/local/sync_file_system_backend.h"
 #include "chrome/browser/sync_file_system/local/syncable_file_operation_runner.h"
 #include "chrome/browser/sync_file_system/syncable_file_system_util.h"
 #include "net/url_request/url_request.h"
 #include "storage/browser/blob/shareable_file_reference.h"
 #include "storage/browser/fileapi/file_system_context.h"
 #include "storage/browser/fileapi/file_system_operation.h"
@@ skipping 66 matching lines @@
   }
   DCHECK(operation_runner_.get());
   target_paths_.push_back(url);
   completion_callback_ = callback;
   scoped_ptr<SyncableFileOperationRunner::Task> task(new QueueableTask(
       weak_factory_.GetWeakPtr(),
       base::Bind(&FileSystemOperation::CreateFile,
                  base::Unretained(impl_.get()),
                  url, exclusive,
                  base::Bind(&self::DidFinish, weak_factory_.GetWeakPtr()))));
-  operation_runner_->PostOperationTask(task.Pass());
+  operation_runner_->PostOperationTask(std::move(task));
 }
 
 void SyncableFileSystemOperation::CreateDirectory(
     const FileSystemURL& url,
     bool exclusive,
     bool recursive,
     const StatusCallback& callback) {
   DCHECK(CalledOnValidThread());
   if (!operation_runner_.get()) {
     callback.Run(base::File::FILE_ERROR_NOT_FOUND);
     return;
   }
   DCHECK(operation_runner_.get());
   target_paths_.push_back(url);
   completion_callback_ = callback;
   scoped_ptr<SyncableFileOperationRunner::Task> task(new QueueableTask(
       weak_factory_.GetWeakPtr(),
       base::Bind(&FileSystemOperation::CreateDirectory,
                  base::Unretained(impl_.get()),
                  url, exclusive, recursive,
                  base::Bind(&self::DidFinish, weak_factory_.GetWeakPtr()))));
-  operation_runner_->PostOperationTask(task.Pass());
+  operation_runner_->PostOperationTask(std::move(task));
 }
 
 void SyncableFileSystemOperation::Copy(
     const FileSystemURL& src_url,
     const FileSystemURL& dest_url,
     CopyOrMoveOption option,
     ErrorBehavior error_behavior,
     const CopyProgressCallback& progress_callback,
     const StatusCallback& callback) {
   DCHECK(CalledOnValidThread());
   if (!operation_runner_.get()) {
     callback.Run(base::File::FILE_ERROR_NOT_FOUND);
     return;
   }
   DCHECK(operation_runner_.get());
   target_paths_.push_back(dest_url);
   completion_callback_ = callback;
   scoped_ptr<SyncableFileOperationRunner::Task> task(new QueueableTask(
       weak_factory_.GetWeakPtr(),
       base::Bind(&FileSystemOperation::Copy, base::Unretained(impl_.get()),
                  src_url, dest_url, option, error_behavior, progress_callback,
                  base::Bind(&self::DidFinish, weak_factory_.GetWeakPtr()))));
-  operation_runner_->PostOperationTask(task.Pass());
+  operation_runner_->PostOperationTask(std::move(task));
 }
 
 void SyncableFileSystemOperation::Move(
     const FileSystemURL& src_url,
     const FileSystemURL& dest_url,
     CopyOrMoveOption option,
     const StatusCallback& callback) {
   DCHECK(CalledOnValidThread());
   if (!operation_runner_.get()) {
     callback.Run(base::File::FILE_ERROR_NOT_FOUND);
     return;
   }
   DCHECK(operation_runner_.get());
   target_paths_.push_back(src_url);
   target_paths_.push_back(dest_url);
   completion_callback_ = callback;
   scoped_ptr<SyncableFileOperationRunner::Task> task(new QueueableTask(
       weak_factory_.GetWeakPtr(),
       base::Bind(&FileSystemOperation::Move,
                  base::Unretained(impl_.get()),
                  src_url, dest_url, option,
                  base::Bind(&self::DidFinish, weak_factory_.GetWeakPtr()))));
-  operation_runner_->PostOperationTask(task.Pass());
+  operation_runner_->PostOperationTask(std::move(task));
 }
 
 void SyncableFileSystemOperation::DirectoryExists(
     const FileSystemURL& url,
     const StatusCallback& callback) {
   DCHECK(CalledOnValidThread());
   impl_->DirectoryExists(url, callback);
 }
 
 void SyncableFileSystemOperation::FileExists(
@@ skipping 31 matching lines @@
   }
   DCHECK(operation_runner_.get());
   target_paths_.push_back(url);
   completion_callback_ = callback;
   scoped_ptr<SyncableFileOperationRunner::Task> task(new QueueableTask(
       weak_factory_.GetWeakPtr(),
       base::Bind(&FileSystemOperation::Remove,
                  base::Unretained(impl_.get()),
                  url, recursive,
                  base::Bind(&self::DidFinish, weak_factory_.GetWeakPtr()))));
-  operation_runner_->PostOperationTask(task.Pass());
+  operation_runner_->PostOperationTask(std::move(task));
 }
 
 void SyncableFileSystemOperation::Write(
     const FileSystemURL& url,
     scoped_ptr<storage::FileWriterDelegate> writer_delegate,
     scoped_ptr<net::URLRequest> blob_request,
     const WriteCallback& callback) {
   DCHECK(CalledOnValidThread());
   if (!operation_runner_.get()) {
     callback.Run(base::File::FILE_ERROR_NOT_FOUND, 0, true);
     return;
   }
   DCHECK(operation_runner_.get());
   target_paths_.push_back(url);
   completion_callback_ = base::Bind(&WriteCallbackAdapter, callback);
   scoped_ptr<SyncableFileOperationRunner::Task> task(new QueueableTask(
       weak_factory_.GetWeakPtr(),
       base::Bind(&FileSystemOperation::Write,
                  base::Unretained(impl_.get()),
                  url,
                  base::Passed(&writer_delegate),
                  base::Passed(&blob_request),
                  base::Bind(&self::DidWrite, weak_factory_.GetWeakPtr(),
                             callback))));
-  operation_runner_->PostOperationTask(task.Pass());
+  operation_runner_->PostOperationTask(std::move(task));
 }
 
 void SyncableFileSystemOperation::Truncate(const FileSystemURL& url,
                                            int64_t length,
                                            const StatusCallback& callback) {
   DCHECK(CalledOnValidThread());
   if (!operation_runner_.get()) {
     callback.Run(base::File::FILE_ERROR_NOT_FOUND);
     return;
   }
   DCHECK(operation_runner_.get());
   target_paths_.push_back(url);
   completion_callback_ = callback;
   scoped_ptr<SyncableFileOperationRunner::Task> task(new QueueableTask(
       weak_factory_.GetWeakPtr(),
       base::Bind(&FileSystemOperation::Truncate,
                  base::Unretained(impl_.get()),
                  url, length,
                  base::Bind(&self::DidFinish, weak_factory_.GetWeakPtr()))));
-  operation_runner_->PostOperationTask(task.Pass());
+  operation_runner_->PostOperationTask(std::move(task));
 }
 
 void SyncableFileSystemOperation::TouchFile(
     const FileSystemURL& url,
     const base::Time& last_access_time,
     const base::Time& last_modified_time,
     const StatusCallback& callback) {
   DCHECK(CalledOnValidThread());
   impl_->TouchFile(url, last_access_time, last_modified_time, callback);
 }
@@ skipping 29 matching lines @@
   }
   DCHECK(operation_runner_.get());
   target_paths_.push_back(dest_url);
   completion_callback_ = callback;
   scoped_ptr<SyncableFileOperationRunner::Task> task(new QueueableTask(
       weak_factory_.GetWeakPtr(),
       base::Bind(&FileSystemOperation::CopyInForeignFile,
                  base::Unretained(impl_.get()),
                  src_local_disk_path, dest_url,
                  base::Bind(&self::DidFinish, weak_factory_.GetWeakPtr()))));
-  operation_runner_->PostOperationTask(task.Pass());
+  operation_runner_->PostOperationTask(std::move(task));
 }
 
 void SyncableFileSystemOperation::RemoveFile(
     const FileSystemURL& url,
     const StatusCallback& callback) {
   DCHECK(CalledOnValidThread());
   impl_->RemoveFile(url, callback);
 }
 
 void SyncableFileSystemOperation::RemoveDirectory(
@@ skipping 37 matching lines @@
   SyncFileSystemBackend* backend =
       SyncFileSystemBackend::GetBackend(file_system_context);
   DCHECK(backend);
   if (!backend->sync_context()) {
     // Syncable FileSystem is opened in a file system context which doesn't
     // support (or is not initialized for) the API.
     // Returning here to leave operation_runner_ as NULL.
     return;
   }
   impl_.reset(storage::FileSystemOperation::Create(
-      url_, file_system_context, operation_context.Pass()));
+      url_, file_system_context, std::move(operation_context)));
   operation_runner_ = backend->sync_context()->operation_runner();
 }
 
 void SyncableFileSystemOperation::DidFinish(base::File::Error status) {
   DCHECK(CalledOnValidThread());
   DCHECK(!completion_callback_.is_null());
   if (operation_runner_.get())
     operation_runner_->OnOperationCompleted(target_paths_);
   completion_callback_.Run(status);
 }
@@ skipping 11 matching lines @@
     operation_runner_->OnOperationCompleted(target_paths_);
   callback.Run(result, bytes, complete);
 }
 
 void SyncableFileSystemOperation::OnCancelled() {
   DCHECK(!completion_callback_.is_null());
   completion_callback_.Run(base::File::FILE_ERROR_ABORT);
 }
 
 }  // namespace sync_file_system