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}
ltilve · Apr 20, 2015 · 8327ac0 · 8327ac0
1 parent 638ab71
commit 8327ac0
Show file tree

Hide file tree

Showing 40 changed files with 69 additions and 217 deletions.
diff --git a/mojo/services/clipboard/BUILD.gn → components/clipboard/BUILD.gn b/mojo/services/clipboard/BUILD.gn → components/clipboard/BUILD.gn
diff --git a/mojo/services/clipboard/DEPS → components/clipboard/DEPS b/mojo/services/clipboard/DEPS → 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 → components/clipboard/clipboard_apptest.cc b/mojo/services/clipboard/clipboard_apptest.cc → 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/...es/clipboard/clipboard_standalone_impl.cc → ...ts/clipboard/clipboard_standalone_impl.cc b/...es/clipboard/clipboard_standalone_impl.cc → ...ts/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/...ces/clipboard/clipboard_standalone_impl.h → ...nts/clipboard/clipboard_standalone_impl.h b/...ces/clipboard/clipboard_standalone_impl.h → ...nts/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 → components/clipboard/main.cc b/mojo/services/clipboard/main.cc → 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 → components/gles2/BUILD.gn b/mojo/services/gles2/BUILD.gn → 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 → components/gles2/DEPS b/mojo/services/gles2/DEPS → 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 → components/gles2/command_buffer_driver.cc b/mojo/services/gles2/command_buffer_driver.cc → 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 → components/gles2/command_buffer_driver.h b/mojo/services/gles2/command_buffer_driver.h → 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 → components/gles2/command_buffer_impl.cc b/mojo/services/gles2/command_buffer_impl.cc → 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 → components/gles2/command_buffer_impl.h b/mojo/services/gles2/command_buffer_impl.h → 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/.../gles2/command_buffer_type_conversions.cc → .../gles2/command_buffer_type_conversions.cc b/.../gles2/command_buffer_type_conversions.cc → .../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/...s/gles2/command_buffer_type_conversions.h → ...s/gles2/command_buffer_type_conversions.h b/...s/gles2/command_buffer_type_conversions.h → ...s/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 → components/gles2/gpu_impl.cc b/mojo/services/gles2/gpu_impl.cc → 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 → components/gles2/gpu_impl.h b/mojo/services/gles2/gpu_impl.h → 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 → components/gles2/gpu_state.cc b/mojo/services/gles2/gpu_state.cc → 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 → components/gles2/gpu_state.h b/mojo/services/gles2/gpu_state.h → 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 → components/gles2/mojo_buffer_backing.cc b/mojo/services/gles2/mojo_buffer_backing.cc → 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 → components/gles2/mojo_buffer_backing.h b/mojo/services/gles2/mojo_buffer_backing.h → 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
@@ -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
@@ -1,4 +1,5 @@
 include_rules = [
+  "+components/gles2",
   "+gpu",
   "+third_party/mojo_services/src/gpu",
-]
+]
diff --git 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
@@ -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
diff --git a/mojo/services/keyboard/public/interfaces/keyboard.mojom b/mojo/services/keyboard/public/interfaces/keyboard.mojom