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

util/net/http_transport_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 "util/net/http_transport.h"
 
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include <utility>
 #include <vector>
 
 #include "base/files/file_path.h"
 #include "base/format_macros.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "gtest/gtest.h"
 #include "test/multiprocess_exec.h"
 #include "test/paths.h"
 #include "util/file/file_io.h"
-#include "util/stdlib/move.h"
 #include "util/misc/random_string.h"
 #include "util/net/http_body.h"
 #include "util/net/http_headers.h"
 #include "util/net/http_multipart_builder.h"
 
 namespace crashpad {
 namespace test {
 namespace {
 
 class HTTPTransportTestFixture : public MultiprocessExec {
  public:
   using RequestValidator =
       void(*)(HTTPTransportTestFixture*, const std::string&);
 
   HTTPTransportTestFixture(const HTTPHeaders& headers,
                            scoped_ptr<HTTPBodyStream> body_stream,
                            uint16_t http_response_code,
                            RequestValidator request_validator)
       : MultiprocessExec(),
         headers_(headers),
-        body_stream_(crashpad::move(body_stream)),
+        body_stream_(std::move(body_stream)),
         response_code_(http_response_code),
         request_validator_(request_validator) {
     base::FilePath server_path = Paths::TestDataRoot().Append(
         FILE_PATH_LITERAL("util/net/http_transport_test_server.py"));
 #if defined(OS_POSIX)
     SetChildCommand(server_path.value(), nullptr);
 #elif defined(OS_WIN)
     // Explicitly invoke a shell and python so that python can be found in the
     // path, and run the test script.
     std::vector<std::string> args;
@@ skipping 30 matching lines @@
                                  random_string.c_str(),
                                  random_string.size()));
 
     // Now execute the HTTP request.
     scoped_ptr<HTTPTransport> transport(HTTPTransport::Create());
     transport->SetMethod("POST");
     transport->SetURL(base::StringPrintf("http://127.0.0.1:%d/upload", port));
     for (const auto& pair : headers_) {
       transport->SetHeader(pair.first, pair.second);
     }
-    transport->SetBodyStream(crashpad::move(body_stream_));
+    transport->SetBodyStream(std::move(body_stream_));
 
     std::string response_body;
     bool success = transport->ExecuteSynchronously(&response_body);
     if (response_code_ == 200) {
       EXPECT_TRUE(success);
       std::string expect_response_body = random_string + "\r\n";
       EXPECT_EQ(expect_response_body, response_body);
     } else {
       EXPECT_FALSE(success);
       EXPECT_TRUE(response_body.empty());
@@ skipping 147 matching lines @@
   EXPECT_EQ(kTextBody, request.substr(body_start + 2));
 }
 
 TEST(HTTPTransport, UnchunkedPlainText) {
   scoped_ptr<HTTPBodyStream> body_stream(new StringHTTPBodyStream(kTextBody));
 
   HTTPHeaders headers;
   headers[kContentType] = kTextPlain;
   headers[kContentLength] = base::StringPrintf("%" PRIuS, strlen(kTextBody));
 
-  HTTPTransportTestFixture test(headers, crashpad::move(body_stream), 200,
-      &UnchunkedPlainText);
+  HTTPTransportTestFixture test(
+      headers, std::move(body_stream), 200, &UnchunkedPlainText);
   test.Run();
 }
 
 void RunUpload33k(bool has_content_length) {
   // On OS X, NSMutableURLRequest winds up calling into a CFReadStream’s Read()
   // callback with a 32kB buffer. Make sure that it’s able to get everything
   // when enough is available to fill this buffer, requiring more than one
   // Read().
 
   std::string request_string(33 * 1024, 'a');
   scoped_ptr<HTTPBodyStream> body_stream(
       new StringHTTPBodyStream(request_string));
 
   HTTPHeaders headers;
   headers[kContentType] = "application/octet-stream";
   if (has_content_length) {
     headers[kContentLength] =
         base::StringPrintf("%" PRIuS, request_string.size());
   }
-  HTTPTransportTestFixture test(headers, crashpad::move(body_stream), 200,
+  HTTPTransportTestFixture test(
+      headers,
+      std::move(body_stream),
+      200,
       [](HTTPTransportTestFixture* fixture, const std::string& request) {
         size_t body_start = request.rfind("\r\n");
         EXPECT_EQ(33 * 1024u + 2, request.size() - body_start);
       });
   test.Run();
 }
 
 TEST(HTTPTransport, Upload33k) {
   RunUpload33k(true);
 }
 
 TEST(HTTPTransport, Upload33k_LengthUnknown) {
   // The same as Upload33k, but without declaring Content-Length ahead of time.
   RunUpload33k(false);
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace crashpad