Add an AlignedFreeDeleter and remove scoped_ptr_malloc.
- Transition scoped_ptr_mallocs to scoped_ptr.
- AlignedFreeDeleter matches Chromium's version.
TESTED=try bots
R=turaj@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/8969005
git-svn-id: http://webrtc.googlecode.com/svn/trunk@5587 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/webrtc/system_wrappers/source/aligned_malloc_unittest.cc b/webrtc/system_wrappers/source/aligned_malloc_unittest.cc
index 10e08aa..0acbf97 100644
--- a/webrtc/system_wrappers/source/aligned_malloc_unittest.cc
+++ b/webrtc/system_wrappers/source/aligned_malloc_unittest.cc
@@ -16,14 +16,16 @@
#include <stdint.h>
#endif
+#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/system_wrappers/interface/scoped_ptr.h"
#include "webrtc/typedefs.h"
-#include "testing/gtest/include/gtest/gtest.h"
+namespace webrtc {
// Returns true if |size| and |alignment| are valid combinations.
bool CorrectUsage(size_t size, size_t alignment) {
- webrtc::Allocator<char>::scoped_ptr_aligned scoped(
- webrtc::AlignedMalloc<char>(size, alignment));
+ scoped_ptr<char, AlignedFreeDeleter> scoped(
+ static_cast<char*>(AlignedMalloc(size, alignment)));
if (scoped.get() == NULL) {
return false;
}
@@ -34,16 +36,15 @@
TEST(AlignedMalloc, GetRightAlign) {
const size_t size = 100;
const size_t alignment = 32;
- const size_t left_missalignment = 8;
- webrtc::Allocator<char>::scoped_ptr_aligned scoped(
- webrtc::AlignedMalloc<char>(size, alignment));
+ const size_t left_misalignment = 1;
+ scoped_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());
- const uintptr_t missaligned_address = aligned_address - left_missalignment;
- const char* missaligned_ptr = reinterpret_cast<const char*>(
- missaligned_address);
- const char* realigned_ptr = webrtc::GetRightAlign(
- missaligned_ptr, alignment);
+ const uintptr_t misaligned_address = aligned_address - left_misalignment;
+ const char* misaligned_ptr = reinterpret_cast<const char*>(
+ misaligned_address);
+ const char* realigned_ptr = GetRightAlign(misaligned_ptr, alignment);
EXPECT_EQ(scoped.get(), realigned_ptr);
}
@@ -76,3 +77,6 @@
size_t alignment = 128;
EXPECT_TRUE(CorrectUsage(size, alignment));
}
+
+} // namespace webrtc
+