NULL -> nullptr under athena/

athena/content/app_activity_registry.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ATHENA_CONTENT_APP_ACTIVITY_REGISTRY_H_
 #define ATHENA_CONTENT_APP_ACTIVITY_REGISTRY_H_
 
 #include <vector>
 
 #include "athena/activity/public/activity_view_model.h"
@@ skipping 27 matching lines @@
 
   // Unregister a previously attached |AppActivity|.
   // Note that detaching the last |AppActivity| will delete this object - unless
   // the resource manager was trying to unload the application.
   // Note furthermore that Detach can be called without ever being registered.
   void UnregisterAppActivity(AppActivity* app_activity);
 
   // Returns the number of activities/windows with this application.
   int NumberOfActivities() const { return activity_list_.size(); }
 
-  // Returns the |AppActivity| at |index|. It will return NULL if an invalid
+  // Returns the |AppActivity| at |index|. It will return nullptr if an invalid
   // index was specified.
   AppActivity* GetAppActivityAt(size_t index);
 
   // Unload all application associated activities to save resources.
   void Unload();
 
   // Returns true if the application is in the unloaded state.
-  bool IsUnloaded() { return unloaded_activity_proxy_ != NULL; }
+  bool IsUnloaded() { return unloaded_activity_proxy_ != nullptr; }
 
   content::BrowserContext* browser_context() const { return browser_context_; }
   const std::string& app_id() const { return app_id_; }
 
   // Returns the proxy - if there is one. This will get used by a newly created
   // activity to position itself in its place before it get destroyed.
   Activity* unloaded_activity_proxy() { return unloaded_activity_proxy_; }
 
  protected:
   friend AppActivityProxy;
@@ skipping 32 matching lines @@
   SkColor color_;
   base::string16 title_;
   gfx::ImageSkia image_;
 
   DISALLOW_COPY_AND_ASSIGN(AppActivityRegistry);
 };
 
 }  // namespace athena
 
 #endif  // ATHENA_CONTENT_APP_ACTIVITY_REGISTRY_H_