[C++11 Allowed Features] Declares a type-safe null pointer converting from NULL to nullptr in src/…

cc/resources/texture_uploader_unittest.cc

Index: cc/resources/texture_uploader_unittest.cc
diff --git a/cc/resources/texture_uploader_unittest.cc b/cc/resources/texture_uploader_unittest.cc
index 335908d1f11a64714eb2533b25bbff7d9ea9b260..0b20ae275146ac75162aaf1489e5d44243a9edac 100644
--- a/cc/resources/texture_uploader_unittest.cc
+++ b/cc/resources/texture_uploader_unittest.cc
@@ -115,8 +115,8 @@ class TextureUploadTestContext : public gpu::gles2::GLES2InterfaceStub {
         break;
     }
 
-    // If NULL, we aren't checking texture contents.
-    if (pixels == NULL)
+    // If nullptr, we aren't checking texture contents.

[danakj, 2014/10/10 17:28:46]

just use null

+    if (pixels == nullptr)
       return;
 
     const uint8* bytes = static_cast<const uint8*>(pixels);
@@ -157,17 +157,17 @@ TEST(TextureUploaderTest, NumBlockingUploads) {
 
   context.SetResultAvailable(0);
   EXPECT_EQ(0u, uploader->NumBlockingUploads());
-  UploadTexture(uploader.get(), RGBA_8888, gfx::Size(), NULL);
+  UploadTexture(uploader.get(), RGBA_8888, gfx::Size(), nullptr);
   EXPECT_EQ(1u, uploader->NumBlockingUploads());
-  UploadTexture(uploader.get(), RGBA_8888, gfx::Size(), NULL);
+  UploadTexture(uploader.get(), RGBA_8888, gfx::Size(), nullptr);
   EXPECT_EQ(2u, uploader->NumBlockingUploads());
 
   context.SetResultAvailable(1);
   EXPECT_EQ(0u, uploader->NumBlockingUploads());
-  UploadTexture(uploader.get(), RGBA_8888, gfx::Size(), NULL);
+  UploadTexture(uploader.get(), RGBA_8888, gfx::Size(), nullptr);
   EXPECT_EQ(0u, uploader->NumBlockingUploads());
-  UploadTexture(uploader.get(), RGBA_8888, gfx::Size(), NULL);
-  UploadTexture(uploader.get(), RGBA_8888, gfx::Size(), NULL);
+  UploadTexture(uploader.get(), RGBA_8888, gfx::Size(), nullptr);
+  UploadTexture(uploader.get(), RGBA_8888, gfx::Size(), nullptr);
   EXPECT_EQ(0u, uploader->NumBlockingUploads());
 }
 
@@ -177,18 +177,18 @@ TEST(TextureUploaderTest, MarkPendingUploadsAsNonBlocking) {
 
   context.SetResultAvailable(0);
   EXPECT_EQ(0u, uploader->NumBlockingUploads());
-  UploadTexture(uploader.get(), RGBA_8888, gfx::Size(), NULL);
-  UploadTexture(uploader.get(), RGBA_8888, gfx::Size(), NULL);
+  UploadTexture(uploader.get(), RGBA_8888, gfx::Size(), nullptr);
+  UploadTexture(uploader.get(), RGBA_8888, gfx::Size(), nullptr);
   EXPECT_EQ(2u, uploader->NumBlockingUploads());
 
   uploader->MarkPendingUploadsAsNonBlocking();
   EXPECT_EQ(0u, uploader->NumBlockingUploads());
-  UploadTexture(uploader.get(), RGBA_8888, gfx::Size(), NULL);
+  UploadTexture(uploader.get(), RGBA_8888, gfx::Size(), nullptr);
   EXPECT_EQ(1u, uploader->NumBlockingUploads());
 
   context.SetResultAvailable(1);
   EXPECT_EQ(0u, uploader->NumBlockingUploads());
-  UploadTexture(uploader.get(), RGBA_8888, gfx::Size(), NULL);
+  UploadTexture(uploader.get(), RGBA_8888, gfx::Size(), nullptr);
   uploader->MarkPendingUploadsAsNonBlocking();
   EXPECT_EQ(0u, uploader->NumBlockingUploads());
 }