NULL -> nullptr under athena/

athena/activity/activity_manager_unittest.cc

Index: athena/activity/activity_manager_unittest.cc
diff --git a/athena/activity/activity_manager_unittest.cc b/athena/activity/activity_manager_unittest.cc
index 37f73f6bfc099661add28f4074a8148bfbd0b996..92e721d811c1358b7edc24f14579e7b8fd5d4907 100644
--- a/athena/activity/activity_manager_unittest.cc
+++ b/athena/activity/activity_manager_unittest.cc
@@ -20,7 +20,7 @@ TEST_F(ActivityManagerTest, Basic) {
   ActivityFactory* factory = ActivityFactory::Get();
 
   Activity* activity1 =
-      factory->CreateWebActivity(NULL, base::string16(), GURL());
+      factory->CreateWebActivity(nullptr, base::string16(), GURL());
   EXPECT_EQ(1, activity_manager->num_activities());
 
   // Activity is not visible when created.
@@ -29,7 +29,7 @@ TEST_F(ActivityManagerTest, Basic) {
   EXPECT_TRUE(activity1->GetWindow()->TargetVisibility());
 
   Activity* activity2 =
-      factory->CreateWebActivity(NULL, base::string16(), GURL());
+      factory->CreateWebActivity(nullptr, base::string16(), GURL());
   EXPECT_EQ(2, activity_manager->num_activities());
 
   Activity::Delete(activity1);
@@ -45,17 +45,17 @@ TEST_F(ActivityManagerTest, GetActivityForWindow) {
   ActivityFactory* factory = ActivityFactory::Get();
 
   Activity* activity1 =
-      factory->CreateWebActivity(NULL, base::string16(), GURL());
+      factory->CreateWebActivity(nullptr, base::string16(), GURL());
   Activity* activity2 =
-      factory->CreateWebActivity(NULL, base::string16(), GURL());
+      factory->CreateWebActivity(nullptr, base::string16(), GURL());
 
   EXPECT_EQ(activity1, manager->GetActivityForWindow(activity1->GetWindow()));
   EXPECT_EQ(activity2, manager->GetActivityForWindow(activity2->GetWindow()));
 
-  EXPECT_EQ(NULL, manager->GetActivityForWindow(NULL));
+  EXPECT_EQ(nullptr, manager->GetActivityForWindow(nullptr));
 
-  scoped_ptr<aura::Window> window = test::CreateNormalWindow(NULL, NULL);
-  EXPECT_EQ(NULL, manager->GetActivityForWindow(window.get()));
+  scoped_ptr<aura::Window> window = test::CreateNormalWindow(nullptr, nullptr);
+  EXPECT_EQ(nullptr, manager->GetActivityForWindow(window.get()));
 }
 
 }  // namespace athena