Move third_party/mojo/src/mojo/public to mojo/public

BUG=None
NOPRESUBMIT=true

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

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

32 files changed, 52 insertions, 52 deletions

diff --git a/device/BUILD.gn b/device/BUILD.gn
index 0a61c72..467f781 100644
--- a/device/BUILD.gn
+++ b/device/BUILD.gn
@@ -63,11 +63,11 @@ test("device_unittests") {
     "//device/bluetooth:mocks",
     "//device/nfc",
     "//mojo/environment:chromium",
+    "//mojo/public/cpp/bindings",
     "//net",
     "//testing/gmock",
     "//testing/gtest",
     "//third_party/mojo/src/mojo/edk/system",
-    "//third_party/mojo/src/mojo/public/cpp/bindings",
     "//url",
   ]
 
diff --git a/device/DEPS b/device/DEPS
index f398914..428c8df 100644
--- a/device/DEPS
+++ b/device/DEPS
@@ -1,6 +1,6 @@
 include_rules = [
   "+chromeos",
   "+components/device_event_log",
-  "+third_party/mojo/src/mojo/public",
+  "+mojo/public",
   "+third_party/ocmock",
 ]
diff --git a/device/battery/BUILD.gn b/device/battery/BUILD.gn
index 6eab813..17cd64d 100644
--- a/device/battery/BUILD.gn
+++ b/device/battery/BUILD.gn
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 import("//build/config/features.gni")
-import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni")
+import("//mojo/public/tools/bindings/mojom.gni")
 
 # On android, BatteryManager mojo service is implemented directly in Java.
 if (!is_android) {
@@ -32,7 +32,7 @@ if (!is_android) {
       "//base",
       "//base/third_party/dynamic_annotations",
       "//mojo/environment:chromium",
-      "//third_party/mojo/src/mojo/public/cpp/bindings",
+      "//mojo/public/cpp/bindings",
       "//third_party/mojo/src/mojo/edk/system",
     ]
 
diff --git a/device/battery/android/BUILD.gn b/device/battery/android/BUILD.gn
index 503a10c..997c9b4 100644
--- a/device/battery/android/BUILD.gn
+++ b/device/battery/android/BUILD.gn
@@ -15,8 +15,8 @@ android_library("battery_monitor_android") {
   deps = [
     "//base:base_java",
     "//device/battery:mojo_bindings_java",
+    "//mojo/public/java:bindings",
+    "//mojo/public/java:system",
     "//third_party/jsr-305:jsr_305_javalib",
-    "//third_party/mojo/src/mojo/public/java:bindings",
-    "//third_party/mojo/src/mojo/public/java:system",
   ]
 }
diff --git a/device/battery/battery_monitor_impl.h b/device/battery/battery_monitor_impl.h
index 6bf65f7..8d7a67f 100644
--- a/device/battery/battery_monitor_impl.h
+++ b/device/battery/battery_monitor_impl.h
@@ -9,7 +9,7 @@
 #include "device/battery/battery_export.h"
 #include "device/battery/battery_monitor.mojom.h"
 #include "device/battery/battery_status_service.h"
-#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h"
+#include "mojo/public/cpp/bindings/strong_binding.h"
 
 namespace device {
 
diff --git a/device/devices_app/BUILD.gn b/device/devices_app/BUILD.gn
index cccad12..3b13142 100644
--- a/device/devices_app/BUILD.gn
+++ b/device/devices_app/BUILD.gn
@@ -20,9 +20,9 @@ source_set("lib") {
     "//device/core",
     "//device/devices_app/usb/public/interfaces",
     "//device/usb",
+    "//mojo/public/cpp/bindings",
+    "//mojo/public/cpp/bindings:callback",
     "//net",
-    "//third_party/mojo/src/mojo/public/cpp/bindings",
-    "//third_party/mojo/src/mojo/public/cpp/bindings:callback",
     "//url",
   ]
 
diff --git a/device/devices_app/devices_app.cc b/device/devices_app/devices_app.cc
index 134948d..6e9cc9f 100644
--- a/device/devices_app/devices_app.cc
+++ b/device/devices_app/devices_app.cc
@@ -16,7 +16,7 @@
 #include "device/usb/usb_service.h"
 #include "mojo/application/public/cpp/application_connection.h"
 #include "mojo/application/public/cpp/application_impl.h"
-#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h"
+#include "mojo/public/cpp/bindings/interface_request.h"
 #include "url/gurl.h"
 
 namespace device {
diff --git a/device/devices_app/main.cc b/device/devices_app/main.cc
index b828750..3541552 100644
--- a/device/devices_app/main.cc
+++ b/device/devices_app/main.cc
@@ -6,7 +6,7 @@
 #include "device/devices_app/public/cpp/devices_app_factory.h"
 #include "mojo/application/public/cpp/application_delegate.h"
 #include "mojo/application/public/cpp/application_runner.h"
-#include "third_party/mojo/src/mojo/public/c/system/main.h"
+#include "mojo/public/c/system/main.h"
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunner runner(
diff --git a/device/devices_app/usb/device_impl.h b/device/devices_app/usb/device_impl.h
index c552e82..ffaf5c8 100644
--- a/device/devices_app/usb/device_impl.h
+++ b/device/devices_app/usb/device_impl.h
@@ -12,9 +12,9 @@
 #include "device/devices_app/usb/public/interfaces/device.mojom.h"
 #include "device/devices_app/usb/public/interfaces/permission_provider.mojom.h"
 #include "device/usb/usb_device_handle.h"
-#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"
-#include "third_party/mojo/src/mojo/public/cpp/bindings/callback.h"
-#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h"
+#include "mojo/public/cpp/bindings/binding.h"
+#include "mojo/public/cpp/bindings/callback.h"
+#include "mojo/public/cpp/bindings/interface_request.h"
 
 namespace net {
 class IOBuffer;
diff --git a/device/devices_app/usb/device_impl_unittest.cc b/device/devices_app/usb/device_impl_unittest.cc
index 2b41912..a7147bc 100644
--- a/device/devices_app/usb/device_impl_unittest.cc
+++ b/device/devices_app/usb/device_impl_unittest.cc
@@ -16,8 +16,8 @@
 #include "device/devices_app/usb/fake_permission_provider.h"
 #include "device/usb/mock_usb_device.h"
 #include "device/usb/mock_usb_device_handle.h"
+#include "mojo/public/cpp/bindings/interface_request.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h"
 
 using ::testing::Invoke;
 using ::testing::_;
diff --git a/device/devices_app/usb/device_manager_impl.cc b/device/devices_app/usb/device_manager_impl.cc
index 25fcd75..423ce29 100644
--- a/device/devices_app/usb/device_manager_impl.cc
+++ b/device/devices_app/usb/device_manager_impl.cc
@@ -15,8 +15,8 @@
 #include "device/usb/usb_device.h"
 #include "device/usb/usb_device_filter.h"
 #include "device/usb/usb_service.h"
-#include "third_party/mojo/src/mojo/public/cpp/bindings/array.h"
-#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h"
+#include "mojo/public/cpp/bindings/array.h"
+#include "mojo/public/cpp/bindings/interface_request.h"
 
 namespace device {
 namespace usb {
diff --git a/device/devices_app/usb/device_manager_impl.h b/device/devices_app/usb/device_manager_impl.h
index 2401303..a097999 100644
--- a/device/devices_app/usb/device_manager_impl.h
+++ b/device/devices_app/usb/device_manager_impl.h
@@ -17,9 +17,9 @@
 #include "device/devices_app/usb/public/interfaces/device_manager.mojom.h"
 #include "device/devices_app/usb/public/interfaces/permission_provider.mojom.h"
 #include "device/usb/usb_service.h"
-#include "third_party/mojo/src/mojo/public/cpp/bindings/array.h"
-#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"
-#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h"
+#include "mojo/public/cpp/bindings/array.h"
+#include "mojo/public/cpp/bindings/binding.h"
+#include "mojo/public/cpp/bindings/interface_request.h"
 
 namespace base {
 class SequencedTaskRunner;
diff --git a/device/devices_app/usb/fake_permission_provider.h b/device/devices_app/usb/fake_permission_provider.h
index 738ecbc..078c267 100644
--- a/device/devices_app/usb/fake_permission_provider.h
+++ b/device/devices_app/usb/fake_permission_provider.h
@@ -7,8 +7,8 @@
 
 #include "device/devices_app/usb/public/interfaces/permission_provider.mojom.h"
 #include "mojo/common/weak_binding_set.h"
-#include "third_party/mojo/src/mojo/public/cpp/bindings/array.h"
-#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h"
+#include "mojo/public/cpp/bindings/array.h"
+#include "mojo/public/cpp/bindings/interface_request.h"
 
 namespace device {
 namespace usb {
diff --git a/device/devices_app/usb/public/interfaces/BUILD.gn b/device/devices_app/usb/public/interfaces/BUILD.gn
index 0b3ad9a..f9d6e0c 100644
--- a/device/devices_app/usb/public/interfaces/BUILD.gn
+++ b/device/devices_app/usb/public/interfaces/BUILD.gn
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni")
+import("//mojo/public/tools/bindings/mojom.gni")
 
 mojom("interfaces") {
   sources = [
diff --git a/device/devices_app/usb/type_converters.cc b/device/devices_app/usb/type_converters.cc
index 2dc2eda..2e14e4f 100644
--- a/device/devices_app/usb/type_converters.cc
+++ b/device/devices_app/usb/type_converters.cc
@@ -11,7 +11,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "device/usb/usb_device.h"
 #include "mojo/common/url_type_converters.h"
-#include "third_party/mojo/src/mojo/public/cpp/bindings/array.h"
+#include "mojo/public/cpp/bindings/array.h"
 
 namespace mojo {
 
diff --git a/device/devices_app/usb/type_converters.h b/device/devices_app/usb/type_converters.h
index a721c67..c220178 100644
--- a/device/devices_app/usb/type_converters.h
+++ b/device/devices_app/usb/type_converters.h
@@ -13,8 +13,8 @@
 #include "device/usb/usb_device_filter.h"
 #include "device/usb/usb_device_handle.h"
 #include "device/usb/webusb_descriptors.h"
-#include "third_party/mojo/src/mojo/public/cpp/bindings/array.h"
-#include "third_party/mojo/src/mojo/public/cpp/bindings/type_converter.h"
+#include "mojo/public/cpp/bindings/array.h"
+#include "mojo/public/cpp/bindings/type_converter.h"
 
 // Type converters to convert objects between internal device/usb data types and
 // public Mojo interface data types.
diff --git a/device/serial/BUILD.gn b/device/serial/BUILD.gn
index fab490e..1ee6c5f 100644
--- a/device/serial/BUILD.gn
+++ b/device/serial/BUILD.gn
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 import("//build/config/features.gni")
-import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni")
+import("//mojo/public/tools/bindings/mojom.gni")
 
 # GYP version: device/serial/serial.gyp:device_serial
 static_library("serial") {
@@ -47,7 +47,7 @@ static_library("serial") {
     "//base",
   ]
   deps = [
-    "//third_party/mojo/src/mojo/public/cpp/system",
+    "//mojo/public/cpp/system",
     "//third_party/re2",
   ]
 
diff --git a/device/serial/data_receiver.h b/device/serial/data_receiver.h
index 0eba0a2..622e366 100644
--- a/device/serial/data_receiver.h
+++ b/device/serial/data_receiver.h
@@ -13,8 +13,8 @@
 #include "base/memory/weak_ptr.h"
 #include "device/serial/buffer.h"
 #include "device/serial/data_stream.mojom.h"
-#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"
-#include "third_party/mojo/src/mojo/public/cpp/system/data_pipe.h"
+#include "mojo/public/cpp/bindings/binding.h"
+#include "mojo/public/cpp/system/data_pipe.h"
 
 namespace device {
 
diff --git a/device/serial/data_sender.h b/device/serial/data_sender.h
index 5c46c35..435f699 100644
--- a/device/serial/data_sender.h
+++ b/device/serial/data_sender.h
@@ -12,7 +12,7 @@
 #include "base/strings/string_piece.h"
 #include "device/serial/buffer.h"
 #include "device/serial/data_stream.mojom.h"
-#include "third_party/mojo/src/mojo/public/cpp/system/data_pipe.h"
+#include "mojo/public/cpp/system/data_pipe.h"
 
 namespace device {
 
diff --git a/device/serial/data_sink_receiver.h b/device/serial/data_sink_receiver.h
index 733b0a1..dfba848 100644
--- a/device/serial/data_sink_receiver.h
+++ b/device/serial/data_sink_receiver.h
@@ -13,8 +13,8 @@
 #include "base/memory/weak_ptr.h"
 #include "device/serial/buffer.h"
 #include "device/serial/data_stream.mojom.h"
-#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"
-#include "third_party/mojo/src/mojo/public/cpp/system/data_pipe.h"
+#include "mojo/public/cpp/bindings/binding.h"
+#include "mojo/public/cpp/system/data_pipe.h"
 
 namespace device {
 
diff --git a/device/serial/data_sink_unittest.cc b/device/serial/data_sink_unittest.cc
index 539cb6d..6661fef 100644
--- a/device/serial/data_sink_unittest.cc
+++ b/device/serial/data_sink_unittest.cc
@@ -9,9 +9,9 @@
 #include "device/serial/data_sender.h"
 #include "device/serial/data_sink_receiver.h"
 #include "device/serial/data_stream.mojom.h"
+#include "mojo/public/cpp/bindings/interface_ptr.h"
+#include "mojo/public/cpp/environment/async_waiter.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_ptr.h"
-#include "third_party/mojo/src/mojo/public/cpp/environment/async_waiter.h"
 
 namespace device {
 
diff --git a/device/serial/data_source_sender.h b/device/serial/data_source_sender.h
index 160dec9..6c9748a 100644
--- a/device/serial/data_source_sender.h
+++ b/device/serial/data_source_sender.h
@@ -12,8 +12,8 @@
 #include "base/memory/weak_ptr.h"
 #include "device/serial/buffer.h"
 #include "device/serial/data_stream.mojom.h"
-#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"
-#include "third_party/mojo/src/mojo/public/cpp/system/data_pipe.h"
+#include "mojo/public/cpp/bindings/binding.h"
+#include "mojo/public/cpp/system/data_pipe.h"
 
 namespace device {
 
diff --git a/device/serial/data_source_unittest.cc b/device/serial/data_source_unittest.cc
index b725f35..4a87a77 100644
--- a/device/serial/data_source_unittest.cc
+++ b/device/serial/data_source_unittest.cc
@@ -10,9 +10,9 @@
 #include "device/serial/data_receiver.h"
 #include "device/serial/data_source_sender.h"
 #include "device/serial/data_stream.mojom.h"
+#include "mojo/public/cpp/bindings/interface_ptr.h"
+#include "mojo/public/cpp/environment/async_waiter.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_ptr.h"
-#include "third_party/mojo/src/mojo/public/cpp/environment/async_waiter.h"
 
 namespace device {
 
diff --git a/device/serial/serial_connection.h b/device/serial/serial_connection.h
index 22f48bf..47fb52d 100644
--- a/device/serial/serial_connection.h
+++ b/device/serial/serial_connection.h
@@ -8,7 +8,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "device/serial/serial.mojom.h"
-#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h"
+#include "mojo/public/cpp/bindings/strong_binding.h"
 
 namespace device {
 
diff --git a/device/serial/serial_connection_factory.h b/device/serial/serial_connection_factory.h
index 6d22fff..a7c1b77 100644
--- a/device/serial/serial_connection_factory.h
+++ b/device/serial/serial_connection_factory.h
@@ -13,7 +13,7 @@
 #include "base/thread_task_runner_handle.h"
 #include "device/serial/data_stream.mojom.h"
 #include "device/serial/serial.mojom.h"
-#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h"
+#include "mojo/public/cpp/bindings/interface_request.h"
 
 namespace device {
 
diff --git a/device/serial/serial_connection_unittest.cc b/device/serial/serial_connection_unittest.cc
index 552bb3a..929d39e 100644
--- a/device/serial/serial_connection_unittest.cc
+++ b/device/serial/serial_connection_unittest.cc
@@ -15,9 +15,9 @@
 #include "device/serial/serial_connection.h"
 #include "device/serial/serial_service_impl.h"
 #include "device/serial/test_serial_io_handler.h"
+#include "mojo/public/cpp/bindings/interface_ptr.h"
+#include "mojo/public/cpp/bindings/interface_request.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_ptr.h"
-#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h"
 
 namespace device {
 namespace {
diff --git a/device/serial/serial_device_enumerator.h b/device/serial/serial_device_enumerator.h
index eeae615..77e2ae5 100644
--- a/device/serial/serial_device_enumerator.h
+++ b/device/serial/serial_device_enumerator.h
@@ -7,7 +7,7 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "device/serial/serial.mojom.h"
-#include "third_party/mojo/src/mojo/public/cpp/bindings/array.h"
+#include "mojo/public/cpp/bindings/array.h"
 
 namespace device {
 
diff --git a/device/serial/serial_service_impl.h b/device/serial/serial_service_impl.h
index 09f2fd0..53d04f1 100644
--- a/device/serial/serial_service_impl.h
+++ b/device/serial/serial_service_impl.h
@@ -12,7 +12,7 @@
 #include "device/serial/serial.mojom.h"
 #include "device/serial/serial_connection_factory.h"
 #include "device/serial/serial_device_enumerator.h"
-#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h"
+#include "mojo/public/cpp/bindings/strong_binding.h"
 
 namespace device {
 
diff --git a/device/serial/serial_service_unittest.cc b/device/serial/serial_service_unittest.cc
index 5c3a884..80cf9cc 100644
--- a/device/serial/serial_service_unittest.cc
+++ b/device/serial/serial_service_unittest.cc
@@ -8,9 +8,9 @@
 #include "device/serial/serial.mojom.h"
 #include "device/serial/serial_service_impl.h"
 #include "device/serial/test_serial_io_handler.h"
+#include "mojo/public/cpp/bindings/interface_ptr.h"
+#include "mojo/public/cpp/bindings/interface_request.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_ptr.h"
-#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h"
 
 namespace device {
 namespace {
diff --git a/device/vibration/BUILD.gn b/device/vibration/BUILD.gn
index ed046c2..0f54123 100644
--- a/device/vibration/BUILD.gn
+++ b/device/vibration/BUILD.gn
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 import("//build/config/features.gni")
-import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni")
+import("//mojo/public/tools/bindings/mojom.gni")
 
 component("vibration") {
   output_name = "device_vibration"
@@ -21,7 +21,7 @@ component("vibration") {
     "//base",
     "//base/third_party/dynamic_annotations",
     "//mojo/environment:chromium",
-    "//third_party/mojo/src/mojo/public/cpp/bindings",
+    "//mojo/public/cpp/bindings",
     "//third_party/mojo/src/mojo/edk/system",
   ]
 
diff --git a/device/vibration/android/BUILD.gn b/device/vibration/android/BUILD.gn
index f7640af..4853ead 100644
--- a/device/vibration/android/BUILD.gn
+++ b/device/vibration/android/BUILD.gn
@@ -12,7 +12,7 @@ android_library("vibration_manager_android") {
   deps = [
     "//base:base_java",
     "//device/vibration:mojo_bindings_java",
-    "//third_party/mojo/src/mojo/public/java:bindings",
-    "//third_party/mojo/src/mojo/public/java:system",
+    "//mojo/public/java:bindings",
+    "//mojo/public/java:system",
   ]
 }
diff --git a/device/vibration/vibration_manager_impl_default.cc b/device/vibration/vibration_manager_impl_default.cc
index 1291722..7661827 100644
--- a/device/vibration/vibration_manager_impl_default.cc
+++ b/device/vibration/vibration_manager_impl_default.cc
@@ -5,7 +5,7 @@
 #include "device/vibration/vibration_manager_impl.h"
 
 #include "base/basictypes.h"
-#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h"
+#include "mojo/public/cpp/bindings/strong_binding.h"
 
 namespace device {