NULL -> nullptr under athena/

athena/util/fill_layout_manager_unittest.cc

Index: athena/util/fill_layout_manager_unittest.cc
diff --git a/athena/util/fill_layout_manager_unittest.cc b/athena/util/fill_layout_manager_unittest.cc
index 01d5d0d4f59945a6533614a88b5e1ebd61889b9e..c712a779e109a191dd9bc057ba0e9aebc60bece1 100644
--- a/athena/util/fill_layout_manager_unittest.cc
+++ b/athena/util/fill_layout_manager_unittest.cc
@@ -11,11 +11,11 @@
 namespace athena {
 
 TEST(FillLayoutManagerTest, ChildWindowSizedCorrectly) {
-  scoped_ptr<aura::Window> parent(new aura::Window(NULL));
+  scoped_ptr<aura::Window> parent(new aura::Window(nullptr));
   parent->SetBounds(gfx::Rect(10, 20, 30, 40));
   parent->SetLayoutManager(new FillLayoutManager(parent.get()));
 
-  scoped_ptr<aura::Window> child(new aura::Window(NULL));
+  scoped_ptr<aura::Window> child(new aura::Window(nullptr));
   child->SetBounds(gfx::Rect(0, 0, 5, 10));
 
   EXPECT_NE(child->bounds().size().ToString(),
@@ -30,7 +30,7 @@ TEST(FillLayoutManagerTest, ChildWindowSizedCorrectly) {
             parent->bounds().size().ToString());
 
   // Menu and tooltip should not be filled.
-  scoped_ptr<aura::Window> menu(new aura::Window(NULL));
+  scoped_ptr<aura::Window> menu(new aura::Window(nullptr));
   menu->SetType(ui::wm::WINDOW_TYPE_MENU);
   menu->SetBounds(gfx::Rect(0, 0, 5, 10));
 
@@ -40,7 +40,7 @@ TEST(FillLayoutManagerTest, ChildWindowSizedCorrectly) {
   menu->SetBounds(gfx::Rect(0, 0, 100, 200));
   EXPECT_EQ(menu->bounds().ToString(), "0,0 100x200");
 
-  scoped_ptr<aura::Window> tooltip(new aura::Window(NULL));
+  scoped_ptr<aura::Window> tooltip(new aura::Window(nullptr));
   tooltip->SetType(ui::wm::WINDOW_TYPE_TOOLTIP);
   tooltip->SetBounds(gfx::Rect(0, 0, 5, 10));