Provide std::move() in compat instead of using crashpad::move()

minidump/minidump_module_writer_test.cc

 // Copyright 2014 The Crashpad Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
 #include "minidump/minidump_module_writer.h"
 
 #include <windows.h>
 #include <dbghelp.h>
 #include <stdint.h>
 #include <string.h>
 #include <sys/types.h>
 
+#include <utility>
+
 #include "base/format_macros.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "gtest/gtest.h"
 #include "minidump/minidump_extensions.h"
 #include "minidump/minidump_file_writer.h"
 #include "minidump/test/minidump_file_writer_test_util.h"
 #include "minidump/test/minidump_string_writer_test_util.h"
 #include "minidump/test/minidump_writable_test_util.h"
 #include "snapshot/test/test_module_snapshot.h"
 #include "test/gtest_death_check.h"
 #include "util/file/string_file.h"
 #include "util/misc/implicit_cast.h"
-#include "util/stdlib/move.h"
 #include "util/misc/uuid.h"
 #include "util/stdlib/pointer_container.h"
 
 namespace crashpad {
 namespace test {
 namespace {
 
 void GetModuleListStream(const std::string& file_contents,
                          const MINIDUMP_MODULE_LIST** module_list) {
   const size_t kDirectoryOffset = sizeof(MINIDUMP_HEADER);
@@ skipping 15 matching lines @@
 
   *module_list = MinidumpWritableAtLocationDescriptor<MINIDUMP_MODULE_LIST>(
       file_contents, directory[0].Location);
   ASSERT_TRUE(module_list);
 }
 
 TEST(MinidumpModuleWriter, EmptyModuleList) {
   MinidumpFileWriter minidump_file_writer;
   auto module_list_writer = make_scoped_ptr(new MinidumpModuleListWriter());
 
-  minidump_file_writer.AddStream(crashpad::move(module_list_writer));
+  minidump_file_writer.AddStream(std::move(module_list_writer));
 
   StringFile string_file;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file));
 
   ASSERT_EQ(sizeof(MINIDUMP_HEADER) + sizeof(MINIDUMP_DIRECTORY) +
                 sizeof(MINIDUMP_MODULE_LIST),
             string_file.string().size());
 
   const MINIDUMP_MODULE_LIST* module_list = nullptr;
   ASSERT_NO_FATAL_FAILURE(
@@ skipping 187 matching lines @@
 
 TEST(MinidumpModuleWriter, EmptyModule) {
   MinidumpFileWriter minidump_file_writer;
   auto module_list_writer = make_scoped_ptr(new MinidumpModuleListWriter());
 
   const char kModuleName[] = "test_executable";
 
   auto module_writer = make_scoped_ptr(new MinidumpModuleWriter());
   module_writer->SetName(kModuleName);
 
-  module_list_writer->AddModule(crashpad::move(module_writer));
-  minidump_file_writer.AddStream(crashpad::move(module_list_writer));
+  module_list_writer->AddModule(std::move(module_writer));
+  minidump_file_writer.AddStream(std::move(module_list_writer));
 
   StringFile string_file;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file));
 
   ASSERT_GT(string_file.string().size(),
             sizeof(MINIDUMP_HEADER) + sizeof(MINIDUMP_DIRECTORY) +
                 sizeof(MINIDUMP_MODULE_LIST) + 1 * sizeof(MINIDUMP_MODULE));
 
   const MINIDUMP_MODULE_LIST* module_list = nullptr;
   ASSERT_NO_FATAL_FAILURE(
@@ skipping 61 matching lines @@
                                    kProductVersionLS >> 16,
                                    kProductVersionLS & 0xffff);
   module_writer->SetFileFlagsAndMask(kFileFlags, kFileFlagsMask);
   module_writer->SetFileOS(kFileOS);
   module_writer->SetFileTypeAndSubtype(kFileType, kFileSubtype);
 
   auto codeview_pdb70_writer =
       make_scoped_ptr(new MinidumpModuleCodeViewRecordPDB70Writer());
   codeview_pdb70_writer->SetPDBName(kPDBName);
   codeview_pdb70_writer->SetUUIDAndAge(pdb_uuid, kPDBAge);
-  module_writer->SetCodeViewRecord(crashpad::move(codeview_pdb70_writer));
+  module_writer->SetCodeViewRecord(std::move(codeview_pdb70_writer));
 
   auto misc_debug_writer =
       make_scoped_ptr(new MinidumpModuleMiscDebugRecordWriter());
   misc_debug_writer->SetDataType(kDebugType);
   misc_debug_writer->SetData(kDebugName, kDebugUTF16);
-  module_writer->SetMiscDebugRecord(crashpad::move(misc_debug_writer));
+  module_writer->SetMiscDebugRecord(std::move(misc_debug_writer));
 
-  module_list_writer->AddModule(crashpad::move(module_writer));
-  minidump_file_writer.AddStream(crashpad::move(module_list_writer));
+  module_list_writer->AddModule(std::move(module_writer));
+  minidump_file_writer.AddStream(std::move(module_list_writer));
 
   StringFile string_file;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file));
 
   ASSERT_GT(string_file.string().size(),
             sizeof(MINIDUMP_HEADER) + sizeof(MINIDUMP_DIRECTORY) +
                 sizeof(MINIDUMP_MODULE_LIST) + 1 * sizeof(MINIDUMP_MODULE));
 
   const MINIDUMP_MODULE_LIST* module_list = nullptr;
   ASSERT_NO_FATAL_FAILURE(
@@ skipping 45 matching lines @@
   const char kDebugName[] = "d1n05.dbg";
   const bool kDebugUTF16 = true;
 
   auto module_writer = make_scoped_ptr(new MinidumpModuleWriter());
   module_writer->SetName(kModuleName);
 
   auto codeview_pdb20_writer =
       make_scoped_ptr(new MinidumpModuleCodeViewRecordPDB20Writer());
   codeview_pdb20_writer->SetPDBName(kPDBName);
   codeview_pdb20_writer->SetTimestampAndAge(kPDBTimestamp, kPDBAge);
-  module_writer->SetCodeViewRecord(crashpad::move(codeview_pdb20_writer));
+  module_writer->SetCodeViewRecord(std::move(codeview_pdb20_writer));
 
   auto misc_debug_writer =
       make_scoped_ptr(new MinidumpModuleMiscDebugRecordWriter());
   misc_debug_writer->SetDataType(kDebugType);
   misc_debug_writer->SetData(kDebugName, kDebugUTF16);
-  module_writer->SetMiscDebugRecord(crashpad::move(misc_debug_writer));
+  module_writer->SetMiscDebugRecord(std::move(misc_debug_writer));
 
-  module_list_writer->AddModule(crashpad::move(module_writer));
-  minidump_file_writer.AddStream(crashpad::move(module_list_writer));
+  module_list_writer->AddModule(std::move(module_writer));
+  minidump_file_writer.AddStream(std::move(module_list_writer));
 
   StringFile string_file;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file));
 
   ASSERT_GT(string_file.string().size(),
             sizeof(MINIDUMP_HEADER) + sizeof(MINIDUMP_DIRECTORY) +
                 sizeof(MINIDUMP_MODULE_LIST) + 1 * sizeof(MINIDUMP_MODULE));
 
   const MINIDUMP_MODULE_LIST* module_list = nullptr;
   ASSERT_NO_FATAL_FAILURE(
@@ skipping 47 matching lines @@
 
   auto module_writer_0 = make_scoped_ptr(new MinidumpModuleWriter());
   module_writer_0->SetName(kModuleName0);
   module_writer_0->SetImageBaseAddress(kModuleBase0);
   module_writer_0->SetImageSize(kModuleSize0);
 
   auto codeview_pdb70_writer_0 =
       make_scoped_ptr(new MinidumpModuleCodeViewRecordPDB70Writer());
   codeview_pdb70_writer_0->SetPDBName(kPDBName0);
   codeview_pdb70_writer_0->SetUUIDAndAge(pdb_uuid_0, kPDBAge0);
-  module_writer_0->SetCodeViewRecord(crashpad::move(codeview_pdb70_writer_0));
+  module_writer_0->SetCodeViewRecord(std::move(codeview_pdb70_writer_0));
 
-  module_list_writer->AddModule(crashpad::move(module_writer_0));
+  module_list_writer->AddModule(std::move(module_writer_0));
 
   auto module_writer_1 = make_scoped_ptr(new MinidumpModuleWriter());
   module_writer_1->SetName(kModuleName1);
   module_writer_1->SetImageBaseAddress(kModuleBase1);
   module_writer_1->SetImageSize(kModuleSize1);
 
-  module_list_writer->AddModule(crashpad::move(module_writer_1));
+  module_list_writer->AddModule(std::move(module_writer_1));
 
   auto module_writer_2 = make_scoped_ptr(new MinidumpModuleWriter());
   module_writer_2->SetName(kModuleName2);
   module_writer_2->SetImageBaseAddress(kModuleBase2);
   module_writer_2->SetImageSize(kModuleSize2);
 
   auto codeview_pdb70_writer_2 =
       make_scoped_ptr(new MinidumpModuleCodeViewRecordPDB20Writer());
   codeview_pdb70_writer_2->SetPDBName(kPDBName2);
   codeview_pdb70_writer_2->SetTimestampAndAge(kPDBTimestamp2, kPDBAge2);
-  module_writer_2->SetCodeViewRecord(crashpad::move(codeview_pdb70_writer_2));
+  module_writer_2->SetCodeViewRecord(std::move(codeview_pdb70_writer_2));
 
-  module_list_writer->AddModule(crashpad::move(module_writer_2));
+  module_list_writer->AddModule(std::move(module_writer_2));
 
-  minidump_file_writer.AddStream(crashpad::move(module_list_writer));
+  minidump_file_writer.AddStream(std::move(module_list_writer));
 
   StringFile string_file;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file));
 
   ASSERT_GT(string_file.string().size(),
             sizeof(MINIDUMP_HEADER) + sizeof(MINIDUMP_DIRECTORY) +
                 sizeof(MINIDUMP_MODULE_LIST) + 1 * sizeof(MINIDUMP_MODULE));
 
   const MINIDUMP_MODULE_LIST* module_list = nullptr;
   ASSERT_NO_FATAL_FAILURE(
@@ skipping 172 matching lines @@
                                                    module_pdbs[index],
                                                    uuids[index],
                                                    ages[index]);
     module_snapshots.push_back(module_snapshot);
   }
 
   auto module_list_writer = make_scoped_ptr(new MinidumpModuleListWriter());
   module_list_writer->InitializeFromSnapshot(module_snapshots);
 
   MinidumpFileWriter minidump_file_writer;
