| Index: third_party/crashpad/crashpad/snapshot/test/test_process_snapshot.h
|
| diff --git a/third_party/crashpad/crashpad/snapshot/test/test_process_snapshot.h b/third_party/crashpad/crashpad/snapshot/test/test_process_snapshot.h
|
| index 666fa0a183eafa52bf623312b679aa15480572c8..6e81354fb5945e3fe8c216de08a333fb7166e62e 100644
|
| --- a/third_party/crashpad/crashpad/snapshot/test/test_process_snapshot.h
|
| +++ b/third_party/crashpad/crashpad/snapshot/test/test_process_snapshot.h
|
| @@ -21,6 +21,7 @@
|
|
|
| #include <map>
|
| #include <string>
|
| +#include <utility>
|
| #include <vector>
|
|
|
| #include "base/basictypes.h"
|
| @@ -32,7 +33,6 @@
|
| #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"
|
|
|
| @@ -73,7 +73,7 @@ class TestProcessSnapshot final : public ProcessSnapshot {
|
| //! \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().
|
| @@ -97,7 +97,7 @@ class TestProcessSnapshot final : public ProcessSnapshot {
|
| //! \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().
|
|
|