Extract content dependency from keyboard code

ash/test/test_shell_delegate.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/test/test_shell_delegate.h"
 
 #include <limits>
 
 #include "ash/default_accessibility_delegate.h"
 #include "ash/gpu_support_stub.h"
 #include "ash/media_delegate.h"
 #include "ash/new_window_delegate.h"
 #include "ash/session/session_state_delegate.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
-#include "ash/test/content/keyboard_controller_proxy_stub.h"
+#include "ash/test/test_keyboard_ui.h"
 #include "ash/test/test_session_state_delegate.h"
 #include "ash/test/test_shelf_delegate.h"
 #include "ash/test/test_system_tray_delegate.h"
 #include "ash/test/test_user_wallpaper_delegate.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
 #include "base/logging.h"
 #include "ui/app_list/app_list_model.h"
 #include "ui/app_list/app_list_view_delegate.h"
 #include "ui/app_list/test/app_list_test_view_delegate.h"
@@ skipping 96 matching lines @@
 void TestShellDelegate::PreInit() {
 }
 
 void TestShellDelegate::PreShutdown() {
 }
 
 void TestShellDelegate::Exit() {
   num_exit_requests_++;
 }
 
-keyboard::KeyboardControllerProxy*
-    TestShellDelegate::CreateKeyboardControllerProxy() {
-  return new KeyboardControllerProxyStub();
+keyboard::KeyboardUI* TestShellDelegate::CreateKeyboardUI() {
+  return new TestKeyboardUI;
 }
 
 void TestShellDelegate::VirtualKeyboardActivated(bool activated) {
   FOR_EACH_OBSERVER(ash::VirtualKeyboardStateObserver,
                     keyboard_state_observer_list_,
                     OnVirtualKeyboardStateChanged(activated));
 }
 
 void TestShellDelegate::AddVirtualKeyboardStateObserver(
     VirtualKeyboardStateObserver* observer) {
@@ skipping 63 matching lines @@
 #if defined(OS_CHROMEOS)
   Shell* shell = Shell::GetInstance();
   static_cast<MediaDelegateImpl*>(shell->media_delegate())
       ->set_media_capture_state(state);
   shell->system_tray_notifier()->NotifyMediaCaptureChanged();
 #endif
 }
 
 }  // namespace test
 }  // namespace ash