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}

18 files changed, 19 insertions, 22 deletions

diff --git a/mandoline/app/DEPS b/mandoline/app/DEPS
index 44f4e66..277a818 100644
--- a/mandoline/app/DEPS
+++ b/mandoline/app/DEPS
@@ -3,5 +3,4 @@ include_rules = [
   "+mojo",
   "+third_party/mojo/src/mojo/edk",
   "-third_party/mojo/src/mojo/edk/system",
-  "+third_party/mojo/src/mojo/public",
 ]
diff --git a/mandoline/services/core_services/BUILD.gn b/mandoline/services/core_services/BUILD.gn
index 8e093f8..642fe6d 100644
--- a/mandoline/services/core_services/BUILD.gn
+++ b/mandoline/services/core_services/BUILD.gn
@@ -45,10 +45,10 @@ source_set("sources") {
     "//mojo/application/public/cpp",
     "//mojo/logging",
     "//mojo/message_pump",
+    "//mojo/public/cpp/bindings",
     "//mojo/services/tracing:lib",
     "//mojo/services/tracing/public/cpp",
     "//third_party/icu",
-    "//third_party/mojo/src/mojo/public/cpp/bindings",
     "//url",
   ]
 
diff --git a/mandoline/services/core_services/DEPS b/mandoline/services/core_services/DEPS
index 955fdb9..8e48dac 100644
--- a/mandoline/services/core_services/DEPS
+++ b/mandoline/services/core_services/DEPS
@@ -9,10 +9,10 @@ include_rules = [
   "+mojo/common",
   "+mojo/logging",
   "+mojo/message_pump",
+  "+mojo/public",
   "+mojo/services/network",
   "+mojo/services/tracing",
   "+net",
-  "+third_party/mojo/src/mojo/public",
   "+third_party/mojo_services/src/clipboard",
   "+third_party/mojo_services/src/content_handler/public",
 ]
diff --git a/mandoline/services/core_services/main.cc b/mandoline/services/core_services/main.cc
index ef8c847..727ed41 100644
--- a/mandoline/services/core_services/main.cc
+++ b/mandoline/services/core_services/main.cc
@@ -4,7 +4,7 @@
 
 #include "mandoline/services/core_services/core_services_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/mandoline/services/updater/BUILD.gn b/mandoline/services/updater/BUILD.gn
