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

ui/base/resource/data_pack_unittest.cc

 // 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.
 
+#include "ui/base/resource/data_pack.h"
+
+#include <utility>
+
 #include "base/files/file.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/path_service.h"
 #include "base/strings/string_piece.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/base/resource/data_pack.h"
 #include "ui/base/ui_base_paths.h"
 
 namespace ui {
 
 class DataPackTest
     : public testing::TestWithParam<DataPack::TextEncodingType> {
  public:
   DataPackTest() {}
 };
 
@@ skipping 41 matching lines @@
 
   // Dump contents into the pak file.
   ASSERT_EQ(base::WriteFile(data_path, kSamplePakContents, kSamplePakSize),
             static_cast<int>(kSamplePakSize));
 
   base::File file(data_path, base::File::FLAG_OPEN | base::File::FLAG_READ);
   ASSERT_TRUE(file.IsValid());
 
   // Load the file through the data pack API.
   DataPack pack(SCALE_FACTOR_100P);
-  ASSERT_TRUE(pack.LoadFromFile(file.Pass()));
+  ASSERT_TRUE(pack.LoadFromFile(std::move(file)));
 
   base::StringPiece data;
   ASSERT_TRUE(pack.HasResource(4));
   ASSERT_TRUE(pack.GetStringPiece(4, &data));
   EXPECT_EQ("this is id 4", data);
   ASSERT_TRUE(pack.HasResource(6));
   ASSERT_TRUE(pack.GetStringPiece(6, &data));
   EXPECT_EQ("this is id 6", data);
 
   // Try reading zero-length data blobs, just in case.
@@ skipping 19 matching lines @@
             base::WriteFile(data_path, kPadding, sizeof(kPadding)));
   ASSERT_TRUE(base::AppendToFile(
       data_path, kSamplePakContents, kSamplePakSize));
 
   base::File file(data_path, base::File::FLAG_OPEN | base::File::FLAG_READ);
   ASSERT_TRUE(file.IsValid());
 
   // Load the file through the data pack API.
   DataPack pack(SCALE_FACTOR_100P);
   base::MemoryMappedFile::Region region = {sizeof(kPadding), kSamplePakSize};
-  ASSERT_TRUE(pack.LoadFromFileRegion(file.Pass(), region));
+  ASSERT_TRUE(pack.LoadFromFileRegion(std::move(file), region));
 
   base::StringPiece data;
   ASSERT_TRUE(pack.HasResource(4));
   ASSERT_TRUE(pack.GetStringPiece(4, &data));
   EXPECT_EQ("this is id 4", data);
   ASSERT_TRUE(pack.HasResource(6));
   ASSERT_TRUE(pack.GetStringPiece(6, &data));
   EXPECT_EQ("this is id 6", data);
 
   // Try reading zero-length data blobs, just in case.
@@ skipping 68 matching lines @@
 
   // Dump contents into the pak file.
   ASSERT_EQ(base::WriteFile(data_path, kSamplePakContents, kSamplePakSize),
             static_cast<int>(kSamplePakSize));
 
   base::File file(data_path, base::File::FLAG_OPEN | base::File::FLAG_READ);
   ASSERT_TRUE(file.IsValid());
 
   // Load the file through the data pack API.
   DataPack pack(SCALE_FACTOR_100P);
-  ASSERT_TRUE(pack.LoadFromFile(file.Pass()));
+  ASSERT_TRUE(pack.LoadFromFile(std::move(file)));
 
   base::StringPiece data;
   ASSERT_TRUE(pack.HasResource(10));
   ASSERT_TRUE(pack.GetStringPiece(10, &data));
 
   ASSERT_EQ(base::WriteFile(data_path, kSampleCorruptPakContents,
                             kSampleCorruptPakSize),
             static_cast<int>(kSampleCorruptPakSize));
 
   // Reading asset #10 should now fail as it extends past the end of the file.
   ASSERT_TRUE(pack.HasResource(10));
   ASSERT_FALSE(pack.GetStringPiece(10, &data));
 }
 #endif
 
 }  // namespace ui