Rework FocusManager as FocusClient.

ash/wm/custom_frame_view_ash_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/custom_frame_view_ash.h"
 
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/maximize_bubble_controller.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace/frame_maximize_button.h"
 #include "ash/wm/workspace/snap_sizer.h"
 #include "base/command_line.h"
 #include "ui/aura/aura_switches.h"
 #include "ui/aura/client/aura_constants.h"
-#include "ui/aura/focus_manager.h"
+#include "ui/aura/client/focus_client.h"
 #include "ui/aura/test/event_generator.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/base/gestures/gesture_configuration.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/test/test_views_delegate.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
 namespace ash {
@@ skipping 414 matching lines @@
   CustomFrameViewAsh::TestApi test(frame);
   ash::FrameMaximizeButton* maximize_button = test.maximize_button();
   maximize_button->set_bubble_appearance_delay_ms(0);
   gfx::Point button_pos = maximize_button->GetBoundsInScreen().CenterPoint();
   gfx::Point off_pos(button_pos.x() + 100, button_pos.y() + 100);
 
   aura::test::EventGenerator generator(window->GetRootWindow(), off_pos);
   EXPECT_FALSE(maximize_button->maximizer());
   EXPECT_TRUE(ash::wm::IsWindowNormal(window));
 
-  aura::Window* active = window->GetFocusManager()->GetFocusedWindow();
+  aura::Window* active =
+      aura::client::GetFocusClient(window)->GetFocusedWindow();
 
   // Move the mouse cursor over the button to bring up the maximizer bubble.
   generator.MoveMouseTo(button_pos);
   EXPECT_TRUE(maximize_button->maximizer());
 
   // Check that the focused window is still the same.
-  EXPECT_EQ(active, window->GetFocusManager()->GetFocusedWindow());
+  EXPECT_EQ(active, aura::client::GetFocusClient(window)->GetFocusedWindow());
 }
 
 TEST_F(CustomFrameViewAshTest, MaximizeTap) {
   views::Widget* widget = CreateWidget();
   aura::Window* window = widget->GetNativeWindow();
   aura::RootWindow* root_window = window->GetRootWindow();
   CustomFrameViewAsh* frame = custom_frame_view_ash(widget);
   CustomFrameViewAsh::TestApi test(frame);
   ash::FrameMaximizeButton* maximize_button = test.maximize_button();
   gfx::Point button_pos = maximize_button->GetBoundsInScreen().CenterPoint();
@@ skipping 220 matching lines @@
 
   // We simulate the keystroke by calling minimizeWindow directly.
   wm::MinimizeWindow(window);
 
   EXPECT_TRUE(ash::wm::IsWindowMinimized(window));
   EXPECT_FALSE(maximize_button->maximizer());
 }
 
 }  // namespace internal
 }  // namespace ash