-  minidump_file_writer.AddStream(crashpad::move(module_list_writer));
+  minidump_file_writer.AddStream(std::move(module_list_writer));
 
   StringFile string_file;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file));
 
   const MINIDUMP_MODULE_LIST* module_list = nullptr;
   ASSERT_NO_FATAL_FAILURE(
       GetModuleListStream(string_file.string(), &module_list));
 
   ASSERT_EQ(3u, module_list->NumberOfModules);
 
@@ skipping 10 matching lines @@
                                          nullptr,
                                          0,
                                          false));
   }
 }
 
 TEST(MinidumpModuleWriterDeathTest, NoModuleName) {
   MinidumpFileWriter minidump_file_writer;
   auto module_list_writer = make_scoped_ptr(new MinidumpModuleListWriter());
   auto module_writer = make_scoped_ptr(new MinidumpModuleWriter());
-  module_list_writer->AddModule(crashpad::move(module_writer));
-  minidump_file_writer.AddStream(crashpad::move(module_list_writer));
+  module_list_writer->AddModule(std::move(module_writer));
+  minidump_file_writer.AddStream(std::move(module_list_writer));
 
   StringFile string_file;
   ASSERT_DEATH_CHECK(minidump_file_writer.WriteEverything(&string_file),
                      "name_");
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace crashpad