NULL -> nullptr under athena/

athena/wm/window_list_provider_impl_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/window_list_provider_impl.h"
 
 #include <algorithm>
 
 #include "athena/screen/public/screen_manager.h"
 #include "athena/test/base/athena_test_base.h"
@@ skipping 139 matching lines @@
 }
 
 // Testing that IsValidWidow, IsWindowInList and AddWindow work as expected.
 TEST_F(WindowListProviderImplTest, SimpleChecks) {
   aura::test::TestWindowDelegate delegate;
   scoped_ptr<aura::Window> container(new aura::Window(&delegate));
   scoped_ptr<WindowListProviderImpl> list_provider(
       new WindowListProviderImpl(container.get()));
 
   scoped_ptr<aura::Window> normal_window =
-      CreateWindow(NULL, &delegate, ui::wm::WINDOW_TYPE_NORMAL);
+      CreateWindow(nullptr, &delegate, ui::wm::WINDOW_TYPE_NORMAL);
   scoped_ptr<aura::Window> popup_window =
-      CreateWindow(NULL, &delegate, ui::wm::WINDOW_TYPE_POPUP);
+      CreateWindow(nullptr, &delegate, ui::wm::WINDOW_TYPE_POPUP);
   scoped_ptr<aura::Window> menu_window =
-      CreateWindow(NULL, &delegate, ui::wm::WINDOW_TYPE_MENU);
+      CreateWindow(nullptr, &delegate, ui::wm::WINDOW_TYPE_MENU);
 
   // Check which windows are valid and which are not.
   EXPECT_TRUE(list_provider->IsValidWindow(normal_window.get()));
   EXPECT_FALSE(list_provider->IsValidWindow(popup_window.get()));
   EXPECT_FALSE(list_provider->IsValidWindow(menu_window.get()));
 
   // Check that no window is currently in the list.
   EXPECT_FALSE(list_provider->IsWindowInList(normal_window.get()));
   EXPECT_FALSE(list_provider->IsWindowInList(popup_window.get()));
   EXPECT_FALSE(list_provider->IsWindowInList(menu_window.get()));
 
   // Check that adding the window will add it to the list.
   container->AddChild(normal_window.get());
   EXPECT_TRUE(list_provider->IsWindowInList(normal_window.get()));
 }
 
 // Testing that window ordering functions work as expected.
 TEST_F(WindowListProviderImplTest, TestWindowOrderingFunctions) {
   aura::test::TestWindowDelegate delegate;
   scoped_ptr<aura::Window> container(new aura::Window(&delegate));
   scoped_ptr<WindowListProvider> list_provider(
       new WindowListProviderImpl(container.get()));
   scoped_ptr<WindowListObserver> observer(
       new WindowListObserver(list_provider.get()));
 
   scoped_ptr<aura::Window> window1 =
-      CreateWindow(NULL, &delegate, ui::wm::WINDOW_TYPE_NORMAL);
+      CreateWindow(nullptr, &delegate, ui::wm::WINDOW_TYPE_NORMAL);
   scoped_ptr<aura::Window> window2 =
-      CreateWindow(NULL, &delegate, ui::wm::WINDOW_TYPE_NORMAL);
+      CreateWindow(nullptr, &delegate, ui::wm::WINDOW_TYPE_NORMAL);
   scoped_ptr<aura::Window> window3 =
-      CreateWindow(NULL, &delegate, ui::wm::WINDOW_TYPE_NORMAL);
+      CreateWindow(nullptr, &delegate, ui::wm::WINDOW_TYPE_NORMAL);
 
   EXPECT_FALSE(list_provider->IsWindowInList(window1.get()));
   EXPECT_FALSE(list_provider->IsWindowInList(window2.get()));
   EXPECT_FALSE(list_provider->IsWindowInList(window3.get()));
 
   // Add the windows.
   container->AddChild(window1.get());
   container->AddChild(window2.get());
   container->AddChild(window3.get());
   // Make a copy of the window-list in the original order.
@@ skipping 83 matching lines @@
 // Test that transient windows are handled property.
 TEST_F(WindowListProviderImplTest, TransientWindows) {
   aura::test::TestWindowDelegate delegate;
   delegate.set_can_focus(true);
 
   WindowListProvider* list_provider =
       WindowManager::Get()->GetWindowListProvider();
 
   scoped_ptr<WindowListObserver> observer(
       new WindowListObserver(list_provider));
-  scoped_ptr<aura::Window> w1 = test::CreateNormalWindow(&delegate, NULL);
+  scoped_ptr<aura::Window> w1 = test::CreateNormalWindow(&delegate, nullptr);
   w1->Show();
-  scoped_ptr<aura::Window> w2 = test::CreateNormalWindow(&delegate, NULL);
+  scoped_ptr<aura::Window> w2 = test::CreateNormalWindow(&delegate, nullptr);
   w2->Show();
   scoped_ptr<aura::Window> t1 = test::CreateTransientWindow(
       &delegate, w1.get(), ui::MODAL_TYPE_NONE, false);
   t1->Show();
 
   EXPECT_EQ(2u, list_provider->GetWindowList().size());
 
   // Activation should honor transient relations.
   wm::ActivateWindow(w2.get());
   EXPECT_EQ(w1.get(), list_provider->GetWindowList()[0]);
@@ skipping 27 matching lines @@
   EXPECT_FALSE(t1->IsVisible());
   w1->Show();
   EXPECT_TRUE(t1->IsVisible());
 
   // Resetting transient window won't notify the observer.
   t1.reset();
   EXPECT_EQ(0, observer->window_removal_calls());
 }
 
 }  // namespace athena