Rewrite Pass() to std::move() in base/

Behold the power of this fully armed and operational clang refactoring tool...

BUG=557422

Review URL: https://codereview.chromium.org/1523853003

Cr-Commit-Position: refs/heads/master@{#365154}

8 files changed, 42 insertions, 30 deletions

diff --git a/base/files/file.cc b/base/files/file.cc
index 036d43b..d62767a 100644
--- a/base/files/file.cc
+++ b/base/files/file.cc
@@ -68,7 +68,7 @@ File File::CreateForAsyncHandle(PlatformFile platform_file) {
   // It would be nice if we could validate that |platform_file| was opened with
   // FILE_FLAG_OVERLAPPED on Windows but this doesn't appear to be possible.
   file.async_ = true;
-  return file.Pass();
+  return file;
 }
 
 File& File::operator=(File&& other) {
diff --git a/base/files/file_posix.cc b/base/files/file_posix.cc
index 7278db7..92721f9 100644
--- a/base/files/file_posix.cc
+++ b/base/files/file_posix.cc
@@ -381,7 +381,7 @@ File File::Duplicate() {
   File other(other_fd);
   if (async())
     other.async_ = true;
-  return other.Pass();
+  return other;
 }
 
 // Static.
diff --git a/base/files/file_proxy.cc b/base/files/file_proxy.cc
index f995735..3761e99 100644
--- a/base/files/file_proxy.cc
+++ b/base/files/file_proxy.cc
@@ -4,6 +4,8 @@
 
 #include "base/files/file_proxy.h"
 
+#include <utility>
+
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/files/file.h"
@@ -24,7 +26,7 @@ namespace base {
 class FileHelper {
  public:
    FileHelper(FileProxy* proxy, File file)
-      : file_(file.Pass()),
+      : file_(std::move(file)),
         error_(File::FILE_ERROR_FAILED),
         task_runner_(proxy->task_runner()),
         proxy_(AsWeakPtr(proxy)) {
@@ -32,7 +34,7 @@ class FileHelper {
 
    void PassFile() {
      if (proxy_)
-       proxy_->SetFile(file_.Pass());
+       proxy_->SetFile(std::move(file_));
      else if (file_.IsValid())
        task_runner_->PostTask(FROM_HERE, Bind(&FileDeleter, Passed(&file_)));
    }
@@ -52,7 +54,7 @@ namespace {
 class GenericFileHelper : public FileHelper {
  public:
   GenericFileHelper(FileProxy* proxy, File file)
-      : FileHelper(proxy, file.Pass()) {
+      : FileHelper(proxy, std::move(file)) {
   }
 
   void Close() {
@@ -88,7 +90,7 @@ class GenericFileHelper : public FileHelper {
 class CreateOrOpenHelper : public FileHelper {
  public:
   CreateOrOpenHelper(FileProxy* proxy, File file)
-      : FileHelper(proxy, file.Pass()) {
+      : FileHelper(proxy, std::move(file)) {
   }
 
   void RunWork(const FilePath& file_path, int file_flags) {
@@ -109,7 +111,7 @@ class CreateOrOpenHelper : public FileHelper {
 class CreateTemporaryHelper : public FileHelper {
  public:
   CreateTemporaryHelper(FileProxy* proxy, File file)
-      : FileHelper(proxy, file.Pass()) {
+      : FileHelper(proxy, std::move(file)) {
   }
 
   void RunWork(uint32 additional_file_flags) {
@@ -151,7 +153,7 @@ class CreateTemporaryHelper : public FileHelper {
 class GetInfoHelper : public FileHelper {
  public:
   GetInfoHelper(FileProxy* proxy, File file)
-      : FileHelper(proxy, file.Pass()) {
+      : FileHelper(proxy, std::move(file)) {
   }
 
   void RunWork() {
@@ -173,7 +175,7 @@ class GetInfoHelper : public FileHelper {
 class ReadHelper : public FileHelper {
  public:
   ReadHelper(FileProxy* proxy, File file, int bytes_to_read)
-      : FileHelper(proxy, file.Pass()),
+      : FileHelper(proxy, std::move(file)),
         buffer_(new char[bytes_to_read]),
         bytes_to_read_(bytes_to_read),
         bytes_read_(0) {
@@ -202,7 +204,7 @@ class WriteHelper : public FileHelper {
   WriteHelper(FileProxy* proxy,
               File file,
               const char* buffer, int bytes_to_write)
-      : FileHelper(proxy, file.Pass()),
+      : FileHelper(proxy, std::move(file)),
         buffer_(new char[bytes_to_write]),
         bytes_to_write_(bytes_to_write),
         bytes_written_(0) {
@@ -266,11 +268,11 @@ bool FileProxy::IsValid() const {
 
 void FileProxy::SetFile(File file) {
   DCHECK(!file_.IsValid());
-  file_ = file.Pass();
+  file_ = std::move(file);
 }
 
 File FileProxy::TakeFile() {
-  return file_.Pass();
+  return std::move(file_);
 }
 
 PlatformFile FileProxy::GetPlatformFile() const {
@@ -279,7 +281,7 @@ PlatformFile FileProxy::GetPlatformFile() const {
 
 bool FileProxy::Close(const StatusCallback& callback) {
   DCHECK(file_.IsValid());
-  GenericFileHelper* helper = new GenericFileHelper(this, file_.Pass());
+  GenericFileHelper* helper = new GenericFileHelper(this, std::move(file_));
   return task_runner_->PostTaskAndReply(
       FROM_HERE,
       Bind(&GenericFileHelper::Close, Unretained(helper)),
@@ -288,7 +290,7 @@ bool FileProxy::Close(const StatusCallback& callback) {
 
 bool FileProxy::GetInfo(const GetFileInfoCallback& callback) {
   DCHECK(file_.IsValid());
-  GetInfoHelper* helper = new GetInfoHelper(this, file_.Pass());
+  GetInfoHelper* helper = new GetInfoHelper(this, std::move(file_));
   return task_runner_->PostTaskAndReply(
       FROM_HERE,
       Bind(&GetInfoHelper::RunWork, Unretained(helper)),
@@ -302,7 +304,7 @@ bool FileProxy::Read(int64 offset,
   if (bytes_to_read < 0)
     return false;
 
-  ReadHelper* helper = new ReadHelper(this, file_.Pass(), bytes_to_read);
+  ReadHelper* helper = new ReadHelper(this, std::move(file_), bytes_to_read);
   return task_runner_->PostTaskAndReply(
       FROM_HERE,
       Bind(&ReadHelper::RunWork, Unretained(helper), offset),
@@ -318,7 +320,7 @@ bool FileProxy::Write(int64 offset,
     return false;
 
   WriteHelper* helper =
-      new WriteHelper(this, file_.Pass(), buffer, bytes_to_write);
+      new WriteHelper(this, std::move(file_), buffer, bytes_to_write);
   return task_runner_->PostTaskAndReply(
       FROM_HERE,
       Bind(&WriteHelper::RunWork, Unretained(helper), offset),
@@ -329,7 +331,7 @@ bool FileProxy::SetTimes(Time last_access_time,
                          Time last_modified_time,
                          const StatusCallback& callback) {
   DCHECK(file_.IsValid());
-  GenericFileHelper* helper = new GenericFileHelper(this, file_.Pass());
+  GenericFileHelper* helper = new GenericFileHelper(this, std::move(file_));
   return task_runner_->PostTaskAndReply(
       FROM_HERE,
       Bind(&GenericFileHelper::SetTimes, Unretained(helper), last_access_time,
@@ -339,7 +341,7 @@ bool FileProxy::SetTimes(Time last_access_time,
 
 bool FileProxy::SetLength(int64 length, const StatusCallback& callback) {
   DCHECK(file_.IsValid());
-  GenericFileHelper* helper = new GenericFileHelper(this, file_.Pass());
+  GenericFileHelper* helper = new GenericFileHelper(this, std::move(file_));
   return task_runner_->PostTaskAndReply(
       FROM_HERE,
       Bind(&GenericFileHelper::SetLength, Unretained(helper), length),
@@ -348,7 +350,7 @@ bool FileProxy::SetLength(int64 length, const StatusCallback& callback) {
 
 bool FileProxy::Flush(const StatusCallback& callback) {
   DCHECK(file_.IsValid());
-  GenericFileHelper* helper = new GenericFileHelper(this, file_.Pass());
+  GenericFileHelper* helper = new GenericFileHelper(this, std::move(file_));
   return task_runner_->PostTaskAndReply(
       FROM_HERE,
       Bind(&GenericFileHelper::Flush, Unretained(helper)),
diff --git a/base/files/file_proxy_unittest.cc b/base/files/file_proxy_unittest.cc
index ab3e9ae..72c430e 100644
--- a/base/files/file_proxy_unittest.cc
+++ b/base/files/file_proxy_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "base/files/file_proxy.h"
 
+#include <utility>
+
 #include "base/bind.h"
 #include "base/files/file.h"
 #include "base/files/file_util.h"
@@ -208,7 +210,7 @@ TEST_F(FileProxyTest, SetAndTake) {
   ASSERT_TRUE(file.IsValid());
   FileProxy proxy(file_task_runner());
   EXPECT_FALSE(proxy.IsValid());
-  proxy.SetFile(file.Pass());
+  proxy.SetFile(std::move(file));
   EXPECT_TRUE(proxy.IsValid());
   EXPECT_FALSE(file.IsValid());
 
diff --git a/base/files/file_unittest.cc b/base/files/file_unittest.cc
index 67dbbfd..909bacb 100644
--- a/base/files/file_unittest.cc
+++ b/base/files/file_unittest.cc
@@ -3,6 +3,9 @@
 // found in the LICENSE file.
 
 #include "base/files/file.h"
+
+#include <utility>
+
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/time/time.h"
@@ -240,7 +243,7 @@ TEST(FileTest, Append) {
   ASSERT_TRUE(file2.IsValid());
 
   // Test passing the file around.
-  file = file2.Pass();
+  file = std::move(file2);
   EXPECT_FALSE(file2.IsValid());
   ASSERT_TRUE(file.IsValid());
 
diff --git a/base/files/file_util_unittest.cc b/base/files/file_util_unittest.cc
index 748301d..aa55473 100644
--- a/base/files/file_util_unittest.cc
+++ b/base/files/file_util_unittest.cc
@@ -21,6 +21,7 @@
 #include <algorithm>
 #include <fstream>
 #include <set>
+#include <utility>
 #include <vector>
 
 #include "base/base_paths.h"
@@ -1704,14 +1705,14 @@ TEST_F(FileUtilTest, CreateAndOpenTemporaryFileTest) {
 
 TEST_F(FileUtilTest, FileToFILE) {
   File file;
-  FILE* stream = FileToFILE(file.Pass(), "w");
+  FILE* stream = FileToFILE(std::move(file), "w");
   EXPECT_FALSE(stream);
 
   FilePath file_name = temp_dir_.path().Append(FPL("The file.txt"));
   file = File(file_name, File::FLAG_CREATE | File::FLAG_WRITE);
   EXPECT_TRUE(file.IsValid());
 
-  stream = FileToFILE(file.Pass(), "w");
+  stream = FileToFILE(std::move(file), "w");
   EXPECT_TRUE(stream);
   EXPECT_FALSE(file.IsValid());
   EXPECT_TRUE(CloseFile(stream));
diff --git a/base/files/memory_mapped_file.cc b/base/files/memory_mapped_file.cc
index 6c3f402..45569e3 100644
--- a/base/files/memory_mapped_file.cc
+++ b/base/files/memory_mapped_file.cc
@@ -4,6 +4,8 @@
 
 #include "base/files/memory_mapped_file.h"
 
+#include <utility>
+
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/sys_info.h"
@@ -47,7 +49,7 @@ bool MemoryMappedFile::Initialize(const FilePath& file_name) {
 }
 
 bool MemoryMappedFile::Initialize(File file) {
-  return Initialize(file.Pass(), Region::kWholeFile);
+  return Initialize(std::move(file), Region::kWholeFile);
 }
 
 bool MemoryMappedFile::Initialize(File file, const Region& region) {
@@ -59,7 +61,7 @@ bool MemoryMappedFile::Initialize(File file, const Region& region) {
     DCHECK_GT(region.size, 0);
   }
 
-  file_ = file.Pass();
+  file_ = std::move(file);
 
   if (!MapFileRegionToMemory(region)) {
     CloseHandles();
diff --git a/base/files/memory_mapped_file_unittest.cc b/base/files/memory_mapped_file_unittest.cc
index c865e27..5c48b48 100644
--- a/base/files/memory_mapped_file_unittest.cc
+++ b/base/files/memory_mapped_file_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "base/files/memory_mapped_file.h"
 
+#include <utility>
+
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -93,7 +95,7 @@ TEST_F(MemoryMappedFileTest, MapWholeFileUsingRegion) {
   MemoryMappedFile map;
 
   File file(temp_file_path(), File::FLAG_OPEN | File::FLAG_READ);
-  map.Initialize(file.Pass(), MemoryMappedFile::Region::kWholeFile);
+  map.Initialize(std::move(file), MemoryMappedFile::Region::kWholeFile);
   ASSERT_EQ(kFileSize, map.length());
   ASSERT_TRUE(map.data() != NULL);
   EXPECT_TRUE(map.IsValid());
@@ -108,7 +110,7 @@ TEST_F(MemoryMappedFileTest, MapPartialRegionAtBeginning) {
 
   File file(temp_file_path(), File::FLAG_OPEN | File::FLAG_READ);
   MemoryMappedFile::Region region = {0, kPartialSize};
-  map.Initialize(file.Pass(), region);
+  map.Initialize(std::move(file), region);
   ASSERT_EQ(kPartialSize, map.length());
   ASSERT_TRUE(map.data() != NULL);
   EXPECT_TRUE(map.IsValid());
@@ -124,7 +126,7 @@ TEST_F(MemoryMappedFileTest, MapPartialRegionAtEnd) {
 
   File file(temp_file_path(), File::FLAG_OPEN | File::FLAG_READ);
   MemoryMappedFile::Region region = {kOffset, kPartialSize};
-  map.Initialize(file.Pass(), region);
+  map.Initialize(std::move(file), region);
   ASSERT_EQ(kPartialSize, map.length());
   ASSERT_TRUE(map.data() != NULL);
   EXPECT_TRUE(map.IsValid());
@@ -141,7 +143,7 @@ TEST_F(MemoryMappedFileTest, MapSmallPartialRegionInTheMiddle) {
 
   File file(temp_file_path(), File::FLAG_OPEN | File::FLAG_READ);
   MemoryMappedFile::Region region = {kOffset, kPartialSize};
-  map.Initialize(file.Pass(), region);
+  map.Initialize(std::move(file), region);
   ASSERT_EQ(kPartialSize, map.length());
   ASSERT_TRUE(map.data() != NULL);
   EXPECT_TRUE(map.IsValid());
@@ -158,7 +160,7 @@ TEST_F(MemoryMappedFileTest, MapLargePartialRegionInTheMiddle) {
 
   File file(temp_file_path(), File::FLAG_OPEN | File::FLAG_READ);
   MemoryMappedFile::Region region = {kOffset, kPartialSize};
-  map.Initialize(file.Pass(), region);
+  map.Initialize(std::move(file), region);
   ASSERT_EQ(kPartialSize, map.length());
   ASSERT_TRUE(map.data() != NULL);
   EXPECT_TRUE(map.IsValid());