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

Unified Diff: webrtc/base/httpserver_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/httpserver.cc ('k') | webrtc/base/ifaddrs-android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/base/httpserver_unittest.cc
diff --git a/webrtc/base/httpserver_unittest.cc b/webrtc/base/httpserver_unittest.cc
index 0c653cbb9e667f35016658df4f33411a9cd636d9..96d5fb64b4db016a9c8e417484ba21ffb0fde64c 100644
--- a/webrtc/base/httpserver_unittest.cc
+++ b/webrtc/base/httpserver_unittest.cc
@@ -27,7 +27,7 @@ namespace {
bool server_closed, connection_closed;
HttpServerMonitor(HttpServer* server)
- : transaction(NULL), server_closed(false), connection_closed(false) {
+ : transaction(nullptr), server_closed(false), connection_closed(false) {
server->SignalCloseAllComplete.connect(this,
&HttpServerMonitor::OnClosed);
server->SignalHttpRequest.connect(this, &HttpServerMonitor::OnRequest);
@@ -44,7 +44,7 @@ namespace {
}
void OnRequestComplete(HttpServer*, HttpServerTransaction* t, int) {
ASSERT_EQ(transaction, t);
- transaction = NULL;
+ transaction = nullptr;
}
void OnClosed(HttpServer*) {
server_closed = true;
@@ -78,7 +78,7 @@ TEST(HttpServer, DoesNotSignalCloseUnlessCloseAllIsCalled) {
// Add an active client connection
CreateClientConnection(server, monitor, true);
// Simulate a response
- ASSERT_TRUE(NULL != monitor.transaction);
+ ASSERT_TRUE(nullptr != monitor.transaction);
server.Respond(monitor.transaction);
EXPECT_FALSE(monitor.transaction);
// Connection has closed, but no server close signal
@@ -107,7 +107,7 @@ TEST(HttpServer, SignalsCloseAfterGracefulCloseAll) {
server.CloseAll(false);
EXPECT_FALSE(monitor.server_closed);
// Simulate a response
- ASSERT_TRUE(NULL != monitor.transaction);
+ ASSERT_TRUE(nullptr != monitor.transaction);
server.Respond(monitor.transaction);
EXPECT_FALSE(monitor.transaction);
// Connections have all closed
« no previous file with comments | « webrtc/base/httpserver.cc ('k') | webrtc/base/ifaddrs-android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698