index 31edf86..441ec83 100644
--- a/mandoline/services/updater/BUILD.gn
+++ b/mandoline/services/updater/BUILD.gn
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 import("//mojo/public/mojo_application.gni")
-import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni")
+import("//mojo/public/tools/bindings/mojom.gni")
 
 mojo_native_application("updater") {
   sources = [
@@ -17,8 +17,8 @@ mojo_native_application("updater") {
     "//base",
     "//components/update_client",
     "//mojo/application/public/cpp",
+    "//mojo/public/cpp/system",
     "//mojo/services/updater",
-    "//third_party/mojo/src/mojo/public/cpp/system",
     "//url",
   ]
 }
diff --git a/mandoline/services/updater/DEPS b/mandoline/services/updater/DEPS
index 244d48c..07502be 100644
--- a/mandoline/services/updater/DEPS
+++ b/mandoline/services/updater/DEPS
@@ -6,6 +6,4 @@ include_rules = [
   "+mojo/public/cpp/bindings",
   "+mojo/services/network",
   "+mojo/services/updater",
-  "+third_party/mojo/src/mojo/public/c/system",
-  "+third_party/mojo/src/mojo/public/cpp/bindings",
 ]
diff --git a/mandoline/services/updater/updater_app.cc b/mandoline/services/updater/updater_app.cc
index 211b648..0a1675c 100644
--- a/mandoline/services/updater/updater_app.cc
+++ b/mandoline/services/updater/updater_app.cc
@@ -9,7 +9,7 @@
 #include "mojo/application/public/cpp/application_connection.h"
 #include "mojo/application/public/cpp/application_impl.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"
 
 namespace updater {
 
diff --git a/mandoline/services/updater/updater_impl.h b/mandoline/services/updater/updater_impl.h
index e0b3e94..b8b7dbc 100644
--- a/mandoline/services/updater/updater_impl.h
+++ b/mandoline/services/updater/updater_impl.h
@@ -7,8 +7,8 @@
 
 #include "base/macros.h"
 #include "mojo/application/public/cpp/application_impl.h"
+#include "mojo/public/cpp/bindings/strong_binding.h"
 #include "mojo/services/updater/updater.mojom.h"
-#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h"
 
 namespace updater {
 
diff --git a/mandoline/ui/desktop_ui/BUILD.gn b/mandoline/ui/desktop_ui/BUILD.gn
index 255419a..663e40b 100644
--- a/mandoline/ui/desktop_ui/BUILD.gn
+++ b/mandoline/ui/desktop_ui/BUILD.gn
@@ -4,7 +4,7 @@
 
 import("//build/config/ui.gni")
 import("//mojo/public/mojo_application.gni")
-import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni")
+import("//mojo/public/tools/bindings/mojom.gni")
 
 mojo_native_application("desktop_ui") {
   sources = [
@@ -42,10 +42,10 @@ source_set("lib") {
     "//mojo/application/public/cpp:sources",
     "//mojo/common:common_base",
     "//mojo/converters/geometry",
+    "//mojo/public/cpp/bindings",
     "//mojo/services/tracing/public/cpp",
     "//mojo/services/tracing/public/interfaces",
     "//skia",
-    "//third_party/mojo/src/mojo/public/cpp/bindings",
     "//ui/gfx",
     "//ui/gfx/geometry",
     "//ui/mojo/init",
diff --git a/mandoline/ui/desktop_ui/DEPS b/mandoline/ui/desktop_ui/DEPS
index 2821345..c5207e7 100644
--- a/mandoline/ui/desktop_ui/DEPS
+++ b/mandoline/ui/desktop_ui/DEPS
@@ -5,10 +5,10 @@ include_rules = [
   "+mojo/application",
   "+mojo/common",
   "+mojo/converters",
+  "+mojo/public",
   "+mojo/runner",
   "+mojo/services/network/public",
   "+mojo/services/tracing/public",
-  "+third_party/mojo/src/mojo/public",
   "+third_party/mojo_services",
   "+ui",
 ]
diff --git a/mandoline/ui/desktop_ui/main.cc b/mandoline/ui/desktop_ui/main.cc
index 65df601..558d3af 100644
--- a/mandoline/ui/desktop_ui/main.cc
+++ b/mandoline/ui/desktop_ui/main.cc
@@ -4,7 +4,7 @@
 
 #include "mandoline/ui/desktop_ui/browser_manager.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(new mandoline::BrowserManager);
diff --git a/mandoline/ui/desktop_ui/public/interfaces/BUILD.gn b/mandoline/ui/desktop_ui/public/interfaces/BUILD.gn
index 4bb47d8..335f170 100644
--- a/mandoline/ui/desktop_ui/public/interfaces/BUILD.gn
+++ b/mandoline/ui/desktop_ui/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/mandoline/ui/omnibox/BUILD.gn b/mandoline/ui/omnibox/BUILD.gn
index 76530b9..d28d989 100644
--- a/mandoline/ui/omnibox/BUILD.gn
+++ b/mandoline/ui/omnibox/BUILD.gn
@@ -32,8 +32,8 @@ source_set("lib") {
     "//mojo/application/public/cpp:sources",
     "//mojo/common",
     "//mojo/converters/geometry",
+    "//mojo/public/cpp/bindings",
     "//skia",
-    "//third_party/mojo/src/mojo/public/cpp/bindings",
     "//ui/gfx/geometry",
     "//ui/mojo/init",
     "//ui/views",
diff --git a/mandoline/ui/omnibox/DEPS b/mandoline/ui/omnibox/DEPS
index b98f904..3964764 100644
--- a/mandoline/ui/omnibox/DEPS
+++ b/mandoline/ui/omnibox/DEPS
@@ -4,6 +4,6 @@ include_rules = [
   "+mojo/application",
   "+mojo/common",
   "+mojo/converters",
-  "+third_party/mojo/src/mojo/public",
+  "+mojo/public",
   "+ui",
 ]
diff --git a/mandoline/ui/omnibox/main.cc b/mandoline/ui/omnibox/main.cc
index 8c9007c..35049c3 100644
--- a/mandoline/ui/omnibox/main.cc
+++ b/mandoline/ui/omnibox/main.cc
@@ -4,7 +4,7 @@
 
 #include "mandoline/ui/omnibox/omnibox_application.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(new mandoline::OmniboxApplication);
diff --git a/mandoline/ui/phone_ui/BUILD.gn b/mandoline/ui/phone_ui/BUILD.gn
index 3a6ee3b..0f3ddf7 100644
--- a/mandoline/ui/phone_ui/BUILD.gn
+++ b/mandoline/ui/phone_ui/BUILD.gn
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 import("//mojo/public/mojo_application.gni")
-import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni")
+import("//mojo/public/tools/bindings/mojom.gni")
 
 mojo_native_application("phone_ui") {
   sources = [
@@ -33,7 +33,7 @@ source_set("lib") {
     "//mojo/application/public/cpp",
     "//mojo/common",
     "//mojo/converters/geometry",
-    "//third_party/mojo/src/mojo/public/cpp/bindings",
+    "//mojo/public/cpp/bindings",
     "//ui/gfx/geometry",
     "//url",
   ]
diff --git a/mandoline/ui/phone_ui/DEPS b/mandoline/ui/phone_ui/DEPS
index ffc6361..9286b44 100644
--- a/mandoline/ui/phone_ui/DEPS
+++ b/mandoline/ui/phone_ui/DEPS
@@ -4,7 +4,7 @@ include_rules = [
   "+mojo/application",
   "+mojo/common",
   "+mojo/converters",
+  "+mojo/public",
   "+mojo/services/network/public",
-  "+third_party/mojo/src/mojo/public",
   "+ui",
 ]
diff --git a/mandoline/ui/phone_ui/main.cc b/mandoline/ui/phone_ui/main.cc
index fa3fece..7744a4d 100644
--- a/mandoline/ui/phone_ui/main.cc
+++ b/mandoline/ui/phone_ui/main.cc
@@ -4,7 +4,7 @@
 
 #include "mandoline/ui/phone_ui/phone_browser_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(