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

Side by Side Diff: webrtc/base/bitbuffer_unittest.cc

Issue 2718663005: Replace NULL with nullptr or null in webrtc/base/. (Closed)
Patch Set: Fixing Windows and formatting issues. Created 3 years, 9 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
« no previous file with comments | « webrtc/base/bitbuffer.cc ('k') | webrtc/base/bytebuffer.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2015 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2015 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
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 EXPECT_FALSE(buffer.Seek(5, 0)); 162 EXPECT_FALSE(buffer.Seek(5, 0));
163 buffer.GetCurrentOffset(&byte_offset, &bit_offset); 163 buffer.GetCurrentOffset(&byte_offset, &bit_offset);
164 EXPECT_EQ(4u, byte_offset); 164 EXPECT_EQ(4u, byte_offset);
165 EXPECT_EQ(0u, bit_offset); 165 EXPECT_EQ(0u, bit_offset);
166 EXPECT_FALSE(buffer.Seek(4, 1)); 166 EXPECT_FALSE(buffer.Seek(4, 1));
167 167
168 // Disable death test on Android because it relies on fork() and doesn't play 168 // Disable death test on Android because it relies on fork() and doesn't play
169 // nicely. 169 // nicely.
170 #if GTEST_HAS_DEATH_TEST 170 #if GTEST_HAS_DEATH_TEST
171 #if !defined(WEBRTC_ANDROID) 171 #if !defined(WEBRTC_ANDROID)
172 // Passing a NULL out parameter is death. 172 // Passing a null out parameter is death.
173 EXPECT_DEATH(buffer.GetCurrentOffset(&byte_offset, NULL), ""); 173 EXPECT_DEATH(buffer.GetCurrentOffset(&byte_offset, nullptr), "");
174 #endif 174 #endif
175 #endif 175 #endif
176 } 176 }
177 177
178 uint64_t GolombEncoded(uint32_t val) { 178 uint64_t GolombEncoded(uint32_t val) {
179 val++; 179 val++;
180 uint32_t bit_counter = val; 180 uint32_t bit_counter = val;
181 uint64_t bit_count = 0; 181 uint64_t bit_count = 0;
182 while (bit_counter > 0) { 182 while (bit_counter > 0) {
183 bit_count++; 183 bit_count++;
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 EXPECT_TRUE(buffer.WriteBits(0, 1)); 320 EXPECT_TRUE(buffer.WriteBits(0, 1));
321 EXPECT_EQ(0xEFu, bytes[0]); 321 EXPECT_EQ(0xEFu, bytes[0]);
322 EXPECT_TRUE(buffer.WriteBits(0, 3)); 322 EXPECT_TRUE(buffer.WriteBits(0, 3));
323 EXPECT_EQ(0xE1u, bytes[0]); 323 EXPECT_EQ(0xE1u, bytes[0]);
324 EXPECT_TRUE(buffer.WriteBits(0, 2)); 324 EXPECT_TRUE(buffer.WriteBits(0, 2));
325 EXPECT_EQ(0xE0u, bytes[0]); 325 EXPECT_EQ(0xE0u, bytes[0]);
326 EXPECT_EQ(0x7F, bytes[1]); 326 EXPECT_EQ(0x7F, bytes[1]);
327 } 327 }
328 328
329 } // namespace rtc 329 } // namespace rtc
OLDNEW
« no previous file with comments | « webrtc/base/bitbuffer.cc ('k') | webrtc/base/bytebuffer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698