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}

.gitignore

@@ -363,7 +363,6 @@ v8.log
 /third_party/mkl
 /third_party/mocha
 /third_party/mockito/src
-/third_party/mojo/src/mojo/public/tools/prebuilt/
 /third_party/nacl_sdk_binaries/
 /third_party/nss
 /third_party/omaha/src/omaha

chrome/DEPS

@@ -26,6 +26,7 @@ include_rules = [
   "+content/public/test",
   "+mojo/common",
   "+mojo/message_pump",
+  "+mojo/public",
 
   # Don't allow inclusion of these other libs we shouldn't be calling directly.
   "-webkit",
@@ -39,7 +40,6 @@ include_rules = [
 
   # Allow inclusion of third-party code:
   "+third_party/hunspell",
-  "+third_party/mojo/src/mojo/public",
   "+third_party/skia",
 
   "+ui",

chrome/browser/BUILD.gn

@@ -325,6 +325,8 @@ source_set("browser") {
       "//mojo/application/public/cpp",
       "//mojo/common",
       "//mojo/environment:chromium",
+      "//mojo/public/cpp/bindings",
+      "//mojo/public/js",
       "//net:extras",
       "//net:net_with_v8",
       "//storage/browser",
@@ -335,8 +337,6 @@ source_set("browser") {
       "//third_party/libaddressinput",
       "//third_party/libyuv",
       "//third_party/mojo/src/mojo/edk/system",
-      "//third_party/mojo/src/mojo/public/cpp/bindings",
-      "//third_party/mojo/src/mojo/public/js",
       "//third_party/re2",
       "//third_party/smhasher:cityhash",
       "//third_party/webrtc/modules/desktop_capture",

chrome/browser/chromeos/BUILD.gn

@@ -179,12 +179,12 @@ source_set("unit_tests") {
     "//components/resources",
     "//crypto:platform",
     "//dbus",
+    "//mojo/public/cpp/system:system",
     "//skia",
     "//sync",
     "//testing/gmock",
     "//testing/gtest",
     "//third_party/leveldatabase",
-    "//third_party/mojo/src/mojo/public/cpp/system:system",
     "//ui/chromeos/resources",
   ]
 }

chrome/browser/chromeos/attestation/platform_verification_impl.h

@@ -13,7 +13,7 @@
 #include "chrome/browser/chromeos/attestation/platform_verification_flow.h"
 #include "content/public/browser/render_frame_host.h"
 #include "media/mojo/interfaces/platform_verification.mojom.h"
-#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h"
+#include "mojo/public/cpp/bindings/strong_binding.h"
 
 namespace chromeos {
 namespace attestation {

chrome/browser/media/router/BUILD.gn

@@ -2,8 +2,9 @@
 # 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")
 
 gypi_values = exec_script("//build/gypi_to_gn.py",
                           [ rebase_path("media_router.gypi") ],
@@ -27,7 +28,7 @@ static_library("router") {
     deps += [
       ":mojo_bindings",
       "//extensions/browser",
-      "//third_party/mojo/src/mojo/public/cpp/bindings",
+      "//mojo/public/cpp/bindings",
     ]
     sources += rebase_path(gypi_values.media_router_non_android_sources,
                            ".",

chrome/browser/media/router/media_router_mojo_impl.h

@@ -26,7 +26,7 @@
 #include "chrome/browser/media/router/media_router.h"
 #include "chrome/browser/media/router/media_router.mojom.h"
 #include "chrome/browser/media/router/media_routes_observer.h"
-#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"
+#include "mojo/public/cpp/bindings/binding.h"
 
 namespace content {
 class BrowserContext;

chrome/browser/media/router/media_router_mojo_test.h

@@ -12,9 +12,9 @@
 #include "chrome/browser/media/router/mock_media_router.h"
 #include "chrome/browser/media/router/test_helper.h"
 #include "chrome/test/base/testing_profile.h"
+#include "mojo/public/cpp/bindings/binding.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"
 
 namespace media_router {
 

chrome/browser/ui/webui/engagement/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")
 
 # GYP version: chrome/chrome_web_ui_mojo_bindings.gyp:webui_mojo_bindings
 mojom("mojo_bindings") {

chrome/browser/ui/webui/engagement/site_engagement_ui.cc

@@ -12,7 +12,7 @@
 #include "content/public/browser/web_ui_data_source.h"
 #include "grit/browser_resources.h"
 #include "mojo/common/url_type_converters.h"
-#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h"
+#include "mojo/public/cpp/bindings/strong_binding.h"
 
 namespace {
 

chrome/browser/ui/webui/mojo_web_ui_controller.cc

@@ -9,7 +9,7 @@
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_ui_data_source.h"
 #include "content/public/common/bindings_policy.h"
-#include "third_party/mojo/src/mojo/public/cpp/system/core.h"
+#include "mojo/public/cpp/system/core.h"
 
 MojoWebUIControllerBase::MojoWebUIControllerBase(content::WebUI* contents)
     : WebUIController(contents), mojo_data_source_(NULL) {

chrome/browser/ui/webui/mojo_web_ui_controller.h

@@ -14,7 +14,7 @@
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_ui_controller.h"
 #include "content/public/common/service_registry.h"
-#include "third_party/mojo/src/mojo/public/cpp/system/core.h"
+#include "mojo/public/cpp/system/core.h"
 
 class MojoWebUIHandler;
 

chrome/browser/ui/webui/omnibox/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")
 
 # GYP version: chrome/chrome_web_ui_mojo_bindings.gyp:webui_mojo_bindings
 mojom("mojo_bindings") {

chrome/browser/ui/webui/omnibox/omnibox_ui_handler.h

@@ -14,7 +14,7 @@
 #include "components/omnibox/browser/autocomplete_controller_delegate.h"
 #include "components/omnibox/browser/autocomplete_input.h"
 #include "components/omnibox/browser/autocomplete_match.h"
-#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h"
+#include "mojo/public/cpp/bindings/strong_binding.h"
 
 class AutocompleteController;
 class Profile;

chrome/browser/usb/usb_tab_helper.h

@@ -9,7 +9,7 @@
 #include "base/macros.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
-#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h"
+#include "mojo/public/cpp/bindings/interface_request.h"
 
 namespace device {
 namespace usb {

chrome/browser/usb/web_usb_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 content {
 class RenderFrameHost;

chrome/common/BUILD.gn

@@ -2,9 +2,9 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//tools/grit/grit_rule.gni")
-import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni")
 import("//chrome/version.gni")
+import("//mojo/public/tools/bindings/mojom.gni")
+import("//tools/grit/grit_rule.gni")
 
 gypi_values = exec_script("//build/gypi_to_gn.py",
                           [ rebase_path("../chrome_common.gypi") ],
@@ -120,9 +120,9 @@ static_library("common") {
       "//components/signin/core/common",
       "//components/translate/content/common",
       "//media",
+      "//mojo/public/cpp/bindings",
       "//ipc",
       "//third_party/re2",
-      "//third_party/mojo/src/mojo/public/cpp/bindings",
       "//third_party/widevine/cdm:version_h",
     ]
   }

chrome/common/resource_usage_reporter_type_converters.h

@@ -6,8 +6,8 @@
 #define CHROME_COMMON_RESOURCE_USAGE_REPORTER_TYPE_CONVERTERS_H_
 
 #include "chrome/common/resource_usage_reporter.mojom.h"
+#include "mojo/public/cpp/bindings/type_converter.h"
 #include "third_party/WebKit/public/web/WebCache.h"
-#include "third_party/mojo/src/mojo/public/cpp/bindings/type_converter.h"
 
 namespace mojo {
 

chrome/renderer/chrome_render_process_observer.cc

@@ -37,6 +37,7 @@
 #include "content/public/renderer/render_thread.h"
 #include "content/public/renderer/render_view.h"
 #include "content/public/renderer/render_view_visitor.h"
+#include "mojo/public/cpp/bindings/strong_binding.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_module.h"
 #include "third_party/WebKit/public/web/WebCache.h"
@@ -45,7 +46,6 @@
 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
 #include "third_party/WebKit/public/web/WebSecurityPolicy.h"
 #include "third_party/WebKit/public/web/WebView.h"
-#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h"
 
 #if defined(ENABLE_EXTENSIONS)
 #include "chrome/renderer/extensions/extension_localization_peer.h"

chrome/utility/chrome_content_utility_client.cc

@@ -33,9 +33,9 @@
 #if !defined(OS_ANDROID)
 #include "chrome/common/resource_usage_reporter.mojom.h"
 #include "chrome/utility/profile_import_handler.h"
+#include "mojo/public/cpp/bindings/strong_binding.h"
 #include "net/proxy/mojo_proxy_resolver_factory_impl.h"
 #include "net/proxy/proxy_resolver_v8.h"
-#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h"
 #endif
 
 #if defined(OS_WIN)

components/bitmap_uploader/BUILD.gn

@@ -16,6 +16,6 @@ source_set("bitmap_uploader") {
     "//components/mus/public/cpp",
     "//gpu",
     "//mojo/converters/surfaces",
-    "//third_party/mojo/src/mojo/public/c/gles2",
+    "//mojo/public/c/gles2",
   ]
 }

components/bitmap_uploader/DEPS

@@ -8,5 +8,4 @@ include_rules = [
   "+mojo/public",
   "+mojo/services/network/public/interfaces",
   "+ui/gfx/geometry",
-  "+third_party/mojo/src/mojo/public",
 ]

components/bitmap_uploader/bitmap_uploader.cc

@@ -13,8 +13,8 @@
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/converters/surfaces/surfaces_type_converters.h"
 #include "mojo/converters/surfaces/surfaces_utils.h"
+#include "mojo/public/c/gles2/gles2.h"
 #include "mojo/services/network/public/interfaces/url_loader.mojom.h"
-#include "third_party/mojo/src/mojo/public/c/gles2/gles2.h"
 
 namespace bitmap_uploader {
 namespace {

components/bitmap_uploader/bitmap_uploader.h

@@ -12,7 +12,7 @@
 #include "components/mus/public/interfaces/gpu.mojom.h"
 #include "gpu/GLES2/gl2chromium.h"
 #include "gpu/GLES2/gl2extchromium.h"
-#include "third_party/mojo/src/mojo/public/c/gles2/gles2.h"
+#include "mojo/public/c/gles2/gles2.h"
 
 namespace mojo {
 class Shell;

components/clipboard/BUILD.gn

@@ -16,8 +16,8 @@ source_set("lib") {
     "//base",
     "//components/clipboard/public/interfaces",
     "//mojo/application/public/cpp",
-    "//third_party/mojo/src/mojo/public/cpp/bindings",
-    "//third_party/mojo/src/mojo/public/cpp/bindings:callback",
+    "//mojo/public/cpp/bindings",
+    "//mojo/public/cpp/bindings:callback",
   ]
 }
 
@@ -30,7 +30,7 @@ mojo_native_application("clipboard") {
     ":lib",
     "//base",
     "//mojo/application/public/cpp",
-    "//third_party/mojo/src/mojo/public/cpp/bindings:callback",
+    "//mojo/public/cpp/bindings:callback",
   ]
 }
 

components/clipboard/DEPS

@@ -1,6 +1,6 @@
 include_rules = [
   "+mojo/application",
   "+mojo/common",
+  "+mojo/public",
   "+third_party/mojo_services/src/clipboard",
-  "+third_party/mojo/src/mojo/public",
 ]

components/clipboard/clipboard_standalone_impl.cc

@@ -6,9 +6,9 @@
 
 #include <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"
+#include "mojo/public/cpp/bindings/array.h"
+#include "mojo/public/cpp/bindings/callback.h"
+#include "mojo/public/cpp/bindings/string.h"
 
 using mojo::Array;
 using mojo::Map;

components/clipboard/clipboard_standalone_impl.h

@@ -9,7 +9,7 @@
 #include <string>
 
 #include "components/clipboard/public/interfaces/clipboard.mojom.h"
-#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h"
+#include "mojo/public/cpp/bindings/strong_binding.h"
 
 namespace clipboard {
 

components/clipboard/main.cc

@@ -4,7 +4,7 @@
 
 #include "components/clipboard/clipboard_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(new clipboard::ClipboardApplicationDelegate);

components/clipboard/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 = [

components/data_reduction_proxy/content/browser/BUILD.gn

@@ -70,8 +70,8 @@ source_set("unit_tests") {
     ]
 
     deps += [
+      "//mojo/public/cpp/bindings",
       "//skia",
-      "//third_party/mojo/src/mojo/public/cpp/bindings",
     ]
   }
 }

components/devtools_service/BUILD.gn

@@ -23,11 +23,11 @@ source_set("lib") {
     "//components/devtools_service/public/interfaces",
     "//mojo/application/public/cpp",
     "//mojo/common",
+    "//mojo/public/cpp/bindings",
+    "//mojo/public/cpp/bindings:callback",
+    "//mojo/public/cpp/system",
     "//mojo/services/network/public/cpp",
     "//mojo/services/network/public/interfaces",
-    "//third_party/mojo/src/mojo/public/cpp/bindings",
-    "//third_party/mojo/src/mojo/public/cpp/bindings:callback",
-    "//third_party/mojo/src/mojo/public/cpp/system",
     "//url",
   ]
 }

components/devtools_service/DEPS

@@ -1,6 +1,6 @@
 include_rules = [
   "+mojo/application",
   "+mojo/common",
+  "+mojo/public",
   "+mojo/services/network/public",
-  "+third_party/mojo/src/mojo/public",
 ]

components/devtools_service/devtools_agent_host.h

@@ -9,8 +9,8 @@
 
 #include "base/macros.h"
 #include "components/devtools_service/public/interfaces/devtools_service.mojom.h"
-#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"
-#include "third_party/mojo/src/mojo/public/cpp/bindings/callback.h"
+#include "mojo/public/cpp/bindings/binding.h"
+#include "mojo/public/cpp/bindings/callback.h"
 
 namespace devtools_service {
 

components/devtools_service/devtools_http_server.cc

@@ -18,12 +18,12 @@
 #include "components/devtools_service/devtools_registry_impl.h"
 #include "components/devtools_service/devtools_service.h"
 #include "mojo/application/public/cpp/application_impl.h"
+#include "mojo/public/cpp/system/data_pipe.h"
 #include "mojo/services/network/public/cpp/web_socket_read_queue.h"
 #include "mojo/services/network/public/cpp/web_socket_write_queue.h"
 #include "mojo/services/network/public/interfaces/net_address.mojom.h"
 #include "mojo/services/network/public/interfaces/network_service.mojom.h"
 #include "mojo/services/network/public/interfaces/web_socket.mojom.h"
-#include "third_party/mojo/src/mojo/public/cpp/system/data_pipe.h"
 
 namespace devtools_service {