Revert of Ash: Inline InitKeyboard, and make the caller of it call CreateKeyboard.

ash/shell.cc

Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 403796e0ed5871d9f28909811a8de2143ec18833..193274ebc6e91b25d84f62eab6593c070b188724 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -353,22 +353,7 @@
 }
 
 void Shell::CreateKeyboard() {
-  if (keyboard::IsKeyboardEnabled()) {
-    if (keyboard::KeyboardController::GetInstance()) {
-      RootWindowControllerList controllers = GetAllRootWindowControllers();
-      for (RootWindowControllerList::iterator iter = controllers.begin();
-           iter != controllers.end(); ++iter) {
-        (*iter)->DeactivateKeyboard(
-            keyboard::KeyboardController::GetInstance());
-      }
-    }
-    keyboard::KeyboardController::ResetInstance(
-        new keyboard::KeyboardController(shell_delegate_->CreateKeyboardUI(),
-                                         virtual_keyboard_controller_.get()));
-    for (auto& observer : shell_observers_)
-      observer.OnKeyboardControllerCreated();
-  }
-
+  InitKeyboard();
   GetPrimaryRootWindowController()->ActivateKeyboard(
       keyboard::KeyboardController::GetInstance());
 }