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}

10 files changed, 13 insertions, 13 deletions

diff --git a/ipc/mojo/BUILD.gn b/ipc/mojo/BUILD.gn
index d801a7b..ead44ce 100644
--- a/ipc/mojo/BUILD.gn
+++ b/ipc/mojo/BUILD.gn
@@ -2,8 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//mojo/public/tools/bindings/mojom.gni")
 import("//testing/test.gni")
-import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni")
 
 mojom("client_channel") {
   sources = [
@@ -39,9 +39,9 @@ component("mojo") {
     "//base/third_party/dynamic_annotations",
     "//ipc",
     "//mojo/environment:chromium",
+    "//mojo/public/c/environment:environment",
+    "//mojo/public/cpp/bindings",
     "//third_party/mojo/src/mojo/edk/system",
-    "//third_party/mojo/src/mojo/public/c/environment:environment",
-    "//third_party/mojo/src/mojo/public/cpp/bindings",
     ":client_channel",
   ]
 }
diff --git a/ipc/mojo/DEPS b/ipc/mojo/DEPS
index 40dca36e..59e80a9 100644
--- a/ipc/mojo/DEPS
+++ b/ipc/mojo/DEPS
@@ -1,5 +1,5 @@
 include_rules = [
   "+mojo/edk/embedder",
-  "+third_party/mojo/src/mojo/public",
+  "+mojo/public",
   "+third_party/mojo/src/mojo/edk/embedder",
 ]
diff --git a/ipc/mojo/async_handle_waiter.h b/ipc/mojo/async_handle_waiter.h
index d6cc745..083060e 100644
--- a/ipc/mojo/async_handle_waiter.h
+++ b/ipc/mojo/async_handle_waiter.h
@@ -10,7 +10,7 @@
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "ipc/ipc_export.h"
-#include "third_party/mojo/src/mojo/public/c/system/types.h"
+#include "mojo/public/c/system/types.h"
 
 namespace IPC {
 namespace internal {
diff --git a/ipc/mojo/async_handle_waiter_unittest.cc b/ipc/mojo/async_handle_waiter_unittest.cc
index 46d4c7e..494b01b 100644
--- a/ipc/mojo/async_handle_waiter_unittest.cc
+++ b/ipc/mojo/async_handle_waiter_unittest.cc
@@ -9,8 +9,8 @@
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread.h"
+#include "mojo/public/cpp/system/message_pipe.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/mojo/src/mojo/public/cpp/system/message_pipe.h"
 
 namespace IPC {
 namespace internal {
diff --git a/ipc/mojo/ipc_channel_mojo.cc b/ipc/mojo/ipc_channel_mojo.cc
index 22f1ca5..05ce419 100644
--- a/ipc/mojo/ipc_channel_mojo.cc
+++ b/ipc/mojo/ipc_channel_mojo.cc
@@ -17,8 +17,8 @@
 #include "ipc/mojo/ipc_mojo_bootstrap.h"
 #include "ipc/mojo/ipc_mojo_handle_attachment.h"
 #include "mojo/edk/embedder/embedder.h"
+#include "mojo/public/cpp/bindings/binding.h"
 #include "third_party/mojo/src/mojo/edk/embedder/embedder.h"
-#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"
 
 #if defined(OS_POSIX) && !defined(OS_NACL)
 #include "ipc/ipc_platform_file_attachment_posix.h"
diff --git a/ipc/mojo/ipc_channel_mojo.h b/ipc/mojo/ipc_channel_mojo.h
index 834fd42..ec583f2 100644
--- a/ipc/mojo/ipc_channel_mojo.h
+++ b/ipc/mojo/ipc_channel_mojo.h
@@ -17,8 +17,8 @@
 #include "ipc/mojo/ipc_message_pipe_reader.h"
 #include "ipc/mojo/ipc_mojo_bootstrap.h"
 #include "ipc/mojo/scoped_ipc_support.h"
+#include "mojo/public/cpp/system/core.h"
 #include "third_party/mojo/src/mojo/edk/embedder/channel_info_forward.h"
-#include "third_party/mojo/src/mojo/public/cpp/system/core.h"
 
 namespace IPC {
 
diff --git a/ipc/mojo/ipc_message_pipe_reader.h b/ipc/mojo/ipc_message_pipe_reader.h
index b9c11c6..01e4fff 100644
--- a/ipc/mojo/ipc_message_pipe_reader.h
+++ b/ipc/mojo/ipc_message_pipe_reader.h
@@ -12,8 +12,8 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/thread_checker.h"
 #include "ipc/ipc_message.h"
-#include "third_party/mojo/src/mojo/public/c/environment/async_waiter.h"
-#include "third_party/mojo/src/mojo/public/cpp/system/core.h"
+#include "mojo/public/c/environment/async_waiter.h"
+#include "mojo/public/cpp/system/core.h"
 
 namespace IPC {
 namespace internal {
diff --git a/ipc/mojo/ipc_mojo_handle_attachment.h b/ipc/mojo/ipc_mojo_handle_attachment.h
index ef5a318..2b31bf3 100644
--- a/ipc/mojo/ipc_mojo_handle_attachment.h
+++ b/ipc/mojo/ipc_mojo_handle_attachment.h
@@ -8,7 +8,7 @@
 #include "base/files/file.h"
 #include "ipc/ipc_export.h"
 #include "ipc/ipc_message_attachment.h"
-#include "third_party/mojo/src/mojo/public/cpp/system/handle.h"
+#include "mojo/public/cpp/system/handle.h"
 
 namespace IPC {
 
diff --git a/ipc/mojo/ipc_mojo_message_helper.h b/ipc/mojo/ipc_mojo_message_helper.h
index 2efa139..3dc840e 100644
--- a/ipc/mojo/ipc_mojo_message_helper.h
+++ b/ipc/mojo/ipc_mojo_message_helper.h
@@ -7,7 +7,7 @@
 
 #include "ipc/ipc_export.h"
 #include "ipc/ipc_message.h"
-#include "third_party/mojo/src/mojo/public/cpp/system/message_pipe.h"
+#include "mojo/public/cpp/system/message_pipe.h"
 
 namespace IPC {
 
diff --git a/ipc/mojo/ipc_mojo_param_traits.h b/ipc/mojo/ipc_mojo_param_traits.h
index c735fce..f0b8b51 100644
--- a/ipc/mojo/ipc_mojo_param_traits.h
+++ b/ipc/mojo/ipc_mojo_param_traits.h
@@ -9,7 +9,7 @@
 
 #include "ipc/ipc_export.h"
 #include "ipc/ipc_param_traits.h"
-#include "third_party/mojo/src/mojo/public/cpp/system/message_pipe.h"
+#include "mojo/public/cpp/system/message_pipe.h"
 
 namespace base {
 class PickleIterator;