Extract content dependency from keyboard code

ash/shell.cc

Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 20f464dd964a61c1398d8ef4c4699f8db3499582..72eb8eb32f0da8cce391e8ebf7fa6e97ddfcb9ca 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -96,7 +96,6 @@
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/screen.h"
-#include "ui/keyboard/keyboard.h"
 #include "ui/keyboard/keyboard_controller.h"
 #include "ui/keyboard/keyboard_switches.h"
 #include "ui/keyboard/keyboard_util.h"
@@ -959,12 +958,6 @@ void Shell::Init(const ShellInitParams& init_params) {
   keyboard_metrics_filter_.reset(new KeyboardUMAEventFilter);
   AddPreTargetHandler(keyboard_metrics_filter_.get());
 
-  // The keyboard system must be initialized before the RootWindowController is
-  // created.
-#if defined(OS_CHROMEOS)
-    keyboard::InitializeKeyboard();
-#endif
-
 #if defined(OS_CHROMEOS)
   sticky_keys_controller_.reset(new StickyKeysController);
 #endif
@@ -1105,10 +1098,8 @@ void Shell::InitKeyboard() {
             keyboard::KeyboardController::GetInstance());
       }
     }
-    keyboard::KeyboardControllerProxy* proxy =
-        delegate_->CreateKeyboardControllerProxy();
     keyboard::KeyboardController::ResetInstance(
-        new keyboard::KeyboardController(proxy));
+        new keyboard::KeyboardController(delegate_->CreateKeyboardUI()));
   }
 }