Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(642)

Side by Side Diff: webrtc/system_wrappers/source/aligned_malloc_unittest.cc

Issue 1937693002: Replace scoped_ptr with unique_ptr everywhere (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@unique5
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #include "webrtc/system_wrappers/include/aligned_malloc.h" 11 #include "webrtc/system_wrappers/include/aligned_malloc.h"
12 12
13 #include <memory>
14
13 #if _WIN32 15 #if _WIN32
14 #include <windows.h> 16 #include <windows.h>
15 #else 17 #else
16 #include <stdint.h> 18 #include <stdint.h>
17 #endif 19 #endif
18 20
19 #include "testing/gtest/include/gtest/gtest.h" 21 #include "testing/gtest/include/gtest/gtest.h"
20 #include "webrtc/base/scoped_ptr.h"
21 #include "webrtc/typedefs.h" 22 #include "webrtc/typedefs.h"
22 23
23 namespace webrtc { 24 namespace webrtc {
24 25
25 // Returns true if |size| and |alignment| are valid combinations. 26 // Returns true if |size| and |alignment| are valid combinations.
26 bool CorrectUsage(size_t size, size_t alignment) { 27 bool CorrectUsage(size_t size, size_t alignment) {
27 rtc::scoped_ptr<char, AlignedFreeDeleter> scoped( 28 std::unique_ptr<char, AlignedFreeDeleter> scoped(
28 static_cast<char*>(AlignedMalloc(size, alignment))); 29 static_cast<char*>(AlignedMalloc(size, alignment)));
29 if (scoped.get() == NULL) { 30 if (scoped.get() == NULL) {
30 return false; 31 return false;
31 } 32 }
32 const uintptr_t scoped_address = reinterpret_cast<uintptr_t> (scoped.get()); 33 const uintptr_t scoped_address = reinterpret_cast<uintptr_t> (scoped.get());
33 return 0u == scoped_address % alignment; 34 return 0u == scoped_address % alignment;
34 } 35 }
35 36
36 TEST(AlignedMalloc, GetRightAlign) { 37 TEST(AlignedMalloc, GetRightAlign) {
37 const size_t size = 100; 38 const size_t size = 100;
38 const size_t alignment = 32; 39 const size_t alignment = 32;
39 const size_t left_misalignment = 1; 40 const size_t left_misalignment = 1;
40 rtc::scoped_ptr<char, AlignedFreeDeleter> scoped( 41 std::unique_ptr<char, AlignedFreeDeleter> scoped(
41 static_cast<char*>(AlignedMalloc(size, alignment))); 42 static_cast<char*>(AlignedMalloc(size, alignment)));
42 EXPECT_TRUE(scoped.get() != NULL); 43 EXPECT_TRUE(scoped.get() != NULL);
43 const uintptr_t aligned_address = reinterpret_cast<uintptr_t> (scoped.get()); 44 const uintptr_t aligned_address = reinterpret_cast<uintptr_t> (scoped.get());
44 const uintptr_t misaligned_address = aligned_address - left_misalignment; 45 const uintptr_t misaligned_address = aligned_address - left_misalignment;
45 const char* misaligned_ptr = reinterpret_cast<const char*>( 46 const char* misaligned_ptr = reinterpret_cast<const char*>(
46 misaligned_address); 47 misaligned_address);
47 const char* realigned_ptr = GetRightAlign(misaligned_ptr, alignment); 48 const char* realigned_ptr = GetRightAlign(misaligned_ptr, alignment);
48 EXPECT_EQ(scoped.get(), realigned_ptr); 49 EXPECT_EQ(scoped.get(), realigned_ptr);
49 } 50 }
50 51
(...skipping 22 matching lines...) Expand all
73 } 74 }
74 75
75 TEST(AlignedMalloc, AlignTo128Bytes) { 76 TEST(AlignedMalloc, AlignTo128Bytes) {
76 size_t size = 100; 77 size_t size = 100;
77 size_t alignment = 128; 78 size_t alignment = 128;
78 EXPECT_TRUE(CorrectUsage(size, alignment)); 79 EXPECT_TRUE(CorrectUsage(size, alignment));
79 } 80 }
80 81
81 } // namespace webrtc 82 } // namespace webrtc
82 83
OLDNEW
« no previous file with comments | « webrtc/system_wrappers/include/utf_util_win.h ('k') | webrtc/system_wrappers/source/condition_variable_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698