NULL -> nullptr under athena/

athena/screen/screen_manager_unittest.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 <algorithm>
 #include <string>
 
 #include "athena/screen/screen_manager_impl.h"
 #include "athena/test/base/athena_test_base.h"
 #include "athena/test/base/test_windows.h"
@@ skipping 86 matching lines @@
   non_activatable.can_activate_children = false;
   aura::Window* no_activatable_container =
       ScreenManager::Get()->CreateContainer(non_activatable);
 
   ScreenManager::ContainerParams activatable(
       "activatable", kTestZOrderPriority + 1);
   activatable.can_activate_children = true;
   aura::Window* activatable_container =
       ScreenManager::Get()->CreateContainer(activatable);
 
-  scoped_ptr<aura::Window> window(
-      CreateWindow(no_activatable_container, NULL, gfx::Rect(0, 0, 100, 100)));
+  scoped_ptr<aura::Window> window(CreateWindow(
+      no_activatable_container, nullptr, gfx::Rect(0, 0, 100, 100)));
   EXPECT_FALSE(wm::CanActivateWindow(window.get()));
 
   activatable_container->AddChild(window.get());
   EXPECT_TRUE(wm::CanActivateWindow(window.get()));
 }
 
 TEST_F(ScreenManagerTest, BlockInputsShouldNotBlockVirtualKeyboard) {
   ScreenManager::ContainerParams block_params("blocking", kTestZOrderPriority);
   block_params.can_activate_children = true;
   block_params.block_events = true;
@@ skipping 29 matching lines @@
       static_cast<ScreenManagerImpl*>(ScreenManager::Get());
   aura::Window* original_default = impl->FindContainerByPriority(CP_DEFAULT);
   aura::Window* parent = original_default->parent();
   // Temporarily remove the original default container from tree.
   parent->RemoveChild(original_default);
 
   ScreenManager::ContainerParams params("new_default", CP_END + 1);
   params.default_parent = true;
   params.modal_container_priority = CP_END + 2;
   aura::Window* new_default = ScreenManager::Get()->CreateContainer(params);
-  aura::Window* w = test::CreateNormalWindow(NULL, NULL).release();
+  aura::Window* w = test::CreateNormalWindow(nullptr, nullptr).release();
   EXPECT_EQ(new_default, w->parent());
   delete new_default;
 
   // Add the original back to shutdown properly.
   parent->AddChild(original_default);
 }
 
 namespace {
 
 class ScreenManagerTargeterTest
     : public athena::test::AthenaTestBase,
       public testing::WithParamInterface<bool> {
  public:
   ScreenManagerTargeterTest()
-      : targeter_(GetParam() ? NULL : new aura::WindowTargeter) {}
+      : targeter_(GetParam() ? nullptr : new aura::WindowTargeter) {}
   virtual ~ScreenManagerTargeterTest() {}
 
  protected:
   scoped_ptr<ui::EventTargeter> targeter_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ScreenManagerTargeterTest);
 };
 
 }  // namespace
@@ skipping 94 matching lines @@
   event_generator.ClickLeftButton();
   EXPECT_EQ("0 0", normal_delegate.GetMouseButtonCountsAndReset());
   EXPECT_EQ("0 0", block_delegate.GetMouseButtonCountsAndReset());
 }
 
 INSTANTIATE_TEST_CASE_P(WithOrWithoutTargeter,
                         ScreenManagerTargeterTest,
                         testing::Values(false, true));
 
 }  // namespace athena