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

cc/resources/texture_uploader_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/resources/texture_uploader.h"
 
 #include "cc/base/util.h"
 #include "cc/resources/prioritized_resource.h"
 #include "gpu/command_buffer/client/gles2_interface_stub.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ skipping 97 matching lines @@
       case GL_LUMINANCE:
         EXPECT_EQ(static_cast<unsigned>(GL_UNSIGNED_BYTE), type);
         bytes_per_pixel = 1;
         break;
       case GL_LUMINANCE_ALPHA:
         EXPECT_EQ(static_cast<unsigned>(GL_UNSIGNED_BYTE), type);
         bytes_per_pixel = 2;
         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);
     // We'll expect the first byte of every row to be 0x1, and the last byte to
     // be 0x2.
     const unsigned int stride =
         RoundUp(bytes_per_pixel * width, unpack_alignment_);
     for (GLsizei row = 0; row < height; ++row) {
       const uint8* row_bytes =
           bytes + (xoffset * bytes_per_pixel + (yoffset + row) * stride);
@@ skipping 20 matching lines @@
   uploader->Upload(
       data, gfx::Rect(size), gfx::Rect(size), gfx::Vector2d(), format, size);
 }
 
 TEST(TextureUploaderTest, NumBlockingUploads) {
   TextureUploadTestContext context;
   scoped_ptr<TextureUploader> uploader = TextureUploader::Create(&context);
 
   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());
 }
 
 TEST(TextureUploaderTest, MarkPendingUploadsAsNonBlocking) {
   TextureUploadTestContext context;
   scoped_ptr<TextureUploader> uploader = TextureUploader::Create(&context);
 
   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());
 }
 
 TEST(TextureUploaderTest, UploadContentsTest) {
   TextureUploadTestContext context;
   scoped_ptr<TextureUploader> uploader = TextureUploader::Create(&context);
 
   uint8 buffer[256 * 256 * 4];
 
@@ skipping 29 matching lines @@
   for (int i = 0; i < 86; ++i) {
     // Mark the beginning and end of each row, for the test.
     buffer[i * 1 * 82] = 0x1;
     buffer[(i + 1) * 82 - 1] = 0x2;
   }
   UploadTexture(uploader.get(), LUMINANCE_8, gfx::Size(82, 86), buffer);
 }
 
 }  // namespace
 }  // namespace cc