Index: webrtc/system_wrappers/source/aligned_malloc_unittest.cc |
diff --git a/webrtc/system_wrappers/source/aligned_malloc_unittest.cc b/webrtc/system_wrappers/source/aligned_malloc_unittest.cc |
index 3933c2ac05d22c4b84955a6f8b26634ea5158c40..ed6cd424db90e9e45f80e69fb7499a8acc3291b0 100644 |
--- a/webrtc/system_wrappers/source/aligned_malloc_unittest.cc |
+++ b/webrtc/system_wrappers/source/aligned_malloc_unittest.cc |
@@ -10,6 +10,8 @@ |
#include "webrtc/system_wrappers/include/aligned_malloc.h" |
+#include <memory> |
+ |
#if _WIN32 |
#include <windows.h> |
#else |
@@ -17,14 +19,13 @@ |
#endif |
#include "testing/gtest/include/gtest/gtest.h" |
-#include "webrtc/base/scoped_ptr.h" |
#include "webrtc/typedefs.h" |
namespace webrtc { |
// Returns true if |size| and |alignment| are valid combinations. |
bool CorrectUsage(size_t size, size_t alignment) { |
- rtc::scoped_ptr<char, AlignedFreeDeleter> scoped( |
+ std::unique_ptr<char, AlignedFreeDeleter> scoped( |
static_cast<char*>(AlignedMalloc(size, alignment))); |
if (scoped.get() == NULL) { |
return false; |
@@ -37,7 +38,7 @@ TEST(AlignedMalloc, GetRightAlign) { |
const size_t size = 100; |
const size_t alignment = 32; |
const size_t left_misalignment = 1; |
- rtc::scoped_ptr<char, AlignedFreeDeleter> scoped( |
+ std::unique_ptr<char, AlignedFreeDeleter> scoped( |
static_cast<char*>(AlignedMalloc(size, alignment))); |
EXPECT_TRUE(scoped.get() != NULL); |
const uintptr_t aligned_address = reinterpret_cast<uintptr_t> (scoped.get()); |