Expose sky KeyboardService in android mojo_shell

shell/android/native_viewport_application_loader.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 "shell/android/native_viewport_application_loader.h"
 
 #include "mojo/public/cpp/application/application_impl.h"
 #include "services/gles2/gpu_state.h"
 #include "services/native_viewport/native_viewport_impl.h"
 #include "shell/android/keyboard_impl.h"
@@ skipping 13 matching lines @@
     const GURL& url,
     InterfaceRequest<mojo::Application> application_request) {
   DCHECK(application_request.is_pending());
   app_.reset(new mojo::ApplicationImpl(this, application_request.Pass()));
 }
 
 bool NativeViewportApplicationLoader::ConfigureIncomingConnection(
     ApplicationConnection* connection) {
   connection->AddService<mojo::NativeViewport>(this);
   connection->AddService<mojo::Gpu>(this);
-  connection->AddService<mojo::Keyboard>(this);
+  connection->AddService<keyboard::KeyboardService>(this);
   return true;
 }
 
 void NativeViewportApplicationLoader::Create(
     ApplicationConnection* connection,
     InterfaceRequest<mojo::NativeViewport> request) {
   if (!gpu_state_)
     gpu_state_ = new gles2::GpuState;
   new native_viewport::NativeViewportImpl(false, gpu_state_, request.Pass());
 }
 
 void NativeViewportApplicationLoader::Create(
     ApplicationConnection* connection,
-    InterfaceRequest<mojo::Keyboard> request) {
-  new KeyboardImpl(request.Pass());
+    InterfaceRequest<keyboard::KeyboardService> request) {
+  KeyboardImpl::CreateKeyboardImpl(request.Pass());
 }
 
 void NativeViewportApplicationLoader::Create(
     ApplicationConnection* connection,
     InterfaceRequest<mojo::Gpu> request) {
   if (!gpu_state_)
     gpu_state_ = new gles2::GpuState;
   new gles2::GpuImpl(request.Pass(), gpu_state_);
 }
 
 }  // namespace shell