Make keyboard controller a singleton.

chrome/browser/ui/ash/keyboard_controller_browsertest.cc

 // Copyright 2014 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/shell.h"
 #include "base/command_line.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/url_constants.h"
 #include "ui/base/ime/dummy_text_input_client.h"
@@ skipping 17 matching lines @@
 
   // Ensure that the virtual keyboard is enabled.
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     command_line->AppendSwitch(
         keyboard::switches::kEnableVirtualKeyboard);
     command_line->AppendSwitch(
         keyboard::switches::kEnableInputView);
   }
 
   keyboard::KeyboardControllerProxy* proxy() {
-    return ash::Shell::GetInstance()->keyboard_controller()->proxy();
+    return keyboard::KeyboardController::GetInstance()->proxy();
   }
 
  protected:
   void SetFocus(ui::TextInputClient* client) {
     ui::InputMethod* input_method = proxy()->GetInputMethod();
     input_method->SetFocusedTextInputClient(client);
     if (client && client->GetTextInputType() != ui::TEXT_INPUT_TYPE_NONE)
       input_method->ShowImeIfNeeded();
   }
 
@@ skipping 21 matching lines @@
             GURL(content::kAboutBlankURL));
 
   SetFocus(&input_client_1);
   EXPECT_EQ(test_api->keyboard_contents()->GetURL(),
             GURL(keyboard::kKeyboardURL));
 
   SetFocus(&input_client_2);
   EXPECT_EQ(test_api->keyboard_contents()->GetURL(),
             GURL(content::kAboutBlankURL));
 }