NULL -> nullptr under athena/

BUG=None

Review URL: https://codereview.chromium.org/653563004

Cr-Commit-Position: refs/heads/master@{#300978}

4 files changed, 11 insertions, 11 deletions

diff --git a/athena/test/base/activity_lifetime_tracker.cc b/athena/test/base/activity_lifetime_tracker.cc
index f3618ec..e5aeea5 100644
--- a/athena/test/base/activity_lifetime_tracker.cc
+++ b/athena/test/base/activity_lifetime_tracker.cc
@@ -8,8 +8,8 @@
 
 namespace athena {
 
-ActivityLifetimeTracker::ActivityLifetimeTracker() : new_activity_(NULL),
-                                                     deleted_activity_(NULL) {
+ActivityLifetimeTracker::ActivityLifetimeTracker()
+    : new_activity_(nullptr), deleted_activity_(nullptr) {
   ActivityManager::Get()->AddObserver(this);
 }
 
@@ -27,13 +27,13 @@ void ActivityLifetimeTracker::OnActivityEnding(Activity* activity) {
 
 Activity* ActivityLifetimeTracker::GetNewActivityAndReset() {
   Activity* activity = new_activity_;
-  new_activity_ = NULL;
+  new_activity_ = nullptr;
   return activity;
 }
 
 void* ActivityLifetimeTracker::GetDeletedActivityAndReset() {
   void* activity = deleted_activity_;
-  deleted_activity_ = NULL;
+  deleted_activity_ = nullptr;
   return activity;
 }
 
diff --git a/athena/test/base/activity_lifetime_tracker.h b/athena/test/base/activity_lifetime_tracker.h
index 670385f..2c1ae16 100644
--- a/athena/test/base/activity_lifetime_tracker.h
+++ b/athena/test/base/activity_lifetime_tracker.h
@@ -32,10 +32,10 @@ class ActivityLifetimeTracker : public ActivityManagerObserver {
   void* GetDeletedActivityAndReset();
 
  private:
-  // The activity which got created if not NULL.
+  // The activity which got created if not nullptr.
   Activity* new_activity_;
 
-  // An old activity which got unloaded if not NULL.
+  // An old activity which got unloaded if not nullptr.
   void* deleted_activity_;
 
   DISALLOW_COPY_AND_ASSIGN(ActivityLifetimeTracker);
diff --git a/athena/test/base/athena_test_helper.cc b/athena/test/base/athena_test_helper.cc
index 42e04d1..538ed1c 100644
--- a/athena/test/base/athena_test_helper.cc
+++ b/athena/test/base/athena_test_helper.cc
@@ -65,7 +65,7 @@ void AthenaTestHelper::SetUp(ui::ContextFactory* context_factory) {
   athena::ExtensionsDelegate::CreateExtensionsDelegateForTest();
   athena::StartAthenaSession(new SampleActivityFactory(),
                              make_scoped_ptr(new TestAppModelBuilder()),
-                             CreateSearchControllerFactory(NULL));
+                             CreateSearchControllerFactory(nullptr));
 }
 
 void AthenaTestHelper::TearDown() {
diff --git a/athena/test/base/sample_activity.cc b/athena/test/base/sample_activity.cc
index 2c4bd65..43495e7 100644
--- a/athena/test/base/sample_activity.cc
+++ b/athena/test/base/sample_activity.cc
@@ -18,7 +18,7 @@ SampleActivity::SampleActivity(SkColor color,
     : color_(color),
       contents_color_(contents_color),
       title_(title),
-      contents_view_(NULL),
+      contents_view_(nullptr),
       current_state_(ACTIVITY_UNLOADED) {
 }
 
@@ -46,12 +46,12 @@ Activity::ActivityMediaState SampleActivity::GetMediaState() {
 }
 
 aura::Window* SampleActivity::GetWindow() {
-  return !contents_view_ ? NULL
+  return !contents_view_ ? nullptr
                          : contents_view_->GetWidget()->GetNativeWindow();
 }
 
 content::WebContents* SampleActivity::GetWebContents() {
-  return NULL;
+  return nullptr;
 }
 
 void SampleActivity::Init() {
@@ -83,7 +83,7 @@ views::View* SampleActivity::GetContentsView() {
 }
 
 views::Widget* SampleActivity::CreateWidget() {
-  return NULL;
+  return nullptr;
 }
 
 gfx::ImageSkia SampleActivity::GetOverviewModeImage() {