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

cc/trees/tree_synchronizer_unittest.cc

Index: cc/trees/tree_synchronizer_unittest.cc
diff --git a/cc/trees/tree_synchronizer_unittest.cc b/cc/trees/tree_synchronizer_unittest.cc
index faa86ce907366d4adcc2e9fe243c5305a10e17b9..05f49a2c42cc44e188aca560cbf24212ad719ac9 100644
--- a/cc/trees/tree_synchronizer_unittest.cc
+++ b/cc/trees/tree_synchronizer_unittest.cc
@@ -41,8 +41,7 @@ class MockLayerImpl : public LayerImpl {
 
  private:
   MockLayerImpl(LayerTreeImpl* tree_impl, int layer_id)
-      : LayerImpl(tree_impl, layer_id),
-        layer_impl_destruction_list_(NULL) {}
+      : LayerImpl(tree_impl, layer_id), layer_impl_destruction_list_(nullptr) {}
 
   std::vector<int>* layer_impl_destruction_list_;
 };
@@ -202,7 +201,7 @@ class TreeSynchronizerTest : public testing::Test {
 // return a null tree.
 TEST_F(TreeSynchronizerTest, SyncNullTree) {
   scoped_ptr<LayerImpl> layer_impl_tree_root =
-      TreeSynchronizer::SynchronizeTrees(static_cast<Layer*>(NULL),
+      TreeSynchronizer::SynchronizeTrees(static_cast<Layer*>(nullptr),

[danakj, 2014/10/10 16:47:12]

static cast isn't needed, remove that please

                                          scoped_ptr<LayerImpl>(),
                                          host_->active_tree());
 
@@ -526,7 +525,7 @@ TEST_F(TreeSynchronizerTest, SyncMaskReplicaAndReplicaMaskLayers) {
                           host_->active_tree());
 
   // Remove the mask layer.
-  layer_tree_root->children()[0]->SetMaskLayer(NULL);
+  layer_tree_root->children()[0]->SetMaskLayer(nullptr);
   layer_impl_tree_root =
       TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(),
                                          layer_impl_tree_root.Pass(),
@@ -536,7 +535,7 @@ TEST_F(TreeSynchronizerTest, SyncMaskReplicaAndReplicaMaskLayers) {
                           host_->active_tree());
 
   // Remove the replica layer.
-  layer_tree_root->children()[1]->SetReplicaLayer(NULL);
+  layer_tree_root->children()[1]->SetReplicaLayer(nullptr);
   layer_impl_tree_root =
       TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(),
                                          layer_impl_tree_root.Pass(),
@@ -546,7 +545,7 @@ TEST_F(TreeSynchronizerTest, SyncMaskReplicaAndReplicaMaskLayers) {
                           host_->active_tree());
 
   // Remove the replica mask.
-  replica_layer_with_mask->SetMaskLayer(NULL);
+  replica_layer_with_mask->SetMaskLayer(nullptr);
   layer_impl_tree_root =
       TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(),
                                          layer_impl_tree_root.Pass(),
@@ -565,7 +564,7 @@ TEST_F(TreeSynchronizerTest, SynchronizeAnimations) {
       new TestSharedBitmapManager());
   scoped_ptr<LayerTreeHostImpl> host_impl =
       LayerTreeHostImpl::Create(settings,
-                                NULL,
+                                nullptr,
                                 &proxy,
                                 &stats_instrumentation,
                                 shared_bitmap_manager.get(),
@@ -604,7 +603,7 @@ TEST_F(TreeSynchronizerTest, SynchronizeScrollParent) {
       new TestSharedBitmapManager());
   scoped_ptr<LayerTreeHostImpl> host_impl =
       LayerTreeHostImpl::Create(settings,
-                                NULL,
+                                nullptr,
                                 &proxy,
                                 &stats_instrumentation,
                                 shared_bitmap_manager.get(),
@@ -677,7 +676,7 @@ TEST_F(TreeSynchronizerTest, SynchronizeClipParent) {
       new TestSharedBitmapManager());
   scoped_ptr<LayerTreeHostImpl> host_impl =
       LayerTreeHostImpl::Create(settings,
-                                NULL,
+                                nullptr,
                                 &proxy,
                                 &stats_instrumentation,
                                 shared_bitmap_manager.get(),
@@ -711,7 +710,7 @@ TEST_F(TreeSynchronizerTest, SynchronizeClipParent) {
 
   // Remove the first clip child.
   clip_child1->RemoveFromParent();
-  clip_child1 = NULL;
+  clip_child1 = nullptr;
 
   layer_impl_tree_root =
       TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(),
@@ -739,7 +738,7 @@ TEST_F(TreeSynchronizerTest, SynchronizeClipParent) {
 
   // Remove the nearest clipping ancestor.
   clip_parent->RemoveFromParent();
-  clip_parent = NULL;
+  clip_parent = nullptr;
   layer_impl_tree_root =
       TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(),
                                          layer_impl_tree_root.Pass(),