Last sets of tests that can move to common_unittests

ash/wm/window_modality_controller_unittest.cc

 // Copyright (c) 2012 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 "ui/wm/core/window_modality_controller.h"
 
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/child_modal_window.h"
 #include "ash/wm/window_util.h"
@@ skipping 455 matching lines @@
   aura::Window* parent = widget->GetNativeView();
   EXPECT_TRUE(wm::IsActiveWindow(parent));
 
   aura::Window* modal_parent = delegate->GetModalParent();
   EXPECT_NE(static_cast<aura::Window*>(NULL), modal_parent);
   EXPECT_NE(parent, modal_parent);
   EXPECT_FALSE(wm::IsActiveWindow(modal_parent));
 
   delegate->ShowChild();
   aura::Window* child = delegate->GetChild();
-  EXPECT_NE(static_cast<aura::Window*>(NULL), child);
+  EXPECT_NE(nullptr, child);
 
   EXPECT_TRUE(wm::IsActiveWindow(child));
   EXPECT_FALSE(wm::IsActiveWindow(modal_parent));
   EXPECT_FALSE(wm::IsActiveWindow(parent));
 
   EXPECT_TRUE(child->HasFocus());
   EXPECT_FALSE(modal_parent->HasFocus());
   EXPECT_FALSE(parent->HasFocus());
 
   wm::ActivateWindow(modal_parent);
@@ skipping 155 matching lines @@
   EXPECT_TRUE(wm::IsActiveWindow(w4.get()));
 
   wm::ActivateWindow(w3.get());
   EXPECT_TRUE(wm::IsActiveWindow(w4.get()));
 
   wm::ActivateWindow(w4.get());
   EXPECT_TRUE(wm::IsActiveWindow(w4.get()));
 }
 
 }  // namespace ash