NULL -> nullptr under athena/

athena/wm/window_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 "athena/wm/public/window_manager.h"
 
 #include "athena/screen/public/screen_manager.h"
 #include "athena/test/base/athena_test_base.h"
 #include "athena/test/base/test_windows.h"
 #include "athena/wm/public/window_list_provider.h"
@@ skipping 11 matching lines @@
 
 namespace athena {
 
 class WindowManagerTest : public test::AthenaTestBase {
  public:
   WindowManagerTest() {}
   virtual ~WindowManagerTest() {}
 
   scoped_ptr<aura::Window> CreateAndActivateWindow(
       aura::WindowDelegate* delegate) {
-    scoped_ptr<aura::Window> window(test::CreateNormalWindow(delegate, NULL));
+    scoped_ptr<aura::Window> window(
+        test::CreateNormalWindow(delegate, nullptr));
     window->Show();
     wm::ActivateWindow(window.get());
     return window.Pass();
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(WindowManagerTest);
 };
 
 TEST_F(WindowManagerTest, OverviewModeBasics) {
@@ skipping 44 matching lines @@
   scoped_ptr<aura::Window> w3(CreateAndActivateWindow(&delegate));
   wm::ActivateWindow(w3.get());
 
   WindowManager::Get()->EnterOverview();
   EXPECT_TRUE(w1->IsVisible());
   EXPECT_TRUE(w2->IsVisible());
   EXPECT_TRUE(w3->IsVisible());
 
   // Go into split-view mode.
   WindowOverviewModeDelegate* overview_delegate = wm_api.wm();
-  overview_delegate->OnSelectSplitViewWindow(w3.get(), NULL, w3.get());
+  overview_delegate->OnSelectSplitViewWindow(w3.get(), nullptr, w3.get());
   EXPECT_TRUE(w3->IsVisible());
   EXPECT_TRUE(w2->IsVisible());
   EXPECT_FALSE(w1->IsVisible());
 }
 
 TEST_F(WindowManagerTest, NewWindowFromOverview) {
   aura::test::TestWindowDelegate delegate;
   scoped_ptr<aura::Window> w1(CreateAndActivateWindow(&delegate));
   scoped_ptr<aura::Window> w2(CreateAndActivateWindow(&delegate));
 
@@ skipping 182 matching lines @@
       gfx::Screen::GetNativeScreen()->GetPrimaryDisplay().work_area().size();
   EXPECT_EQ(work_area.ToString(),
             first->bounds().size().ToString());
   EXPECT_TRUE(first->bounds().origin().IsOrigin());
 
   // A second window should have the same bounds as the first one.
   scoped_ptr<aura::Window> second(CreateAndActivateWindow(&delegate));
   EXPECT_EQ(first->bounds().ToString(), second->bounds().ToString());
 
   // Get into split view.
-  wm_api.GetSplitViewController()->ActivateSplitMode(NULL, NULL, NULL);
+  wm_api.GetSplitViewController()->ActivateSplitMode(nullptr, nullptr, nullptr);
   const gfx::Rect left_bounds =
       wm_api.GetSplitViewController()->left_window()->bounds();
   EXPECT_NE(work_area.ToString(),
             left_bounds.size().ToString());
 
   // A new window should replace the left window when in split view.
   scoped_ptr<aura::Window> third(CreateAndActivateWindow(&delegate));
   EXPECT_EQ(wm_api.GetSplitViewController()->left_window(), third.get());
   EXPECT_EQ(left_bounds.ToString(), third->bounds().ToString());
 }
@@ skipping 46 matching lines @@
 
 TEST_F(WindowManagerTest, OverviewModeFromSplitMode) {
   test::WindowManagerImplTestApi wm_api;
 
   aura::test::TestWindowDelegate delegate;
   scoped_ptr<aura::Window> w1(CreateAndActivateWindow(&delegate));
   scoped_ptr<aura::Window> w2(CreateAndActivateWindow(&delegate));
   scoped_ptr<aura::Window> w3(CreateAndActivateWindow(&delegate));
 
   // Get into split-view mode, and then turn on overview mode.
-  wm_api.GetSplitViewController()->ActivateSplitMode(NULL, NULL, NULL);
+  wm_api.GetSplitViewController()->ActivateSplitMode(nullptr, nullptr, nullptr);
   WindowManager::Get()->EnterOverview();
   EXPECT_TRUE(wm_api.GetSplitViewController()->IsSplitViewModeActive());
   EXPECT_EQ(w3.get(), wm_api.GetSplitViewController()->left_window());
   EXPECT_EQ(w2.get(), wm_api.GetSplitViewController()->right_window());
 
   WindowOverviewModeDelegate* overview_delegate = wm_api.wm();
   overview_delegate->OnSelectWindow(w1.get());
   EXPECT_FALSE(wm_api.GetSplitViewController()->IsSplitViewModeActive());
   EXPECT_TRUE(w1->IsVisible());
   // Make sure the windows that were in split-view mode are hidden.
   EXPECT_FALSE(w2->IsVisible());
   EXPECT_FALSE(w3->IsVisible());
 }
 
 // Clicking a background in overview should not crash.
 TEST_F(WindowManagerTest, ClickBackgroundInOverview) {
   test::WindowManagerImplTestApi wm_api;
 
   aura::test::TestWindowDelegate delegate;
   scoped_ptr<aura::Window> w1(CreateAndActivateWindow(&delegate));
   WindowManager::Get()->EnterOverview();
 
   ui::test::EventGenerator generator(root_window());
   generator.MoveMouseTo(1, 1);
   generator.ClickLeftButton();
 }
 
 }  // namespace athena