Second try for

ash/wm/activation_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 "ash/wm/activation_controller.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/test_activation_delegate.h"
@@ skipping 173 matching lines @@
 // Test if the clicking on a menu picks the transient parent as activatable
 // window.
 TEST_F(ActivationControllerTest, ClickOnMenu) {
   aura::test::TestWindowDelegate wd;
   TestActivationDelegate ad1;
   TestActivationDelegate ad2(false);
 
   scoped_ptr<aura::Window> w1(aura::test::CreateTestWindowWithDelegate(
       &wd, 1, gfx::Rect(100, 100), NULL));
   ad1.SetWindow(w1.get());
-  EXPECT_TRUE(wm::IsActiveWindow(NULL));
+  EXPECT_EQ(NULL, wm::GetActiveWindow());
 
   // Clicking on an activatable window activtes the window.
   aura::test::EventGenerator generator(Shell::GetRootWindow(), w1.get());
   generator.ClickLeftButton();
   EXPECT_TRUE(wm::IsActiveWindow(w1.get()));
 
   // Creates a menu that covers the transient parent.
   scoped_ptr<aura::Window> menu(aura::test::CreateTestWindowWithDelegateAndType(
       &wd, aura::client::WINDOW_TYPE_MENU, 2, gfx::Rect(100, 100), NULL));
   ad2.SetWindow(menu.get());
@@ skipping 47 matching lines @@
   scoped_ptr<aura::Window> w2(aura::test::CreateTestWindowWithDelegate(
       NULL, 1, gfx::Rect(10, 10, 50, 50), NULL));
 
   // Activate w1.
   wm::ActivateWindow(w1.get());
   EXPECT_TRUE(wm::IsActiveWindow(w1.get()));
   EXPECT_EQ(1, ad1.activated_count());
   // Should not have gotten a OnLostActive yet.
   EXPECT_EQ(0, ad1.lost_active_count());
 
-  // ActivateWindow(NULL) should deactivate the active window.
-  wm::ActivateWindow(NULL);
+  // Deactivate the active window.
+  wm::DeactivateWindow(w1.get());
   EXPECT_FALSE(wm::IsActiveWindow(w1.get()));
   EXPECT_EQ(1, ad1.lost_active_count());
   EXPECT_FALSE(ad1.window_was_active());
 
   // Activate w1 again. w1 should have gotten OnActivated.
   wm::ActivateWindow(w1.get());
   EXPECT_EQ(2, ad1.activated_count());
   EXPECT_EQ(1, ad1.lost_active_count());
 
   // Reset the delegate.
@@ skipping 70 matching lines @@
 
   // Try focusing |w21|. Same rules apply.
   EXPECT_FALSE(wm::IsActiveWindow(w2.get()));
   EXPECT_FALSE(w21->HasFocus());
   EXPECT_TRUE(wm::IsActiveWindow(w1.get()));
   EXPECT_TRUE(w1->HasFocus());
 }
 
 }  // namespace test
 }  // namespace ash