NULL -> nullptr under athena/

athena/test/base/athena_test_helper.cc

 // 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.
 
 #include "athena/test/base/athena_test_helper.h"
 
 #include "athena/env/public/athena_env.h"
 #include "athena/extensions/public/apps_search_controller_factory.h"
 #include "athena/extensions/public/extensions_delegate.h"
 #include "athena/home/public/search_controller_factory.h"
@@ skipping 47 matching lines @@
   // Unit tests generally don't want to query the system, rather use the state
   // from RootWindow.
   aura::test::EnvTestHelper(aura::Env::GetInstance())
       .SetInputStateLookup(scoped_ptr<aura::InputStateLookup>());
 
   // TODO(oshima): Use a BlockingPool task runner.
   athena::StartAthenaEnv(file_thread_->message_loop_proxy());
   athena::ExtensionsDelegate::CreateExtensionsDelegateForTest();
   athena::StartAthenaSession(new SampleActivityFactory(),
                              make_scoped_ptr(new TestAppModelBuilder()),
-                             CreateSearchControllerFactory(NULL));
+                             CreateSearchControllerFactory(nullptr));
 }
 
 void AthenaTestHelper::TearDown() {
   teardown_called_ = true;
 
   athena::ShutdownAthena();
   aura::Env::DeleteInstance();
 
 #if defined(USE_X11)
   ui::test::ResetXCursorCache();
@@ skipping 13 matching lines @@
 
 void AthenaTestHelper::RunAllPendingInMessageLoop() {
   // TODO(jbates) crbug.com/134753 Find quitters of this RunLoop and have them
   //              use run_loop.QuitClosure().
   base::RunLoop run_loop;
   run_loop.RunUntilIdle();
 }
 
 }  // namespace test
 }  // namespace athena