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

Unified Diff: remoting/host/chromeos/aura_desktop_capturer_unittest.cc

Issue 810133003: replace NULL->nullptr in src/remoting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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
Index: remoting/host/chromeos/aura_desktop_capturer_unittest.cc
diff --git a/remoting/host/chromeos/aura_desktop_capturer_unittest.cc b/remoting/host/chromeos/aura_desktop_capturer_unittest.cc
index fb41684d5008fd099e600ec332c30d2dd0290432..9095cba44437e0b8310e774d0ce65414a94d8355 100644
--- a/remoting/host/chromeos/aura_desktop_capturer_unittest.cc
+++ b/remoting/host/chromeos/aura_desktop_capturer_unittest.cc
@@ -64,7 +64,7 @@ void AuraDesktopCapturerTest::SetUp() {
}
TEST_F(AuraDesktopCapturerTest, ConvertSkBitmapToDesktopFrame) {
- webrtc::DesktopFrame* captured_frame = NULL;
+ webrtc::DesktopFrame* captured_frame = nullptr;
EXPECT_CALL(*this, OnCaptureCompleted(_)).Times(1).WillOnce(
SaveArg<0>(&captured_frame));
@@ -72,7 +72,7 @@ TEST_F(AuraDesktopCapturerTest, ConvertSkBitmapToDesktopFrame) {
SimulateFrameCapture();
- ASSERT_TRUE(captured_frame != NULL);
+ ASSERT_TRUE(captured_frame != nullptr);
uint8_t* captured_data = captured_frame->data();
EXPECT_EQ(
0,
« no previous file with comments | « remoting/host/chromeos/aura_desktop_capturer.cc ('k') | remoting/host/chromeos/skia_bitmap_desktop_frame.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698