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

cc/trees/layer_tree_host_unittest_scroll.cc

Index: cc/trees/layer_tree_host_unittest_scroll.cc
diff --git a/cc/trees/layer_tree_host_unittest_scroll.cc b/cc/trees/layer_tree_host_unittest_scroll.cc
index 82cee89f30379da5cbe5a4963eb27ac201911e51..448f7f1a09c8963d3d94547569980af08d6538fc 100644
--- a/cc/trees/layer_tree_host_unittest_scroll.cc
+++ b/cc/trees/layer_tree_host_unittest_scroll.cc
@@ -44,7 +44,8 @@ class LayerTreeHostScrollTestScrollSimple : public LayerTreeHostScrollTest {
     scroll_layer->SetIsContainerForFixedPositionLayers(true);
     scroll_layer->SetScrollClipLayerId(root_layer->id());
     scroll_layer->SetScrollOffset(initial_scroll_);
-    layer_tree_host()->RegisterViewportLayers(root_layer, scroll_layer, NULL);
+    layer_tree_host()->RegisterViewportLayers(
+        root_layer, scroll_layer, nullptr);
     PostSetNeedsCommitToMainThread();
   }
 
@@ -121,7 +122,8 @@ class LayerTreeHostScrollTestScrollMultipleRedraw
     scroll_layer_->SetIsContainerForFixedPositionLayers(true);
     scroll_layer_->SetScrollClipLayerId(root_layer->id());
     scroll_layer_->SetScrollOffset(initial_scroll_);
-    layer_tree_host()->RegisterViewportLayers(root_layer, scroll_layer_, NULL);
+    layer_tree_host()->RegisterViewportLayers(
+        root_layer, scroll_layer_, nullptr);
     PostSetNeedsCommitToMainThread();
   }
 
@@ -224,7 +226,7 @@ class LayerTreeHostScrollTestScrollAbortedCommit
     root_layer->AddChild(root_scroll_layer);
 
     layer_tree_host()->RegisterViewportLayers(
-        root_layer, root_scroll_layer, NULL);
+        root_layer, root_scroll_layer, nullptr);
     layer_tree_host()->SetPageScaleFactorAndLimits(1.f, 0.01f, 100.f);
   }
 
@@ -407,7 +409,7 @@ class LayerTreeHostScrollTestFractionalScroll : public LayerTreeHostScrollTest {
     root_layer->AddChild(root_scroll_layer);
 
     layer_tree_host()->RegisterViewportLayers(
-        root_layer, root_scroll_layer, NULL);
+        root_layer, root_scroll_layer, nullptr);
     layer_tree_host()->SetPageScaleFactorAndLimits(1.f, 0.01f, 100.f);
   }
 
@@ -512,7 +514,7 @@ class LayerTreeHostScrollTestCaseWithChild : public LayerTreeHostScrollTest {
 
     layer_tree_host()->SetRootLayer(root_layer);
     layer_tree_host()->RegisterViewportLayers(
-        root_layer, root_scroll_layer_, NULL);
+        root_layer, root_scroll_layer_, nullptr);
     LayerTreeHostScrollTest::SetupTree();
   }
 
@@ -568,8 +570,8 @@ class LayerTreeHostScrollTestCaseWithChild : public LayerTreeHostScrollTest {
     FakePictureLayerImpl* child_layer_impl = static_cast<FakePictureLayerImpl*>(
         root_scroll_layer_impl->children()[0]);
 
-    LayerImpl* expected_scroll_layer_impl = NULL;
-    LayerImpl* expected_no_scroll_layer_impl = NULL;
+    LayerImpl* expected_scroll_layer_impl = nullptr;
+    LayerImpl* expected_no_scroll_layer_impl = nullptr;
     if (scroll_child_layer_) {
       expected_scroll_layer_impl = child_layer_impl;
       expected_no_scroll_layer_impl = root_scroll_layer_impl;
@@ -781,7 +783,7 @@ class ImplSidePaintingScrollTestSimple : public ImplSidePaintingScrollTest {
     root_layer->AddChild(root_scroll_layer);
 
     layer_tree_host()->RegisterViewportLayers(
-        root_layer, root_scroll_layer, NULL);
+        root_layer, root_scroll_layer, nullptr);
     layer_tree_host()->SetPageScaleFactorAndLimits(1.f, 0.01f, 100.f);
   }
 
@@ -914,7 +916,7 @@ class ImplSidePaintingScrollTestImplOnlyScroll
     root_layer->AddChild(root_scroll_layer);
 
     layer_tree_host()->RegisterViewportLayers(
-        root_layer, root_scroll_layer, NULL);
+        root_layer, root_scroll_layer, nullptr);
     layer_tree_host()->SetPageScaleFactorAndLimits(1.f, 0.01f, 100.f);
   }
 
@@ -954,7 +956,7 @@ class ImplSidePaintingScrollTestImplOnlyScroll
     // the second commit.
     LayerImpl* active_root = impl->active_tree()->root_layer();
     LayerImpl* active_scroll_layer =
-        active_root ? active_root->children()[0] : NULL;
+        active_root ? active_root->children()[0] : nullptr;
     LayerImpl* pending_root = impl->pending_tree()->root_layer();
     LayerImpl* pending_scroll_layer = pending_root->children()[0];
 
@@ -1191,7 +1193,7 @@ class LayerTreeHostScrollTestLayerStructureChange
 
   virtual void DidScroll(Layer* layer) {
     if (scroll_destroy_whole_tree_) {
-      layer_tree_host()->SetRootLayer(NULL);
+      layer_tree_host()->SetRootLayer(nullptr);
       EndTest();
       return;
     }