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

snapshot/test/test_process_snapshot.h

 // 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.
 
 #ifndef CRASHPAD_SNAPSHOT_TEST_TEST_PROCESS_SNAPSHOT_H_
 #define CRASHPAD_SNAPSHOT_TEST_TEST_PROCESS_SNAPSHOT_H_
 
 #include <stdint.h>
 #include <sys/time.h>
 #include <sys/types.h>
 
 #include <map>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "snapshot/exception_snapshot.h"
 #include "snapshot/memory_map_region_snapshot.h"
 #include "snapshot/memory_snapshot.h"
 #include "snapshot/module_snapshot.h"
 #include "snapshot/process_snapshot.h"
 #include "snapshot/system_snapshot.h"
 #include "snapshot/thread_snapshot.h"
-#include "util/stdlib/move.h"
 #include "util/misc/uuid.h"
 #include "util/stdlib/pointer_container.h"
 
 namespace crashpad {
 namespace test {
 
 //! \brief A test ProcessSnapshot that can carry arbitrary data for testing
 //!     purposes.
 class TestProcessSnapshot final : public ProcessSnapshot {
  public:
@@ skipping 20 matching lines @@
   void SetAnnotationsSimpleMap(
       const std::map<std::string, std::string>& annotations_simple_map) {
     annotations_simple_map_ = annotations_simple_map;
   }
 
   //! \brief Sets the system snapshot to be returned by System().
   //!
   //! \param[in] system The system snapshot that System() will return. The
   //!     TestProcessSnapshot object takes ownership of \a system.
   void SetSystem(scoped_ptr<SystemSnapshot> system) {
-    system_ = crashpad::move(system);
+    system_ = std::move(system);
   }
 
   //! \brief Adds a thread snapshot to be returned by Threads().
   //!
   //! \param[in] thread The thread snapshot that will be included in Threads().
   //!     The TestProcessSnapshot object takes ownership of \a thread.
   void AddThread(scoped_ptr<ThreadSnapshot> thread) {
     threads_.push_back(thread.release());
   }
 
   //! \brief Adds a module snapshot to be returned by Modules().
   //!
   //! \param[in] module The module snapshot that will be included in Modules().
   //!     The TestProcessSnapshot object takes ownership of \a module.
   void AddModule(scoped_ptr<ModuleSnapshot> module) {
     modules_.push_back(module.release());
   }
 
   //! \brief Sets the exception snapshot to be returned by Exception().
   //!
   //! \param[in] exception The exception snapshot that Exception() will return.
   //!     The TestProcessSnapshot object takes ownership of \a exception.
   void SetException(scoped_ptr<ExceptionSnapshot> exception) {
-    exception_ = crashpad::move(exception);
+    exception_ = std::move(exception);
   }
 
   //! \brief Adds a memory map region snapshot to be returned by MemoryMap().
   //!
   //! \param[in] region The memory map region snapshot that will be included in
   //!     MemoryMap(). The TestProcessSnapshot object takes ownership of \a
   //!     region.
   void AddMemoryMapRegion(scoped_ptr<MemoryMapRegionSnapshot> region) {
     memory_map_.push_back(region.release());
   }
@@ skipping 51 matching lines @@
   std::vector<HandleSnapshot> handles_;
   PointerVector<MemorySnapshot> extra_memory_;
 
   DISALLOW_COPY_AND_ASSIGN(TestProcessSnapshot);
 };
 
 }  // namespace test
 }  // namespace crashpad
 
 #endif  // CRASHPAD_SNAPSHOT_TEST_TEST_PROCESS_SNAPSHOT_H_