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

cc/resources/picture_unittest.cc

Index: cc/resources/picture_unittest.cc
diff --git a/cc/resources/picture_unittest.cc b/cc/resources/picture_unittest.cc
index fc259895904a46100e731d601bfeb0dc052111af..2a567aaffcc7bbdc99c7a3fd40f1a179ab28dc08 100644
--- a/cc/resources/picture_unittest.cc
+++ b/cc/resources/picture_unittest.cc
@@ -420,7 +420,7 @@ TEST(PictureTest, CreateFromSkpValue) {
   scoped_ptr<base::Value> serialized_one_rect(
       one_rect_picture->AsValue());
 
-  const base::DictionaryValue* value = NULL;
+  const base::DictionaryValue* value = nullptr;
   EXPECT_TRUE(serialized_one_rect->GetAsDictionary(&value));
 
   // Decode the picture from base64.
@@ -447,14 +447,14 @@ TEST(PictureTest, RecordingModes) {
   tile_grid_info.fOffset.setZero();
 
   FakeContentLayerClient content_layer_client;
-  EXPECT_EQ(NULL, content_layer_client.last_canvas());
+  EXPECT_EQ(nullptr, content_layer_client.last_canvas());
 
   scoped_refptr<Picture> picture = Picture::Create(layer_rect,
                                                    &content_layer_client,
                                                    tile_grid_info,
                                                    false,
                                                    Picture::RECORD_NORMALLY);
-  EXPECT_TRUE(content_layer_client.last_canvas() != NULL);
+  EXPECT_TRUE(content_layer_client.last_canvas() != nullptr);
   EXPECT_EQ(ContentLayerClient::GRAPHICS_CONTEXT_ENABLED,
             content_layer_client.last_context_status());
   EXPECT_TRUE(picture.get());
@@ -463,8 +463,8 @@ TEST(PictureTest, RecordingModes) {
                             &content_layer_client,
                             tile_grid_info,
                             false,
-                            Picture::RECORD_WITH_SK_NULL_CANVAS);
-  EXPECT_TRUE(content_layer_client.last_canvas() != NULL);
+                            Picture::RECORD_WITH_SK_nullptr_CANVAS);
+  EXPECT_TRUE(content_layer_client.last_canvas() != nullptr);
   EXPECT_EQ(ContentLayerClient::GRAPHICS_CONTEXT_ENABLED,
             content_layer_client.last_context_status());
   EXPECT_TRUE(picture.get());
@@ -474,7 +474,7 @@ TEST(PictureTest, RecordingModes) {
                             tile_grid_info,
                             false,
                             Picture::RECORD_WITH_PAINTING_DISABLED);
-  EXPECT_TRUE(content_layer_client.last_canvas() != NULL);
+  EXPECT_TRUE(content_layer_client.last_canvas() != nullptr);
   EXPECT_EQ(ContentLayerClient::GRAPHICS_CONTEXT_DISABLED,
             content_layer_client.last_context_status());
   EXPECT_TRUE(picture.get());
@@ -484,7 +484,7 @@ TEST(PictureTest, RecordingModes) {
                             tile_grid_info,
                             false,
                             Picture::RECORD_WITH_SKRECORD);
-  EXPECT_TRUE(content_layer_client.last_canvas() != NULL);
+  EXPECT_TRUE(content_layer_client.last_canvas() != nullptr);
   EXPECT_TRUE(picture.get());
 
   EXPECT_EQ(4, Picture::RECORDING_MODE_COUNT);