Extract content dependency from keyboard code

ash/wm/always_on_top_controller_unittest.cc

Index: ash/wm/always_on_top_controller_unittest.cc
diff --git a/ash/wm/always_on_top_controller_unittest.cc b/ash/wm/always_on_top_controller_unittest.cc
index f2db7e01663e6f7da5b85c096c9e5580bda83932..2e23be83813616d4856bac451a80dd827bbb071d 100644
--- a/ash/wm/always_on_top_controller_unittest.cc
+++ b/ash/wm/always_on_top_controller_unittest.cc
@@ -11,8 +11,8 @@
 #include "ash/wm/workspace/workspace_layout_manager.h"
 #include "base/command_line.h"
 #include "ui/keyboard/keyboard_controller.h"
-#include "ui/keyboard/keyboard_controller_proxy.h"
 #include "ui/keyboard/keyboard_switches.h"
+#include "ui/keyboard/keyboard_ui.h"
 #include "ui/keyboard/keyboard_util.h"
 
 namespace ash {
@@ -74,8 +74,8 @@ TEST_F(VirtualKeyboardAlwaysOnTopControllerTest, NotifyKeyboardBoundsChanged) {
       Shell::GetContainer(root_window, kShellWindowId_VirtualKeyboardContainer);
   ASSERT_TRUE(keyboard_container);
   keyboard_container->Show();
-  keyboard::KeyboardControllerProxy* proxy = keyboard_controller->proxy();
-  aura::Window* keyboard_window = proxy->GetKeyboardWindow();
+  aura::Window* keyboard_window =
+      keyboard_controller->ui()->GetKeyboardWindow();
   keyboard_container->AddChild(keyboard_window);
   keyboard_window->set_owned_by_parent(false);
   const int kKeyboardHeight = 200;