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}

6 files changed, 8 insertions, 8 deletions

diff --git a/extensions/renderer/BUILD.gn b/extensions/renderer/BUILD.gn
index ee300ca..7ed31fe 100644
--- a/extensions/renderer/BUILD.gn
+++ b/extensions/renderer/BUILD.gn
@@ -26,9 +26,9 @@ source_set("renderer") {
     "//content:resources",
     "//extensions:extensions_resources",
     "//gin",
+    "//mojo/public/js",
     "//skia",
     "//third_party/WebKit/public:blink",
     "//third_party/mojo/src/mojo/edk/js",
-    "//third_party/mojo/src/mojo/public/js",
   ]
 }
diff --git a/extensions/renderer/api_test_base.cc b/extensions/renderer/api_test_base.cc
index 0315892..75c6d5d 100644
--- a/extensions/renderer/api_test_base.cc
+++ b/extensions/renderer/api_test_base.cc
@@ -12,11 +12,11 @@
 #include "extensions/renderer/process_info_native_handler.h"
 #include "gin/converter.h"
 #include "gin/dictionary.h"
+#include "mojo/public/cpp/bindings/interface_request.h"
+#include "mojo/public/cpp/system/core.h"
 #include "third_party/mojo/src/mojo/edk/js/core.h"
 #include "third_party/mojo/src/mojo/edk/js/handle.h"
 #include "third_party/mojo/src/mojo/edk/js/support.h"
-#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h"
-#include "third_party/mojo/src/mojo/public/cpp/system/core.h"
 
 namespace extensions {
 namespace {
diff --git a/extensions/renderer/api_test_base.h b/extensions/renderer/api_test_base.h
index 9e6feab..ed53280 100644
--- a/extensions/renderer/api_test_base.h
+++ b/extensions/renderer/api_test_base.h
@@ -17,9 +17,9 @@
 #include "gin/modules/module_registry.h"
 #include "gin/object_template_builder.h"
 #include "gin/wrappable.h"
+#include "mojo/public/cpp/bindings/interface_request.h"
+#include "mojo/public/cpp/system/core.h"
 #include "third_party/mojo/src/mojo/edk/js/handle.h"
-#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h"
-#include "third_party/mojo/src/mojo/public/cpp/system/core.h"
 
 namespace extensions {
 
diff --git a/extensions/renderer/dispatcher.cc b/extensions/renderer/dispatcher.cc
index 7f3a28f..aa60196 100644
--- a/extensions/renderer/dispatcher.cc
+++ b/extensions/renderer/dispatcher.cc
@@ -93,6 +93,7 @@
 #include "extensions/renderer/wake_event_page.h"
 #include "extensions/renderer/worker_script_context_set.h"
 #include "grit/extensions_renderer_resources.h"
+#include "mojo/public/js/constants.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURLRequest.h"
 #include "third_party/WebKit/public/web/WebCustomElement.h"
@@ -104,7 +105,6 @@
 #include "third_party/WebKit/public/web/WebScopedUserGesture.h"
 #include "third_party/WebKit/public/web/WebSecurityPolicy.h"
 #include "third_party/WebKit/public/web/WebView.h"
-#include "third_party/mojo/src/mojo/public/js/constants.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "v8/include/v8.h"
diff --git a/extensions/renderer/mojo/keep_alive_client_unittest.cc b/extensions/renderer/mojo/keep_alive_client_unittest.cc
index ae170b6..391d03b 100644
--- a/extensions/renderer/mojo/keep_alive_client_unittest.cc
+++ b/extensions/renderer/mojo/keep_alive_client_unittest.cc
@@ -5,7 +5,7 @@
 #include "extensions/common/mojo/keep_alive.mojom.h"
 #include "extensions/renderer/api_test_base.h"
 #include "grit/extensions_renderer_resources.h"
-#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h"
+#include "mojo/public/cpp/bindings/strong_binding.h"
 
 // A test launcher for tests for the stash client defined in
 // extensions/test/data/keep_alive_client_unittest.js.
diff --git a/extensions/renderer/mojo/stash_client_unittest.cc b/extensions/renderer/mojo/stash_client_unittest.cc
index f8076cd..e92abe9 100644
--- a/extensions/renderer/mojo/stash_client_unittest.cc
+++ b/extensions/renderer/mojo/stash_client_unittest.cc
@@ -9,7 +9,7 @@
 #include "extensions/renderer/api_test_base.h"
 #include "gin/dictionary.h"
 #include "grit/extensions_renderer_resources.h"
-#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/message_builder.h"
+#include "mojo/public/cpp/bindings/lib/message_builder.h"
 
 // A test launcher for tests for the stash client defined in
 // extensions/test/data/stash_client_unittest.js.