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

minidump/minidump_simple_string_dictionary_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_simple_string_dictionary_writer.h"
 
 #include <map>
 #include <string>
+#include <utility>
 
 #include "gtest/gtest.h"
 #include "minidump/minidump_extensions.h"
 #include "minidump/test/minidump_string_writer_test_util.h"
 #include "minidump/test/minidump_writable_test_util.h"
 #include "util/file/string_file.h"
-#include "util/stdlib/move.h"
 
 namespace crashpad {
 namespace test {
 namespace {
 
 const MinidumpSimpleStringDictionary* MinidumpSimpleStringDictionaryAtStart(
     const std::string& file_contents,
     size_t count) {
   MINIDUMP_LOCATION_DESCRIPTOR location_descriptor;
   location_descriptor.DataSize = static_cast<uint32_t>(
@@ skipping 20 matching lines @@
   ASSERT_TRUE(dictionary);
   EXPECT_EQ(0u, dictionary->count);
 }
 
 TEST(MinidumpSimpleStringDictionaryWriter, EmptyKeyValue) {
   StringFile string_file;
 
   MinidumpSimpleStringDictionaryWriter dictionary_writer;
   auto entry_writer =
       make_scoped_ptr(new MinidumpSimpleStringDictionaryEntryWriter());
-  dictionary_writer.AddEntry(crashpad::move(entry_writer));
+  dictionary_writer.AddEntry(std::move(entry_writer));
 
   EXPECT_TRUE(dictionary_writer.IsUseful());
 
   EXPECT_TRUE(dictionary_writer.WriteEverything(&string_file));
   ASSERT_EQ(sizeof(MinidumpSimpleStringDictionary) +
                 sizeof(MinidumpSimpleStringDictionaryEntry) +
                 2 * sizeof(MinidumpUTF8String) + 1 + 3 + 1,  // 3 for padding
             string_file.string().size());
 
   const MinidumpSimpleStringDictionary* dictionary =
@@ skipping 13 matching lines @@
 TEST(MinidumpSimpleStringDictionaryWriter, OneKeyValue) {
   StringFile string_file;
 
   char kKey[] = "key";
   char kValue[] = "value";
 
   MinidumpSimpleStringDictionaryWriter dictionary_writer;
   auto entry_writer =
       make_scoped_ptr(new MinidumpSimpleStringDictionaryEntryWriter());
   entry_writer->SetKeyValue(kKey, kValue);
-  dictionary_writer.AddEntry(crashpad::move(entry_writer));
+  dictionary_writer.AddEntry(std::move(entry_writer));
 
   EXPECT_TRUE(dictionary_writer.IsUseful());
 
   EXPECT_TRUE(dictionary_writer.WriteEverything(&string_file));
   ASSERT_EQ(sizeof(MinidumpSimpleStringDictionary) +
                 sizeof(MinidumpSimpleStringDictionaryEntry) +
                 2 * sizeof(MinidumpUTF8String) + sizeof(kKey) + sizeof(kValue),
             string_file.string().size());
 
   const MinidumpSimpleStringDictionary* dictionary =
@@ skipping 17 matching lines @@
   char kValue0[] = "value0";
   char kKey1[] = "zzz1";
   char kValue1[] = "v1";
   char kKey2[] = "aa2";
   char kValue2[] = "val2";
 
   MinidumpSimpleStringDictionaryWriter dictionary_writer;
   auto entry_writer_0 =
       make_scoped_ptr(new MinidumpSimpleStringDictionaryEntryWriter());
   entry_writer_0->SetKeyValue(kKey0, kValue0);
-  dictionary_writer.AddEntry(crashpad::move(entry_writer_0));
+  dictionary_writer.AddEntry(std::move(entry_writer_0));
   auto entry_writer_1 =
       make_scoped_ptr(new MinidumpSimpleStringDictionaryEntryWriter());
   entry_writer_1->SetKeyValue(kKey1, kValue1);
-  dictionary_writer.AddEntry(crashpad::move(entry_writer_1));
+  dictionary_writer.AddEntry(std::move(entry_writer_1));
   auto entry_writer_2 =
       make_scoped_ptr(new MinidumpSimpleStringDictionaryEntryWriter());
   entry_writer_2->SetKeyValue(kKey2, kValue2);
-  dictionary_writer.AddEntry(crashpad::move(entry_writer_2));
+  dictionary_writer.AddEntry(std::move(entry_writer_2));
 
   EXPECT_TRUE(dictionary_writer.IsUseful());
 
   EXPECT_TRUE(dictionary_writer.WriteEverything(&string_file));
   ASSERT_EQ(sizeof(MinidumpSimpleStringDictionary) +
                 3 * sizeof(MinidumpSimpleStringDictionaryEntry) +
                 6 * sizeof(MinidumpUTF8String) + sizeof(kKey2) +
                 sizeof(kValue2) + 3 + sizeof(kKey0) + 1 + sizeof(kValue0) + 1 +
                 sizeof(kKey1) + 3 + sizeof(kValue1),
             string_file.string().size());
@@ skipping 39 matching lines @@
   StringFile string_file;
 
   char kKey[] = "key";
   char kValue0[] = "fake_value";
   char kValue1[] = "value";
 
   MinidumpSimpleStringDictionaryWriter dictionary_writer;
   auto entry_writer_0 =
       make_scoped_ptr(new MinidumpSimpleStringDictionaryEntryWriter());
   entry_writer_0->SetKeyValue(kKey, kValue0);
-  dictionary_writer.AddEntry(crashpad::move(entry_writer_0));
+  dictionary_writer.AddEntry(std::move(entry_writer_0));
   auto entry_writer_1 =
       make_scoped_ptr(new MinidumpSimpleStringDictionaryEntryWriter());
   entry_writer_1->SetKeyValue(kKey, kValue1);
-  dictionary_writer.AddEntry(crashpad::move(entry_writer_1));
+  dictionary_writer.AddEntry(std::move(entry_writer_1));
 
   EXPECT_TRUE(dictionary_writer.IsUseful());
 
   EXPECT_TRUE(dictionary_writer.WriteEverything(&string_file));
   ASSERT_EQ(sizeof(MinidumpSimpleStringDictionary) +
                 sizeof(MinidumpSimpleStringDictionaryEntry) +
                 2 * sizeof(MinidumpUTF8String) + sizeof(kKey) + sizeof(kValue1),
             string_file.string().size());
 
   const MinidumpSimpleStringDictionary* dictionary =
@@ skipping 58 matching lines @@
             MinidumpUTF8StringAtRVAAsString(string_file.string(),
                                             dictionary->entries[2].key));
   EXPECT_EQ(kValue2,
             MinidumpUTF8StringAtRVAAsString(string_file.string(),
                                             dictionary->entries[2].value));
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace crashpad