Make keyboard controller a singleton.

chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc

Index: chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc
diff --git a/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc b/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc
index 62c95e741503bbb71052ca11532b486bdfafd0ab..b1f8062228142b437ce4c40c09fc0eacc3d0c11f 100644
--- a/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc
+++ b/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc
@@ -18,6 +18,7 @@
 #include "ui/gfx/screen.h"
 #include "ui/gfx/screen_type_delegate.h"
 #include "ui/keyboard/keyboard.h"
+#include "ui/keyboard/keyboard_controller.h"
 #include "ui/keyboard/keyboard_util.h"
 
 #if defined(OS_CHROMEOS)
@@ -97,7 +98,7 @@ void ChromeBrowserMainExtraPartsAsh::PostProfileInit() {
   // activation to UpdateWindow() in virtual_keyboard_window_controller.cc.
   if (!keyboard::IsKeyboardUsabilityExperimentEnabled()) {
     ash::Shell::GetPrimaryRootWindowController()->ActivateKeyboard(
-        ash::Shell::GetInstance()->keyboard_controller());
+        keyboard::KeyboardController::GetInstance());
   }
 }