Moves mojo/services/* to components/* part 1

I'm splitting this up in chunks so I can actually use the cq.

R=ben@chromium.org

Review URL: https://codereview.chromium.org/1097183002

Cr-Commit-Position: refs/heads/master@{#325942}

40 files changed, 69 insertions, 217 deletions

diff --git a/mojo/services/clipboard/BUILD.gn b/components/clipboard/BUILD.gn
index cfdcb25..cfdcb25 100644
--- a/mojo/services/clipboard/BUILD.gn
+++ b/components/clipboard/BUILD.gn
diff --git a/mojo/services/clipboard/DEPS b/components/clipboard/DEPS
index e6505c5..6e68eac 100644
--- a/mojo/services/clipboard/DEPS
+++ b/components/clipboard/DEPS
@@ -1,4 +1,6 @@
 include_rules = [
   "+mojo/application",
+  "+mojo/common",
   "+third_party/mojo_services/src/clipboard",
+  "+third_party/mojo/src/mojo/public",
 ]
diff --git a/mojo/services/clipboard/clipboard_apptest.cc b/components/clipboard/clipboard_apptest.cc
index cb8f1e6..bda9469 100644
--- a/mojo/services/clipboard/clipboard_apptest.cc
+++ b/components/clipboard/clipboard_apptest.cc
@@ -6,7 +6,7 @@
 #include "base/run_loop.h"
 #include "mojo/application/application_test_base_chromium.h"
 #include "mojo/common/common_type_converters.h"
-#include "mojo/public/cpp/application/application_impl.h"
+#include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h"
 #include "third_party/mojo_services/src/clipboard/public/interfaces/clipboard.mojom.h"
 
 using mojo::Array;
diff --git a/mojo/services/clipboard/clipboard_standalone_impl.cc b/components/clipboard/clipboard_standalone_impl.cc
index e783af7..2cf03c2 100644
--- a/mojo/services/clipboard/clipboard_standalone_impl.cc
+++ b/components/clipboard/clipboard_standalone_impl.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/services/clipboard/clipboard_standalone_impl.h"
+#include "components/clipboard/clipboard_standalone_impl.h"
 
 #include <string.h>
 
-#include "mojo/public/cpp/bindings/array.h"
-#include "mojo/public/cpp/bindings/callback.h"
-#include "mojo/public/cpp/bindings/string.h"
+#include "third_party/mojo/src/mojo/public/cpp/bindings/array.h"
+#include "third_party/mojo/src/mojo/public/cpp/bindings/callback.h"
+#include "third_party/mojo/src/mojo/public/cpp/bindings/string.h"
 
 using mojo::Array;
 using mojo::Map;
diff --git a/mojo/services/clipboard/clipboard_standalone_impl.h b/components/clipboard/clipboard_standalone_impl.h
index 6c5d828..eecae95 100644
--- a/mojo/services/clipboard/clipboard_standalone_impl.h
+++ b/components/clipboard/clipboard_standalone_impl.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SERVICES_CLIPBOARD_CLIPBOARD_STANDALONE_IMPL_H_
-#define SERVICES_CLIPBOARD_CLIPBOARD_STANDALONE_IMPL_H_
+#ifndef COMPONENTS_CLIPBOARD_CLIPBOARD_STANDALONE_IMPL_H_
+#define COMPONENTS_CLIPBOARD_CLIPBOARD_STANDALONE_IMPL_H_
 
 #include <base/memory/scoped_ptr.h>
 #include <string>
 
-#include "mojo/public/cpp/bindings/strong_binding.h"
+#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h"
 #include "third_party/mojo_services/src/clipboard/public/interfaces/clipboard.mojom.h"
 
 namespace clipboard {
@@ -59,4 +59,4 @@ class ClipboardStandaloneImpl : public mojo::Clipboard {
 
 }  // namespace clipboard
 
-#endif  // SERVICES_CLIPBOARD_CLIPBOARD_STANDALONE_IMPL_H_
+#endif  // COMPONENTS_CLIPBOARD_CLIPBOARD_STANDALONE_IMPL_H_
diff --git a/mojo/services/clipboard/main.cc b/components/clipboard/main.cc
index 0c5e17a..75667d1 100644
--- a/mojo/services/clipboard/main.cc
+++ b/components/clipboard/main.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "components/clipboard/clipboard_standalone_impl.h"
 #include "mojo/application/application_runner_chromium.h"
-#include "mojo/public/c/system/main.h"
-#include "mojo/public/cpp/application/application_connection.h"
-#include "mojo/public/cpp/application/application_delegate.h"
-#include "mojo/public/cpp/application/interface_factory.h"
-#include "mojo/services/clipboard/clipboard_standalone_impl.h"
+#include "third_party/mojo/src/mojo/public/c/system/main.h"
+#include "third_party/mojo/src/mojo/public/cpp/application/application_connection.h"
+#include "third_party/mojo/src/mojo/public/cpp/application/application_delegate.h"
+#include "third_party/mojo/src/mojo/public/cpp/application/interface_factory.h"
 
 class Delegate : public mojo::ApplicationDelegate,
                  public mojo::InterfaceFactory<mojo::Clipboard> {
diff --git a/mojo/services/gles2/BUILD.gn b/components/gles2/BUILD.gn
index a34b9b3..c429972 100644
--- a/mojo/services/gles2/BUILD.gn
+++ b/components/gles2/BUILD.gn
@@ -15,10 +15,10 @@ source_set("gles2") {
     "command_buffer_driver.h",
     "command_buffer_impl.cc",
     "command_buffer_impl.h",
-    "gpu_state.cc",
-    "gpu_state.h",
     "gpu_impl.cc",
     "gpu_impl.h",
+    "gpu_state.cc",
+    "gpu_state.h",
   ]
 
   public_deps = [
diff --git a/mojo/services/gles2/DEPS b/components/gles2/DEPS
index f34d3eb..916b0dc 100644
--- a/mojo/services/gles2/DEPS
+++ b/components/gles2/DEPS
@@ -1,6 +1,7 @@
 include_rules = [
   "+gpu",
   "+mojo/converters",
+  "+third_party/mojo/src/mojo/public",
   "+third_party/mojo_services/src/geometry",
   "+third_party/mojo_services/src/gpu",
   "+ui",
diff --git a/mojo/services/gles2/command_buffer_driver.cc b/components/gles2/command_buffer_driver.cc
index 3ae617b..cfd2a7d 100644
--- a/mojo/services/gles2/command_buffer_driver.cc
+++ b/components/gles2/command_buffer_driver.cc
@@ -2,11 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/services/gles2/command_buffer_driver.h"
+#include "components/gles2/command_buffer_driver.h"
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/shared_memory.h"
+#include "components/gles2/command_buffer_type_conversions.h"
+#include "components/gles2/mojo_buffer_backing.h"
 #include "gpu/command_buffer/common/constants.h"
 #include "gpu/command_buffer/common/value_state.h"
 #include "gpu/command_buffer/service/command_buffer_service.h"
@@ -18,8 +20,6 @@
 #include "gpu/command_buffer/service/memory_tracking.h"
 #include "gpu/command_buffer/service/sync_point_manager.h"
 #include "gpu/command_buffer/service/valuebuffer_manager.h"
-#include "mojo/services/gles2/command_buffer_type_conversions.h"
-#include "mojo/services/gles2/mojo_buffer_backing.h"
 #include "ui/gfx/vsync_provider.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_surface.h"
diff --git a/mojo/services/gles2/command_buffer_driver.h b/components/gles2/command_buffer_driver.h
index 5006567..d5627f8 100644
--- a/mojo/services/gles2/command_buffer_driver.h
+++ b/components/gles2/command_buffer_driver.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SERVICES_GLES2_COMMAND_BUFFER_DRIVER_H_
-#define SERVICES_GLES2_COMMAND_BUFFER_DRIVER_H_
+#ifndef COMPONENTS_GLES2_COMMAND_BUFFER_DRIVER_H_
+#define COMPONENTS_GLES2_COMMAND_BUFFER_DRIVER_H_
 
 #include "base/callback.h"
 #include "base/macros.h"
@@ -100,4 +100,4 @@ class CommandBufferDriver {
 
 }  // namespace gles2
 
-#endif  // SERVICES_GLES2_COMMAND_BUFFER_DRIVER_H_
+#endif  // COMPONENTS_GLES2_COMMAND_BUFFER_DRIVER_H_
diff --git a/mojo/services/gles2/command_buffer_impl.cc b/components/gles2/command_buffer_impl.cc
index b89279f..358bcbf 100644
--- a/mojo/services/gles2/command_buffer_impl.cc
+++ b/components/gles2/command_buffer_impl.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/services/gles2/command_buffer_impl.h"
+#include "components/gles2/command_buffer_impl.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
+#include "components/gles2/command_buffer_driver.h"
 #include "gpu/command_buffer/service/sync_point_manager.h"
-#include "mojo/services/gles2/command_buffer_driver.h"
 
 namespace gles2 {
 namespace {
diff --git a/mojo/services/gles2/command_buffer_impl.h b/components/gles2/command_buffer_impl.h
index 61b33a2..8d8c9e9 100644
--- a/mojo/services/gles2/command_buffer_impl.h
+++ b/components/gles2/command_buffer_impl.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SERVICES_GLES2_COMMAND_BUFFER_IMPL_H_
-#define SERVICES_GLES2_COMMAND_BUFFER_IMPL_H_
+#ifndef COMPONENTS_GLES2_COMMAND_BUFFER_IMPL_H_
+#define COMPONENTS_GLES2_COMMAND_BUFFER_IMPL_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
@@ -68,4 +68,4 @@ class CommandBufferImpl : public mojo::CommandBuffer {
 
 }  // namespace gles2
 
-#endif  // SERVICES_GLES2_COMMAND_BUFFER_IMPL_H_
+#endif  // COMPONENTS_GLES2_COMMAND_BUFFER_IMPL_H_
diff --git a/mojo/services/gles2/command_buffer_type_conversions.cc b/components/gles2/command_buffer_type_conversions.cc
index 9c068be..35de081 100644
--- a/mojo/services/gles2/command_buffer_type_conversions.cc
+++ b/components/gles2/command_buffer_type_conversions.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/services/gles2/command_buffer_type_conversions.h"
+#include "components/gles2/command_buffer_type_conversions.h"
 
 #include "third_party/mojo_services/src/gpu/public/interfaces/command_buffer.mojom.h"
 
diff --git a/mojo/services/gles2/command_buffer_type_conversions.h b/components/gles2/command_buffer_type_conversions.h
index 9243a56..1ac166f 100644
--- a/mojo/services/gles2/command_buffer_type_conversions.h
+++ b/components/gles2/command_buffer_type_conversions.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SERVICES_GLES2_COMMAND_BUFFER_TYPE_CONVERSIONS_H_
-#define SERVICES_GLES2_COMMAND_BUFFER_TYPE_CONVERSIONS_H_
+#ifndef COMPONENTS_GLES2_COMMAND_BUFFER_TYPE_CONVERSIONS_H_
+#define COMPONENTS_GLES2_COMMAND_BUFFER_TYPE_CONVERSIONS_H_
 
 #include "gpu/command_buffer/common/capabilities.h"
 #include "gpu/command_buffer/common/command_buffer.h"
@@ -64,4 +64,4 @@ struct TypeConverter<gpu::Capabilities, GpuCapabilitiesPtr> {
 
 }  // namespace gles2
 
-#endif  // SERVICES_GLES2_COMMAND_BUFFER_TYPE_CONVERSIONS_H_
+#endif  // COMPONENTS_GLES2_COMMAND_BUFFER_TYPE_CONVERSIONS_H_
diff --git a/mojo/services/gles2/gpu_impl.cc b/components/gles2/gpu_impl.cc
index 304da8d..ef90f02 100644
--- a/mojo/services/gles2/gpu_impl.cc
+++ b/components/gles2/gpu_impl.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/services/gles2/gpu_impl.h"
+#include "components/gles2/gpu_impl.h"
 
+#include "components/gles2/command_buffer_driver.h"
+#include "components/gles2/command_buffer_impl.h"
 #include "gpu/command_buffer/service/mailbox_manager.h"
 #include "gpu/command_buffer/service/mailbox_manager_impl.h"
 #include "gpu/command_buffer/service/sync_point_manager.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
-#include "mojo/services/gles2/command_buffer_driver.h"
-#include "mojo/services/gles2/command_buffer_impl.h"
 #include "ui/gl/gl_share_group.h"
 #include "ui/gl/gl_surface.h"
 
diff --git a/mojo/services/gles2/gpu_impl.h b/components/gles2/gpu_impl.h
index 3e50a9a..c270076 100644
--- a/mojo/services/gles2/gpu_impl.h
+++ b/components/gles2/gpu_impl.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SERVICES_GLES2_GPU_IMPL_H_
-#define SERVICES_GLES2_GPU_IMPL_H_
+#ifndef COMPONENTS_GLES2_GPU_IMPL_H_
+#define COMPONENTS_GLES2_GPU_IMPL_H_
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/threading/thread.h"
-#include "mojo/services/gles2/gpu_state.h"
+#include "components/gles2/gpu_state.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h"
 #include "third_party/mojo_services/src/geometry/public/interfaces/geometry.mojom.h"
@@ -46,4 +46,4 @@ class GpuImpl : public mojo::Gpu {
 
 }  // namespace gles2
 
-#endif  // SERVICES_GLES2_GPU_IMPL_H_
+#endif  // COMPONENTS_GLES2_GPU_IMPL_H_
diff --git a/mojo/services/gles2/gpu_state.cc b/components/gles2/gpu_state.cc
index 63d6e29..6468a26 100644
--- a/mojo/services/gles2/gpu_state.cc
+++ b/components/gles2/gpu_state.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 //
 
-#include "mojo/services/gles2/gpu_state.h"
+#include "components/gles2/gpu_state.h"
 
 namespace gles2 {
 
diff --git a/mojo/services/gles2/gpu_state.h b/components/gles2/gpu_state.h
index 1d75318..a9f9c59 100644
--- a/mojo/services/gles2/gpu_state.h
+++ b/components/gles2/gpu_state.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SERVICES_GLES2_GPU_STATE_H_
-#define SERVICES_GLES2_GPU_STATE_H_
+#ifndef COMPONENTS_GLES2_GPU_STATE_H_
+#define COMPONENTS_GLES2_GPU_STATE_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/single_thread_task_runner.h"
@@ -49,4 +49,4 @@ class GpuState : public base::RefCounted<GpuState> {
 
 }  // namespace gles2
 
-#endif  // SERVICES_GLES2_GPU_STATE_H_
+#endif  // COMPONENTS_GLES2_GPU_STATE_H_
diff --git a/mojo/services/gles2/mojo_buffer_backing.cc b/components/gles2/mojo_buffer_backing.cc
index 3e6c38e..f6e10da 100644
--- a/mojo/services/gles2/mojo_buffer_backing.cc
+++ b/components/gles2/mojo_buffer_backing.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/services/gles2/mojo_buffer_backing.h"
+#include "components/gles2/mojo_buffer_backing.h"
 
 #include "base/logging.h"
 
diff --git a/mojo/services/gles2/mojo_buffer_backing.h b/components/gles2/mojo_buffer_backing.h
index 6dfd509..6aa866d 100644
--- a/mojo/services/gles2/mojo_buffer_backing.h
+++ b/components/gles2/mojo_buffer_backing.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SERVICES_GLES2_MOJO_BUFFER_BACKING_H_
-#define SERVICES_GLES2_MOJO_BUFFER_BACKING_H_
+#ifndef COMPONENTS_GLES2_MOJO_BUFFER_BACKING_H_
+#define COMPONENTS_GLES2_MOJO_BUFFER_BACKING_H_
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
@@ -36,4 +36,4 @@ class MojoBufferBacking : public gpu::BufferBacking {
 
 }  // namespace gles2
 
-#endif  // SERVICES_GLES2_MOJO_BUFFER_BACKING_H_
+#endif  // COMPONENTS_GLES2_MOJO_BUFFER_BACKING_H_
diff --git a/mojo/gles2/BUILD.gn b/mojo/gles2/BUILD.gn
index 3c27743..c6e501a 100644
--- a/mojo/gles2/BUILD.gn
+++ b/mojo/gles2/BUILD.gn
@@ -16,9 +16,9 @@ source_set("gles2") {
   sources = [
     "command_buffer_client_impl.cc",
     "command_buffer_client_impl.h",
-    "gles2_impl.cc",
     "gles2_context.cc",
     "gles2_context.h",
+    "gles2_impl.cc",
   ]
 
   defines = [
@@ -36,6 +36,7 @@ source_set("gles2") {
   deps = [
     "//base",
     "//base/third_party/dynamic_annotations",
+    "//components/gles2:lib",
     "//gpu/command_buffer/client",
     "//gpu/command_buffer/client:gles2_cmd_helper",
     "//gpu/command_buffer/client:gles2_implementation",
@@ -47,7 +48,6 @@ source_set("gles2") {
     "//third_party/mojo/src/mojo/public/cpp/bindings",
     "//third_party/mojo/src/mojo/public/cpp/system",
     "//third_party/mojo_services/src/gpu/public/interfaces",
-    "//mojo/services/gles2:lib",
   ]
 
   include_dirs = [ ".." ]
diff --git a/mojo/gles2/DEPS b/mojo/gles2/DEPS
index aa72943..9aea877 100644
--- a/mojo/gles2/DEPS
+++ b/mojo/gles2/DEPS
@@ -1,4 +1,5 @@
 include_rules = [
+  "+components/gles2",
   "+gpu",
   "+third_party/mojo_services/src/gpu",
-]
\ No newline at end of file
+]
diff --git a/mojo/gles2/command_buffer_client_impl.cc b/mojo/gles2/command_buffer_client_impl.cc
index 37dc30c..abe95f6 100644
--- a/mojo/gles2/command_buffer_client_impl.cc
+++ b/mojo/gles2/command_buffer_client_impl.cc
@@ -8,8 +8,8 @@
 
 #include "base/logging.h"
 #include "base/process/process_handle.h"
-#include "mojo/services/gles2/command_buffer_type_conversions.h"
-#include "mojo/services/gles2/mojo_buffer_backing.h"
+#include "components/gles2/command_buffer_type_conversions.h"
+#include "components/gles2/mojo_buffer_backing.h"
 
 namespace gles2 {
 
diff --git a/mojo/services/BUILD.gn b/mojo/services/BUILD.gn
index 494785f..59775e4 100644
--- a/mojo/services/BUILD.gn
+++ b/mojo/services/BUILD.gn
@@ -19,7 +19,7 @@ group("services") {
 
   if (!is_component_build) {
     deps += [
-      "//mojo/services/clipboard",
+      "//components/clipboard",
       "//mojo/services/html_viewer",
       "//mojo/services/kiosk_wm:window_manager",
       "//mojo/services/native_viewport",
@@ -73,7 +73,7 @@ group("apptests") {
   ]
   if (!is_component_build) {
     deps += [
-      "//mojo/services/clipboard:apptests",
+      "//components/clipboard:apptests",
       "//mojo/services/html_viewer:apptests",
       "//mojo/services/network:apptests",
       "//mojo/services/view_manager:apptests",
diff --git a/mojo/services/keyboard/public/interfaces/BUILD.gn b/mojo/services/keyboard/public/interfaces/BUILD.gn
deleted file mode 100644
index 6aa9389..0000000
--- a/mojo/services/keyboard/public/interfaces/BUILD.gn
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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.
-
-import("//build/module_args/mojo.gni")
-import("$mojo_sdk_root/mojo/public/tools/bindings/mojom.gni")
-
-mojom("interfaces") {
-  sources = [
-    "keyboard.mojom",
-  ]
-}
diff --git a/mojo/services/keyboard/public/interfaces/keyboard.mojom b/mojo/services/keyboard/public/interfaces/keyboard.mojom
deleted file mode 100644
index d11253e..0000000
--- a/mojo/services/keyboard/public/interfaces/keyboard.mojom
+++ /dev/null
@@ -1,10 +0,0 @@
-// 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.
-
-module mojo;
-
-interface Keyboard {
-  Show();
-  Hide();
-};
diff --git a/mojo/services/native_viewport/BUILD.gn b/mojo/services/native_viewport/BUILD.gn
index 3e77370..39dee00 100644
--- a/mojo/services/native_viewport/BUILD.gn
+++ b/mojo/services/native_viewport/BUILD.gn
@@ -42,12 +42,12 @@ if (is_android) {
     deps = [
       ":lib",
       "//base",
+      "//components/gles2",
       "//mojo/application",
       "//mojo/common:tracing_impl",
       "//third_party/mojo/src/mojo/public/cpp/bindings:bindings",
       "//third_party/mojo_services/src/native_viewport/public/interfaces",
       "//third_party/mojo_services/src/native_viewport/public/cpp:args",
-      "//mojo/services/gles2",
       "//ui/events",
       "//ui/events/platform",
       "//ui/gl",
@@ -77,13 +77,13 @@ source_set("lib") {
 
   deps = [
     "//base",
+    "//components/gles2",
     "//gpu/command_buffer/service",
     "//mojo/application",
     "//mojo/common",
     "//mojo/converters/geometry",
     "//mojo/converters/input_events",
     "//mojo/environment:chromium",
-    "//mojo/services/gles2",
     "//third_party/mojo_services/src/geometry/public/interfaces",
     "//third_party/mojo_services/src/native_viewport/public/interfaces",
     "//ui/events",
diff --git a/mojo/services/native_viewport/DEPS b/mojo/services/native_viewport/DEPS
index 9c70113..cfb361f 100644
--- a/mojo/services/native_viewport/DEPS
+++ b/mojo/services/native_viewport/DEPS
@@ -1,7 +1,7 @@
 include_rules = [
+  "+components/gles2",
   "+mojo/application",
   "+mojo/converters",
-  "+mojo/services/gles2",
   "+third_party/mojo_services",
   "+ui",
 ]
diff --git a/mojo/services/native_viewport/main.cc b/mojo/services/native_viewport/main.cc
index 504e555..35f6bd2 100644
--- a/mojo/services/native_viewport/main.cc
+++ b/mojo/services/native_viewport/main.cc
@@ -7,6 +7,7 @@
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
+#include "components/gles2/gpu_impl.h"
 #include "mojo/application/application_runner_chromium.h"
 #include "mojo/common/tracing_impl.h"
 #include "mojo/public/c/system/main.h"
@@ -14,7 +15,6 @@
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/application/interface_factory_impl.h"
-#include "mojo/services/gles2/gpu_impl.h"
 #include "mojo/services/native_viewport/native_viewport_impl.h"
 #include "third_party/mojo_services/src/native_viewport/public/cpp/args.h"
 #include "ui/events/event_switches.h"
diff --git a/mojo/services/native_viewport/native_viewport_impl.cc b/mojo/services/native_viewport/native_viewport_impl.cc
index f5bcc27..6450d78 100644
--- a/mojo/services/native_viewport/native_viewport_impl.cc
+++ b/mojo/services/native_viewport/native_viewport_impl.cc
@@ -9,9 +9,9 @@
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/time/time.h"
+#include "components/gles2/gpu_state.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/public/cpp/application/interface_factory.h"
-#include "mojo/services/gles2/gpu_state.h"
 #include "mojo/services/native_viewport/platform_viewport_headless.h"
 #include "ui/events/event.h"
 
diff --git a/mojo/services/native_viewport/onscreen_context_provider.cc b/mojo/services/native_viewport/onscreen_context_provider.cc
index af72736..da72837 100644
--- a/mojo/services/native_viewport/onscreen_context_provider.cc
+++ b/mojo/services/native_viewport/onscreen_context_provider.cc
@@ -4,9 +4,9 @@
 
 #include "mojo/services/native_viewport/onscreen_context_provider.h"
 
-#include "mojo/services/gles2/command_buffer_driver.h"
-#include "mojo/services/gles2/command_buffer_impl.h"
-#include "mojo/services/gles2/gpu_state.h"
+#include "components/gles2/command_buffer_driver.h"
+#include "components/gles2/command_buffer_impl.h"
+#include "components/gles2/gpu_state.h"
 
 namespace native_viewport {
 
diff --git a/mojo/shell/BUILD.gn b/mojo/shell/BUILD.gn
index 10c5b2c..3620709 100644
--- a/mojo/shell/BUILD.gn
+++ b/mojo/shell/BUILD.gn
@@ -156,8 +156,6 @@ source_set("lib") {
       "android/android_handler_loader.h",
       "android/background_application_loader.cc",
       "android/background_application_loader.h",
-      "android/keyboard_impl.cc",
-      "android/keyboard_impl.h",
       "android/native_viewport_application_loader.cc",
       "android/native_viewport_application_loader.h",
       "android/ui_application_loader_android.cc",
@@ -167,9 +165,8 @@ source_set("lib") {
     deps += [
       ":jni_headers",
       ":run_android_application_function",
+      "//components/gles2",
       "//mojo/application:content_handler",
-      "//mojo/services/keyboard/public/interfaces",
-      "//mojo/services/gles2",
       "//mojo/services/native_viewport:lib",
     ]
   }
@@ -223,7 +220,6 @@ if (is_android) {
     sources = [
       "android/apk/src/org/chromium/mojo/shell/AndroidHandler.java",
       "android/apk/src/org/chromium/mojo/shell/Bootstrap.java",
-      "android/apk/src/org/chromium/mojo/shell/Keyboard.java",
       "android/apk/src/org/chromium/mojo/shell/ShellMain.java",
       "android/tests/src/org/chromium/mojo/shell/ShellTestBase.java",
     ]
@@ -267,7 +263,6 @@ if (is_android) {
     java_files = [
       "android/apk/src/org/chromium/mojo/shell/AndroidHandler.java",
       "android/apk/src/org/chromium/mojo/shell/FileHelper.java",
-      "android/apk/src/org/chromium/mojo/shell/Keyboard.java",
       "android/apk/src/org/chromium/mojo/shell/MojoShellActivity.java",
       "android/apk/src/org/chromium/mojo/shell/MojoShellApplication.java",
       "android/apk/src/org/chromium/mojo/shell/ShellMain.java",
diff --git a/mojo/shell/DEPS b/mojo/shell/DEPS
index 04fbd79..6c6ed51 100644
--- a/mojo/shell/DEPS
+++ b/mojo/shell/DEPS
@@ -1,4 +1,5 @@
 include_rules = [
+  "+components/gles2",
   "+crypto",
   "+jni",
   "+third_party/mojo_services",
diff --git a/mojo/shell/android/apk/src/org/chromium/mojo/shell/Keyboard.java b/mojo/shell/android/apk/src/org/chromium/mojo/shell/Keyboard.java
deleted file mode 100644
index e13ddea..0000000
--- a/mojo/shell/android/apk/src/org/chromium/mojo/shell/Keyboard.java
+++ /dev/null
@@ -1,35 +0,0 @@
-// 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.
-
-package org.chromium.mojo.shell;
-
-import android.app.Activity;
-import android.content.Context;
-import android.view.View;
-import android.view.inputmethod.InputMethodManager;
-
-import org.chromium.base.CalledByNative;
-import org.chromium.base.JNINamespace;
-
-/**
- * Interaction with the keyboard.
- */
-@JNINamespace("mojo::shell")
-public class Keyboard {
-    @CalledByNative
-    private static void showSoftKeyboard(Activity activity) {
-        View v = activity.getCurrentFocus();
-        InputMethodManager imm =
-                (InputMethodManager) activity.getSystemService(Context.INPUT_METHOD_SERVICE);
-        imm.showSoftInput(v, InputMethodManager.SHOW_IMPLICIT);
-    }
-
-    @CalledByNative
-    private static void hideSoftKeyboard(Activity activity) {
-        View v = activity.getCurrentFocus();
-        InputMethodManager imm =
-                (InputMethodManager) activity.getSystemService(Context.INPUT_METHOD_SERVICE);
-        imm.hideSoftInputFromWindow(v.getApplicationWindowToken(), 0);
-    }
-}
diff --git a/mojo/shell/android/keyboard_impl.cc b/mojo/shell/android/keyboard_impl.cc
deleted file mode 100644
index 60336bb..0000000
--- a/mojo/shell/android/keyboard_impl.cc
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2015 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 "mojo/shell/android/keyboard_impl.h"
-
-#include "base/android/jni_android.h"
-#include "base/logging.h"
-#include "jni/Keyboard_jni.h"
-
-namespace mojo {
-namespace shell {
-
-KeyboardImpl::KeyboardImpl(InterfaceRequest<Keyboard> request)
-    : binding_(this, request.Pass()) {
-}
-
-KeyboardImpl::~KeyboardImpl() {
-}
-
-void KeyboardImpl::Show() {
-  Java_Keyboard_showSoftKeyboard(base::android::AttachCurrentThread(),
-                                 base::android::GetApplicationContext());
-}
-
-void KeyboardImpl::Hide() {
-  Java_Keyboard_hideSoftKeyboard(base::android::AttachCurrentThread(),
-                                 base::android::GetApplicationContext());
-}
-
-bool RegisterKeyboardJni(JNIEnv* env) {
-  return RegisterNativesImpl(env);
-}
-
-}  // namespace shell
-}  // namespace mojo
diff --git a/mojo/shell/android/keyboard_impl.h b/mojo/shell/android/keyboard_impl.h
deleted file mode 100644
index e40b7dd..0000000
--- a/mojo/shell/android/keyboard_impl.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2015 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 SHELL_ANDROID_KEYBOARD_IMPL_H_
-#define SHELL_ANDROID_KEYBOARD_IMPL_H_
-
-#include <jni.h>
-
-#include "mojo/public/cpp/bindings/interface_request.h"
-#include "mojo/public/cpp/bindings/strong_binding.h"
-#include "mojo/services/keyboard/public/interfaces/keyboard.mojom.h"
-
-namespace mojo {
-namespace shell {
-
-class KeyboardImpl : public Keyboard {
- public:
-  KeyboardImpl(InterfaceRequest<Keyboard> request);
-  ~KeyboardImpl();
-
-  // Keyboard implementation
-  void Show() override;
-  void Hide() override;
-
- private:
-  StrongBinding<Keyboard> binding_;
-};
-
-bool RegisterKeyboardJni(JNIEnv* env);
-
-}  // namespace shell
-}  // namespace mojo
-
-#endif  // SHELL_ANDROID_KEYBOARD_IMPL_H_
diff --git a/mojo/shell/android/library_loader.cc b/mojo/shell/android/library_loader.cc
index cd3f7d2..3a1faa4 100644
--- a/mojo/shell/android/library_loader.cc
+++ b/mojo/shell/android/library_loader.cc
@@ -9,14 +9,12 @@
 #include "base/bind.h"
 #include "mojo/services/native_viewport/platform_viewport_android.h"
 #include "mojo/shell/android/android_handler.h"
