More unittests passing with new focus controller.

ash/wm/window_manager_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/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/shell_test_api.h"
 #include "ash/test/test_activation_delegate.h"
 #include "ash/wm/activation_controller.h"
 #include "ash/wm/cursor_manager.h"
 #include "ash/wm/window_util.h"
 #include "ui/aura/client/activation_client.h"
 #include "ui/aura/client/activation_delegate.h"
 #include "ui/aura/client/focus_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/aura_test_base.h"
 #include "ui/aura/test/event_generator.h"
 #include "ui/aura/test/test_event_handler.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/base/cursor/cursor.h"
 #include "ui/base/events/event.h"
 #include "ui/base/hit_test.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/corewm/compound_event_filter.h"
+#include "ui/views/corewm/corewm_switches.h"
 #include "ui/views/corewm/input_method_event_filter.h"
 
 namespace {
 
 base::TimeDelta getTime() {
   return base::Time::NowFromSystemTime() - base::Time();
 }
 
 // A slightly changed TestEventHandler which can be configured to return a
 // specified value for key/mouse event handling.
@@ skipping 188 matching lines @@
 TEST_F(WindowManagerTest, ActivateOnMouse) {
   aura::RootWindow* root_window = Shell::GetPrimaryRootWindow();
 
   test::TestActivationDelegate d1;
   aura::test::TestWindowDelegate wd;
   scoped_ptr<aura::Window> w1(CreateTestWindowInShellWithDelegate(
       &wd, -1, gfx::Rect(10, 10, 50, 50)));
   d1.SetWindow(w1.get());
   test::TestActivationDelegate d2;
   scoped_ptr<aura::Window> w2(CreateTestWindowInShellWithDelegate(
-      &wd, -1, gfx::Rect(70, 70, 50, 50)));
+      &wd, -2, gfx::Rect(70, 70, 50, 50)));
   d2.SetWindow(w2.get());
 
   aura::client::FocusClient* focus_client =
       aura::client::GetFocusClient(w1.get());
 
   d1.Clear();
   d2.Clear();
 
   // Activate window1.
   wm::ActivateWindow(w1.get());
@@ skipping 35 matching lines @@
     EXPECT_EQ(0, d2.activated_count());
     EXPECT_EQ(0, d2.lost_active_count());
     d1.Clear();
     d2.Clear();
   }
 
   // Destroy window2, this should make window1 active.
   d1.set_activate(true);
   w2.reset();
   EXPECT_EQ(0, d2.activated_count());
-  EXPECT_EQ(0, d2.lost_active_count());
+  EXPECT_EQ(views::corewm::UseFocusController() ? 1 : 0,
+            d2.lost_active_count());
   EXPECT_TRUE(wm::IsActiveWindow(w1.get()));
   EXPECT_EQ(w1.get(), focus_client->GetFocusedWindow());
   EXPECT_EQ(1, d1.activated_count());
   EXPECT_EQ(0, d1.lost_active_count());
 
   // Clicking an active window with a child shouldn't steal the
   // focus from the child.
   {
     scoped_ptr<aura::Window> w11(CreateTestWindowWithDelegate(
-          &wd, -1, gfx::Rect(10, 10, 10, 10), w1.get()));
+          &wd, -11, gfx::Rect(10, 10, 10, 10), w1.get()));
     aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
                                          w11.get());
     // First set the focus to the child |w11|.
     generator.ClickLeftButton();
     EXPECT_EQ(w11.get(), focus_client->GetFocusedWindow());
     EXPECT_EQ(w1.get(), wm::GetActiveWindow());
 
     // Then click the parent active window. The focus shouldn't move.
     gfx::Point left_top = w1->bounds().origin();
     aura::Window::ConvertPointToTarget(w1->parent(), root_window, &left_top);
@@ skipping 84 matching lines @@
   EXPECT_EQ(0, d1.lost_active_count());
   EXPECT_EQ(0, d2.activated_count());
   EXPECT_EQ(0, d2.lost_active_count());
   d1.Clear();
   d2.Clear();
 
   // Destroy window2, this should make window1 active.
   d1.set_activate(true);
   w2.reset();
   EXPECT_EQ(0, d2.activated_count());
-  EXPECT_EQ(0, d2.lost_active_count());
+  EXPECT_EQ(views::corewm::UseFocusController() ? 1 : 0,
+            d2.lost_active_count());
   EXPECT_TRUE(wm::IsActiveWindow(w1.get()));
   EXPECT_EQ(w1.get(), focus_client->GetFocusedWindow());
   EXPECT_EQ(1, d1.activated_count());
   EXPECT_EQ(0, d1.lost_active_count());
 }
 
 TEST_F(WindowManagerTest, MouseEventCursors) {
   aura::RootWindow* root_window = Shell::GetPrimaryRootWindow();
 
   // Create a window.
@@ skipping 260 matching lines @@
   EXPECT_TRUE(cursor_manager->IsCursorVisible());
   root_window->AsRootWindowHostDelegate()->OnHostTouchEvent(&touch_pressed2);
   EXPECT_FALSE(cursor_manager->IsCursorVisible());
   root_window->AsRootWindowHostDelegate()->OnHostMouseEvent(&mouse_moved);
   EXPECT_TRUE(cursor_manager->IsCursorVisible());
   root_window->AsRootWindowHostDelegate()->OnHostTouchEvent(&touch_released2);
   EXPECT_TRUE(cursor_manager->IsCursorVisible());
 }
 
 }  // namespace ash