Expose sky KeyboardService in android mojo_shell

shell/android/native_viewport_application_loader.h

 // 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.
 
 #ifndef MOJO_SHELL_ANDROID_NATIVE_VIEWPORT_APPLICATION_LOADER_H_
 #define MOJO_SHELL_ANDROID_NATIVE_VIEWPORT_APPLICATION_LOADER_H_
 
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/interface_factory.h"
 #include "mojo/services/gpu/public/interfaces/gpu.mojom.h"
 #include "mojo/services/keyboard/public/interfaces/keyboard.mojom.h"
 #include "mojo/services/native_viewport/public/interfaces/native_viewport.mojom.h"
 #include "services/gles2/gpu_impl.h"
 #include "shell/application_manager/application_loader.h"
 
 namespace gles2 {
 class GpuState;
 }
 
 namespace mojo {
 class ApplicationImpl;
 }  // namespace mojo
 
 namespace shell {
 
 class NativeViewportApplicationLoader
     : public ApplicationLoader,
       public mojo::ApplicationDelegate,
-      public mojo::InterfaceFactory<mojo::Keyboard>,
+      public mojo::InterfaceFactory<keyboard::KeyboardService>,
       public mojo::InterfaceFactory<mojo::NativeViewport>,
       public mojo::InterfaceFactory<mojo::Gpu> {
  public:
   NativeViewportApplicationLoader();
   ~NativeViewportApplicationLoader();
 
  private:
   // ApplicationLoader implementation.
   void Load(
       const GURL& url,
       mojo::InterfaceRequest<mojo::Application> application_request) override;
 
   // mojo::ApplicationDelegate implementation.
   bool ConfigureIncomingConnection(
       mojo::ApplicationConnection* connection) override;
 
   // mojo::InterfaceFactory<mojo::NativeViewport> implementation.
   void Create(mojo::ApplicationConnection* connection,
               mojo::InterfaceRequest<mojo::NativeViewport> request) override;
 
   // mojo::InterfaceFactory<mojo::Gpu> implementation.
   void Create(mojo::ApplicationConnection* connection,
               mojo::InterfaceRequest<mojo::Gpu> request) override;
 
-  // mojo::InterfaceFactory<mojo::Keyboard> implementation.
-  void Create(mojo::ApplicationConnection* connection,
-              mojo::InterfaceRequest<mojo::Keyboard> request) override;
+  // mojo::InterfaceFactory<keyboard::KeyboardService> implementation.
+  void Create(
+      mojo::ApplicationConnection* connection,
+      mojo::InterfaceRequest<keyboard::KeyboardService> request) override;
 
   scoped_refptr<gles2::GpuState> gpu_state_;
   scoped_ptr<mojo::ApplicationImpl> app_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeViewportApplicationLoader);
 };
 
 }  // namespace shell
 
 #endif  // MOJO_SHELL_ANDROID_NATIVE_VIEWPORT_APPLICATION_LOADER_H_