NULL -> nullptr under athena/

athena/content/app_activity_registry.cc

Index: athena/content/app_activity_registry.cc
diff --git a/athena/content/app_activity_registry.cc b/athena/content/app_activity_registry.cc
index 99814377846bd822d72ea3f1883beac2fea0fe29..4284346a3a89604bc45ae219d62e1044f3bb7920 100644
--- a/athena/content/app_activity_registry.cc
+++ b/athena/content/app_activity_registry.cc
@@ -24,10 +24,11 @@ namespace athena {
 
 AppActivityRegistry::AppActivityRegistry(
     const std::string& app_id,
-    content::BrowserContext* browser_context) :
-      app_id_(app_id),
+    content::BrowserContext* browser_context)
+    : app_id_(app_id),
       browser_context_(browser_context),
-      unloaded_activity_proxy_(NULL) {}
+      unloaded_activity_proxy_(nullptr) {
+}
 
 AppActivityRegistry::~AppActivityRegistry() {
   CHECK(activity_list_.empty());
@@ -62,7 +63,7 @@ void AppActivityRegistry::UnregisterAppActivity(AppActivity* app_activity) {
 
 AppActivity* AppActivityRegistry::GetAppActivityAt(size_t index) {
   if (index >= activity_list_.size())
-    return NULL;
+    return nullptr;
   return activity_list_[index];
 }
 
@@ -94,7 +95,7 @@ void AppActivityRegistry::Unload() {
 
 void AppActivityRegistry::ProxyDestroyed(AppActivityProxy* proxy) {
   DCHECK_EQ(unloaded_activity_proxy_, proxy);
-  unloaded_activity_proxy_ = NULL;
+  unloaded_activity_proxy_ = nullptr;
   if (activity_list_.empty()) {
     AppRegistry::Get()->RemoveAppActivityRegistry(this);
     // |This| is gone now.
@@ -133,7 +134,7 @@ AppActivity* AppActivityRegistry::GetMruActivity() {
     }
   }
   NOTREACHED() << "The application does not get tracked by the mru list";
-  return NULL;
+  return nullptr;
 }
 
 }  // namespace athena