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

cc/output/overlay_unittest.cc

Index: cc/output/overlay_unittest.cc
diff --git a/cc/output/overlay_unittest.cc b/cc/output/overlay_unittest.cc
index 698b42b0bfe89f6d19e520c6bac2579dfa787edc..db72ab3bfcf804bce73c4d00f115416d7088c86d 100644
--- a/cc/output/overlay_unittest.cc
+++ b/cc/output/overlay_unittest.cc
@@ -76,7 +76,7 @@ SingleOverlayProcessor::SingleOverlayProcessor(
 void SingleOverlayProcessor::Initialize() {
   OverlayCandidateValidator* candidates =
       surface_->overlay_candidate_validator();
-  ASSERT_TRUE(candidates != NULL);
+  ASSERT_TRUE(candidates != nullptr);
   strategies_.push_back(scoped_ptr<Strategy>(
       new OverlayStrategySingleOnTop(candidates, resource_provider_)));
 }
@@ -220,10 +220,10 @@ static void CompareRenderPassLists(const RenderPassList& expected_list,
 TEST(OverlayTest, NoOverlaysByDefault) {
   scoped_refptr<TestContextProvider> provider = TestContextProvider::Create();
   OverlayOutputSurface output_surface(provider);
-  EXPECT_EQ(NULL, output_surface.overlay_candidate_validator());
+  EXPECT_EQ(nullptr, output_surface.overlay_candidate_validator());
 
   output_surface.InitWithSingleOverlayValidator();
-  EXPECT_TRUE(output_surface.overlay_candidate_validator() != NULL);
+  EXPECT_TRUE(output_surface.overlay_candidate_validator() != nullptr);
 }
 
 TEST(OverlayTest, OverlaysProcessorHasStrategy) {
@@ -232,12 +232,18 @@ TEST(OverlayTest, OverlaysProcessorHasStrategy) {
   FakeOutputSurfaceClient client;
   EXPECT_TRUE(output_surface.BindToClient(&client));
   output_surface.InitWithSingleOverlayValidator();
-  EXPECT_TRUE(output_surface.overlay_candidate_validator() != NULL);
+  EXPECT_TRUE(output_surface.overlay_candidate_validator() != nullptr);
 
   scoped_ptr<SharedBitmapManager> shared_bitmap_manager(
       new TestSharedBitmapManager());
-  scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create(
-      &output_surface, shared_bitmap_manager.get(), NULL, 0, false, 1, false));
+  scoped_ptr<ResourceProvider> resource_provider(
+      ResourceProvider::Create(&output_surface,
+                               shared_bitmap_manager.get(),
+                               nullptr,
+                               0,
+                               false,
+                               1,
+                               false));
 
   scoped_ptr<DefaultOverlayProcessor> overlay_processor(
       new DefaultOverlayProcessor(&output_surface, resource_provider.get()));
@@ -252,12 +258,12 @@ class SingleOverlayOnTopTest : public testing::Test {
     output_surface_.reset(new OverlayOutputSurface(provider_));
     EXPECT_TRUE(output_surface_->BindToClient(&client_));
     output_surface_->InitWithSingleOverlayValidator();
-    EXPECT_TRUE(output_surface_->overlay_candidate_validator() != NULL);
+    EXPECT_TRUE(output_surface_->overlay_candidate_validator() != nullptr);
 
     shared_bitmap_manager_.reset(new TestSharedBitmapManager());
     resource_provider_ = ResourceProvider::Create(output_surface_.get(),
                                                   shared_bitmap_manager_.get(),
-                                                  NULL,
+                                                  nullptr,
                                                   0,
                                                   false,
                                                   1,
@@ -523,7 +529,7 @@ class OverlayInfoRendererGL : public GLRenderer {
                    settings,
                    output_surface,
                    resource_provider,
-                   NULL,
+                   nullptr,
                    0),
         expect_overlays_(false) {}
 
@@ -572,7 +578,7 @@ class GLRendererWithOverlaysTest : public testing::Test {
     output_surface_.reset(new OverlayOutputSurface(provider_));
     CHECK(output_surface_->BindToClient(&output_surface_client_));
     resource_provider_ = ResourceProvider::Create(
-        output_surface_.get(), NULL, NULL, 0, false, 1, false);
+        output_surface_.get(), nullptr, nullptr, 0, false, 1, false);
 
     provider_->support()->SetScheduleOverlayPlaneCallback(base::Bind(
         &MockOverlayScheduler::Schedule, base::Unretained(&scheduler_)));