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

Unified Diff: webrtc/base/base64_unittest.cc

Issue 2718663005: Replace NULL with nullptr or null in webrtc/base/. (Closed)
Patch Set: Fixing Windows and formatting issues. Created 3 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/base/base64.cc ('k') | webrtc/base/bitbuffer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/base/base64_unittest.cc
diff --git a/webrtc/base/base64_unittest.cc b/webrtc/base/base64_unittest.cc
index 96bc69582e8f114a1422acbef18e752fd910e9f6..6bfba7949a51ba29061e729da1f2cb003a1b7fe0 100644
--- a/webrtc/base/base64_unittest.cc
+++ b/webrtc/base/base64_unittest.cc
@@ -339,14 +339,14 @@ size_t Base64Escape(const unsigned char *src, size_t szsrc, char *dest,
size_t Base64Unescape(const char *src, size_t szsrc, char *dest,
size_t szdest) {
std::string unescaped;
- EXPECT_TRUE(Base64::DecodeFromArray(src, szsrc, Base64::DO_LAX, &unescaped,
- NULL));
+ EXPECT_TRUE(
+ Base64::DecodeFromArray(src, szsrc, Base64::DO_LAX, &unescaped, nullptr));
memcpy(dest, unescaped.data(), min(unescaped.size(), szdest));
return unescaped.size();
}
size_t Base64Unescape(const char *src, size_t szsrc, std::string *s) {
- EXPECT_TRUE(Base64::DecodeFromArray(src, szsrc, Base64::DO_LAX, s, NULL));
+ EXPECT_TRUE(Base64::DecodeFromArray(src, szsrc, Base64::DO_LAX, s, nullptr));
return s->size();
}
@@ -995,5 +995,5 @@ TEST(Base64, GetNextBase64Char) {
EXPECT_TRUE(Base64::GetNextBase64Char('/', &next_char));
EXPECT_EQ('A', next_char);
EXPECT_FALSE(Base64::GetNextBase64Char('&', &next_char));
- EXPECT_FALSE(Base64::GetNextBase64Char('Z', NULL));
+ EXPECT_FALSE(Base64::GetNextBase64Char('Z', nullptr));
}
« no previous file with comments | « webrtc/base/base64.cc ('k') | webrtc/base/bitbuffer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698