-#include "mojo/shell/android/keyboard_impl.h"
 #include "mojo/shell/android/main.h"
 
 namespace {
 
 base::android::RegistrationMethod kMojoRegisteredMethods[] = {
     {"AndroidHandler", mojo::shell::RegisterAndroidHandlerJni},
-    {"Keyboard", mojo::shell::RegisterKeyboardJni},
     {"PlatformViewportAndroid",
      native_viewport::PlatformViewportAndroid::Register},
     {"ShellMain", mojo::shell::RegisterShellMain},
diff --git a/mojo/shell/android/main.cc b/mojo/shell/android/main.cc
index 9caf840..0e6c917 100644
--- a/mojo/shell/android/main.cc
+++ b/mojo/shell/android/main.cc
@@ -83,10 +83,6 @@ void ConfigureAndroidServices(Context* context) {
           make_scoped_ptr(new AndroidHandlerLoader()), "android_handler",
           base::MessageLoop::TYPE_DEFAULT)),
       GURL("mojo:android_handler"));
-
-  // By default, the keyboard is handled by the native_viewport_service.
-  context->url_resolver()->AddURLMapping(GURL("mojo:keyboard"),
-                                         GURL("mojo:native_viewport_service"));
 }
 
 void QuitShellThread() {
diff --git a/mojo/shell/android/native_viewport_application_loader.cc b/mojo/shell/android/native_viewport_application_loader.cc
index e3e3767..bc52947 100644
--- a/mojo/shell/android/native_viewport_application_loader.cc
+++ b/mojo/shell/android/native_viewport_application_loader.cc
@@ -4,10 +4,9 @@
 
 #include "mojo/shell/android/native_viewport_application_loader.h"
 
+#include "components/gles2/gpu_state.h"
 #include "mojo/public/cpp/application/application_impl.h"
-#include "mojo/services/gles2/gpu_state.h"
 #include "mojo/services/native_viewport/native_viewport_impl.h"
-#include "mojo/shell/android/keyboard_impl.h"
 
 namespace mojo {
 namespace shell {
@@ -29,7 +28,6 @@ bool NativeViewportApplicationLoader::ConfigureIncomingConnection(
     ApplicationConnection* connection) {
   connection->AddService<NativeViewport>(this);
   connection->AddService<Gpu>(this);
-  connection->AddService<Keyboard>(this);
   return true;
 }
 
@@ -41,12 +39,6 @@ void NativeViewportApplicationLoader::Create(
   new native_viewport::NativeViewportImpl(false, gpu_state_, request.Pass());
 }
 
-void NativeViewportApplicationLoader::Create(
-    ApplicationConnection* connection,
-    InterfaceRequest<Keyboard> request) {
-  new KeyboardImpl(request.Pass());
-}
-
 void NativeViewportApplicationLoader::Create(ApplicationConnection* connection,
                                              InterfaceRequest<Gpu> request) {
   if (!gpu_state_)
diff --git a/mojo/shell/android/native_viewport_application_loader.h b/mojo/shell/android/native_viewport_application_loader.h
index ece77e1..1efa7f4 100644
--- a/mojo/shell/android/native_viewport_application_loader.h
+++ b/mojo/shell/android/native_viewport_application_loader.h
@@ -5,10 +5,9 @@
 #ifndef MOJO_SHELL_ANDROID_NATIVE_VIEWPORT_APPLICATION_LOADER_H_
 #define MOJO_SHELL_ANDROID_NATIVE_VIEWPORT_APPLICATION_LOADER_H_
 
+#include "components/gles2/gpu_impl.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/interface_factory.h"
-#include "mojo/services/gles2/gpu_impl.h"
-#include "mojo/services/keyboard/public/interfaces/keyboard.mojom.h"
 #include "mojo/shell/application_manager/application_loader.h"
 #include "third_party/mojo_services/src/gpu/public/interfaces/gpu.mojom.h"
 #include "third_party/mojo_services/src/native_viewport/public/interfaces/native_viewport.mojom.h"
@@ -25,7 +24,6 @@ namespace shell {
 
 class NativeViewportApplicationLoader : public ApplicationLoader,
                                         public ApplicationDelegate,
-                                        public InterfaceFactory<Keyboard>,
                                         public InterfaceFactory<NativeViewport>,
                                         public InterfaceFactory<Gpu> {
  public:
@@ -48,10 +46,6 @@ class NativeViewportApplicationLoader : public ApplicationLoader,
   void Create(ApplicationConnection* connection,
               InterfaceRequest<Gpu> request) override;
 
-  // InterfaceFactory<Keyboard> implementation.
-  void Create(ApplicationConnection* connection,
-              InterfaceRequest<Keyboard> request) override;
-
   scoped_refptr<gles2::GpuState> gpu_state_;
   scoped_ptr<ApplicationImpl> app_;