C++11 declares a type safe null pointer

content/common/host_shared_bitmap_manager_unittest.cc

Index: content/common/host_shared_bitmap_manager_unittest.cc
diff --git a/content/common/host_shared_bitmap_manager_unittest.cc b/content/common/host_shared_bitmap_manager_unittest.cc
index ed0ddbab2ae62ff513957aea5f766e65bd288912..a04ba800b1f49d752bfe820cc4650f6ec2f5cbaa 100644
--- a/content/common/host_shared_bitmap_manager_unittest.cc
+++ b/content/common/host_shared_bitmap_manager_unittest.cc
@@ -30,31 +30,31 @@ TEST_F(HostSharedBitmapManagerTest, TestCreate) {
 
   scoped_ptr<cc::SharedBitmap> large_bitmap;
   large_bitmap = manager_->GetSharedBitmapFromId(gfx::Size(1024, 1024), id);
-  EXPECT_TRUE(large_bitmap.get() == NULL);
+  EXPECT_TRUE(large_bitmap.get() == nullptr);
 
   scoped_ptr<cc::SharedBitmap> very_large_bitmap;
   very_large_bitmap =
       manager_->GetSharedBitmapFromId(gfx::Size(1, (1 << 30) | 1), id);
-  EXPECT_TRUE(very_large_bitmap.get() == NULL);
+  EXPECT_TRUE(very_large_bitmap.get() == nullptr);
 
   scoped_ptr<cc::SharedBitmap> negative_size_bitmap;
   negative_size_bitmap =
       manager_->GetSharedBitmapFromId(gfx::Size(-1, 1024), id);
-  EXPECT_TRUE(negative_size_bitmap.get() == NULL);
+  EXPECT_TRUE(negative_size_bitmap.get() == nullptr);
 
   cc::SharedBitmapId id2 = cc::SharedBitmap::GenerateId();
   scoped_ptr<cc::SharedBitmap> invalid_bitmap;
   invalid_bitmap = manager_->GetSharedBitmapFromId(bitmap_size, id2);
-  EXPECT_TRUE(invalid_bitmap.get() == NULL);
+  EXPECT_TRUE(invalid_bitmap.get() == nullptr);
 
   scoped_ptr<cc::SharedBitmap> shared_bitmap;
   shared_bitmap = manager_->GetSharedBitmapFromId(bitmap_size, id);
-  ASSERT_TRUE(shared_bitmap.get() != NULL);
+  ASSERT_TRUE(shared_bitmap.get() != nullptr);
   EXPECT_EQ(memcmp(shared_bitmap->pixels(), bitmap->memory(), 4), 0);
 
   scoped_ptr<cc::SharedBitmap> large_bitmap2;
   large_bitmap2 = manager_->GetSharedBitmapFromId(gfx::Size(1024, 1024), id);
-  EXPECT_TRUE(large_bitmap2.get() == NULL);
+  EXPECT_TRUE(large_bitmap2.get() == nullptr);
 
   scoped_ptr<cc::SharedBitmap> shared_bitmap2;
   shared_bitmap2 = manager_->GetSharedBitmapFromId(bitmap_size, id);
@@ -112,13 +112,13 @@ TEST_F(HostSharedBitmapManagerTest, RemoveProcess) {
 
   scoped_ptr<cc::SharedBitmap> shared_bitmap;
   shared_bitmap = manager_->GetSharedBitmapFromId(bitmap_size, id);
-  ASSERT_TRUE(shared_bitmap.get() != NULL);
+  ASSERT_TRUE(shared_bitmap.get() != nullptr);
 
   manager_->ProcessRemoved(base::GetCurrentProcessHandle());
 
   scoped_ptr<cc::SharedBitmap> shared_bitmap2;
   shared_bitmap2 = manager_->GetSharedBitmapFromId(bitmap_size, id);
-  EXPECT_TRUE(shared_bitmap2.get() == NULL);
+  EXPECT_TRUE(shared_bitmap2.get() == nullptr);
   EXPECT_EQ(memcmp(shared_bitmap->pixels(), bitmap->memory(), size_in_bytes),
             0);
 
@@ -151,7 +151,7 @@ TEST_F(HostSharedBitmapManagerTest, AddDuplicate) {
 
   scoped_ptr<cc::SharedBitmap> shared_bitmap;
   shared_bitmap = manager_->GetSharedBitmapFromId(bitmap_size, id);
-  ASSERT_TRUE(shared_bitmap.get() != NULL);
+  ASSERT_TRUE(shared_bitmap.get() != nullptr);
   EXPECT_EQ(memcmp(shared_bitmap->pixels(), bitmap->memory(), size_in_bytes),
             0);
 }