diff options
| author | blundell <blundell@chromium.org> | 2015-01-23 08:27:14 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-23 16:27:55 +0000 |
| commit | 471b74f430d7885283a7257de6923fdc86a94368 (patch) | |
| tree | e7041dc8b12840c74c7c09b259e6ea8a2975eddb | |
| parent | 630ce7c1985119bd70753f72fc27daebd4b85635 (diff) | |
| download | chromium_src-471b74f430d7885283a7257de6923fdc86a94368.zip chromium_src-471b74f430d7885283a7257de6923fdc86a94368.tar.gz chromium_src-471b74f430d7885283a7257de6923fdc86a94368.tar.bz2 | |
Include Mojo SDK/EDK via fully-qualified paths in Chromium code.
As a followup to the move of the Mojo SDK and EDK to live under //third_party,
this CL updates Chromium code to include SDK/EDK headers via fully-qualified
paths instead of relying on include_dirs that are exported by the Mojo targets.
This CL also includes mechanical updates to DEPS files to satisfy checkdeps.
Review URL: https://codereview.chromium.org/846443006
Cr-Commit-Position: refs/heads/master@{#312858}
140 files changed, 216 insertions, 213 deletions
diff --git a/chrome/DEPS b/chrome/DEPS index 923e17b..9c95992 100644 --- a/chrome/DEPS +++ b/chrome/DEPS @@ -23,7 +23,6 @@ include_rules = [ "+content/public/common", "+content/public/test", "+mojo/common", - "+mojo/public", # Don't allow inclusion of these other libs we shouldn't be calling directly. "-webkit", @@ -38,6 +37,7 @@ include_rules = [ # Allow inclusion of third-party code: "+third_party/hunspell", "+third_party/libxml", + "+third_party/mojo/src/mojo/public", "+third_party/skia", "+ui", diff --git a/chrome/browser/ui/webui/mojo_web_ui_controller.cc b/chrome/browser/ui/webui/mojo_web_ui_controller.cc index 286fcc1..65e40ae 100644 --- a/chrome/browser/ui/webui/mojo_web_ui_controller.cc +++ b/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 "mojo/public/cpp/system/core.h" +#include "third_party/mojo/src/mojo/public/cpp/system/core.h" MojoWebUIControllerBase::MojoWebUIControllerBase(content::WebUI* contents) : WebUIController(contents), mojo_data_source_(NULL) { diff --git a/chrome/browser/ui/webui/mojo_web_ui_controller.h b/chrome/browser/ui/webui/mojo_web_ui_controller.h index ed4b9e2..bb934df 100644 --- a/chrome/browser/ui/webui/mojo_web_ui_controller.h +++ b/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 "mojo/public/cpp/system/core.h" +#include "third_party/mojo/src/mojo/public/cpp/system/core.h" class MojoWebUIHandler; diff --git a/chrome/test/DEPS b/chrome/test/DEPS index 2e14c50..88bbd0e 100644 --- a/chrome/test/DEPS +++ b/chrome/test/DEPS @@ -18,7 +18,7 @@ include_rules = [ "+gin/public", "+grit", # For generated headers. TODO(thestig): Remove. "+media/base", - "+mojo/edk/embedder", "+sandbox/win/tests", + "+third_party/mojo/src/mojo/edk/embedder", "+win8/test", ] diff --git a/chrome/test/base/run_all_unittests.cc b/chrome/test/base/run_all_unittests.cc index 639bcff..3ab966f 100644 --- a/chrome/test/base/run_all_unittests.cc +++ b/chrome/test/base/run_all_unittests.cc @@ -6,7 +6,7 @@ #include "base/test/launcher/unit_test_launcher.h" #include "chrome/test/base/chrome_unit_test_suite.h" #include "content/public/test/unittest_test_suite.h" -#include "mojo/edk/embedder/test_embedder.h" +#include "third_party/mojo/src/mojo/edk/embedder/test_embedder.h" int main(int argc, char **argv) { content::UnitTestTestSuite test_suite(new ChromeUnitTestSuite(argc, argv)); diff --git a/components/nacl/loader/DEPS b/components/nacl/loader/DEPS index ec82fff..5d73078 100644 --- a/components/nacl/loader/DEPS +++ b/components/nacl/loader/DEPS @@ -32,6 +32,6 @@ include_rules = [ "+ppapi/proxy/ppapi_messages.h", # For supporting Mojo in plugins. - "+mojo/edk", "+mojo/nacl", + "+third_party/mojo/src/mojo/edk", ] diff --git a/components/nacl/loader/nacl_listener.cc b/components/nacl/loader/nacl_listener.cc index d91c856..ae865f8 100644 --- a/components/nacl/loader/nacl_listener.cc +++ b/components/nacl/loader/nacl_listener.cc @@ -28,13 +28,13 @@ #include "ipc/ipc_switches.h" #include "ipc/ipc_sync_channel.h" #include "ipc/ipc_sync_message_filter.h" -#include "mojo/edk/embedder/embedder.h" -#include "mojo/edk/embedder/platform_support.h" #include "mojo/nacl/mojo_syscall.h" #include "native_client/src/public/chrome_main.h" #include "native_client/src/public/nacl_app.h" #include "native_client/src/public/nacl_desc.h" #include "native_client/src/public/nacl_file_info.h" +#include "third_party/mojo/src/mojo/edk/embedder/embedder.h" +#include "third_party/mojo/src/mojo/edk/embedder/platform_support.h" #if defined(OS_POSIX) #include "base/file_descriptor_posix.h" diff --git a/content/DEPS b/content/DEPS index fadf694..fb2bf9d 100644 --- a/content/DEPS +++ b/content/DEPS @@ -33,10 +33,6 @@ include_rules = [ "+dbus", "+gpu", "+mojo/common", - "+mojo/edk/embedder", - "+mojo/edk/js", - "+mojo/edk/test", - "+mojo/public", "+net", "+ppapi", "+printing", @@ -63,6 +59,10 @@ include_rules = [ "+third_party/angle", "+third_party/flac", "+third_party/libjingle", + "+third_party/mojo/src/mojo/edk/embedder", + "+third_party/mojo/src/mojo/edk/js", + "+third_party/mojo/src/mojo/edk/test", + "+third_party/mojo/src/mojo/public", "+third_party/mozilla", "+third_party/npapi/bindings", "+third_party/re2", diff --git a/content/app/mojo/mojo_browsertest.cc b/content/app/mojo/mojo_browsertest.cc index b516107..c7f179c 100644 --- a/content/app/mojo/mojo_browsertest.cc +++ b/content/app/mojo/mojo_browsertest.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "content/public/test/content_browser_test.h" -#include "mojo/public/c/system/core.h" #include "testing/gtest/include/gtest/gtest.h" +#include "third_party/mojo/src/mojo/public/c/system/core.h" namespace content { diff --git a/content/app/mojo/mojo_init.cc b/content/app/mojo/mojo_init.cc index 3b08791..f2b21fa 100644 --- a/content/app/mojo/mojo_init.cc +++ b/content/app/mojo/mojo_init.cc @@ -5,9 +5,9 @@ #include "content/app/mojo/mojo_init.h" #include "base/memory/scoped_ptr.h" -#include "mojo/edk/embedder/configuration.h" -#include "mojo/edk/embedder/embedder.h" -#include "mojo/edk/embedder/simple_platform_support.h" +#include "third_party/mojo/src/mojo/edk/embedder/configuration.h" +#include "third_party/mojo/src/mojo/edk/embedder/embedder.h" +#include "third_party/mojo/src/mojo/edk/embedder/simple_platform_support.h" namespace content { diff --git a/content/browser/battery_status/battery_monitor_integration_browsertest.cc b/content/browser/battery_status/battery_monitor_integration_browsertest.cc index 8bf1ca4..541d769 100644 --- a/content/browser/battery_status/battery_monitor_integration_browsertest.cc +++ b/content/browser/battery_status/battery_monitor_integration_browsertest.cc @@ -16,7 +16,7 @@ #include "content/shell/browser/shell.h" #include "content/shell/browser/shell_content_browser_client.h" #include "device/battery/battery_monitor.mojom.h" -#include "mojo/public/cpp/bindings/strong_binding.h" +#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" // These tests run against a dummy implementation of the BatteryMonitor service. // That is, they verify that the service implementation is correctly exposed to diff --git a/content/browser/mojo/mojo_application_host.cc b/content/browser/mojo/mojo_application_host.cc index 1821967..e5a9b0b 100644 --- a/content/browser/mojo/mojo_application_host.cc +++ b/content/browser/mojo/mojo_application_host.cc @@ -7,7 +7,7 @@ #include "content/common/mojo/mojo_messages.h" #include "content/public/browser/browser_thread.h" #include "ipc/ipc_sender.h" -#include "mojo/edk/embedder/platform_channel_pair.h" +#include "third_party/mojo/src/mojo/edk/embedder/platform_channel_pair.h" namespace content { namespace { diff --git a/content/browser/mojo/mojo_application_host.h b/content/browser/mojo/mojo_application_host.h index 0c02c49..53e150a 100644 --- a/content/browser/mojo/mojo_application_host.h +++ b/content/browser/mojo/mojo_application_host.h @@ -8,8 +8,8 @@ #include "base/memory/scoped_ptr.h" #include "base/process/process_handle.h" #include "content/common/mojo/service_registry_impl.h" -#include "mojo/edk/embedder/channel_init.h" -#include "mojo/edk/embedder/scoped_platform_handle.h" +#include "third_party/mojo/src/mojo/edk/embedder/channel_init.h" +#include "third_party/mojo/src/mojo/edk/embedder/scoped_platform_handle.h" #if defined(OS_ANDROID) #include "content/browser/mojo/service_registry_android.h" diff --git a/content/browser/permissions/permission_service_context.h b/content/browser/permissions/permission_service_context.h index 1e71958..c14b40c 100644 --- a/content/browser/permissions/permission_service_context.h +++ b/content/browser/permissions/permission_service_context.h @@ -8,7 +8,7 @@ #include "base/macros.h" #include "base/memory/scoped_vector.h" #include "content/public/browser/web_contents_observer.h" -#include "mojo/public/cpp/bindings/interface_request.h" +#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h" namespace content { diff --git a/content/browser/renderer_host/render_process_host_impl.h b/content/browser/renderer_host/render_process_host_impl.h index 690ccef..ac87d9c 100644 --- a/content/browser/renderer_host/render_process_host_impl.h +++ b/content/browser/renderer_host/render_process_host_impl.h @@ -20,7 +20,7 @@ #include "content/public/browser/render_process_host.h" #include "ipc/ipc_channel_proxy.h" #include "ipc/ipc_platform_file.h" -#include "mojo/public/cpp/bindings/interface_ptr.h" +#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_ptr.h" #include "ui/gfx/gpu_memory_buffer.h" #include "ui/gl/gpu_switching_observer.h" diff --git a/content/browser/webui/web_ui_data_source_impl.cc b/content/browser/webui/web_ui_data_source_impl.cc index bbe54f6..8d8f465 100644 --- a/content/browser/webui/web_ui_data_source_impl.cc +++ b/content/browser/webui/web_ui_data_source_impl.cc @@ -11,7 +11,7 @@ #include "base/strings/string_util.h" #include "content/grit/content_resources.h" #include "content/public/common/content_client.h" -#include "mojo/public/js/constants.h" +#include "third_party/mojo/src/mojo/public/js/constants.h" #include "ui/base/webui/jstemplate_builder.h" #include "ui/base/webui/web_ui_util.h" diff --git a/content/browser/webui/web_ui_mojo_browsertest.cc b/content/browser/webui/web_ui_mojo_browsertest.cc index 274d4c1..847e39e 100644 --- a/content/browser/webui/web_ui_mojo_browsertest.cc +++ b/content/browser/webui/web_ui_mojo_browsertest.cc @@ -25,10 +25,10 @@ #include "content/public/test/content_browser_test_utils.h" #include "content/shell/browser/shell.h" #include "content/test/data/web_ui_test_mojo_bindings.mojom.h" -#include "mojo/edk/test/test_utils.h" -#include "mojo/public/cpp/bindings/interface_impl.h" -#include "mojo/public/cpp/bindings/interface_request.h" -#include "mojo/public/js/constants.h" +#include "third_party/mojo/src/mojo/edk/test/test_utils.h" +#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_impl.h" +#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h" +#include "third_party/mojo/src/mojo/public/js/constants.h" namespace content { namespace { diff --git a/content/child/mojo/mojo_application.h b/content/child/mojo/mojo_application.h index 8aee2e8..481c072 100644 --- a/content/child/mojo/mojo_application.h +++ b/content/child/mojo/mojo_application.h @@ -7,7 +7,7 @@ #include "content/common/mojo/service_registry_impl.h" #include "ipc/ipc_platform_file.h" -#include "mojo/edk/embedder/channel_init.h" +#include "third_party/mojo/src/mojo/edk/embedder/channel_init.h" namespace IPC { class Message; diff --git a/content/child/web_data_consumer_handle_impl.cc b/content/child/web_data_consumer_handle_impl.cc index ab97b57..a26656e 100644 --- a/content/child/web_data_consumer_handle_impl.cc +++ b/content/child/web_data_consumer_handle_impl.cc @@ -7,7 +7,7 @@ #include <limits> #include "base/bind.h" #include "base/logging.h" -#include "mojo/public/c/system/types.h" +#include "third_party/mojo/src/mojo/public/c/system/types.h" namespace content { diff --git a/content/child/web_data_consumer_handle_impl.h b/content/child/web_data_consumer_handle_impl.h index 5edef3f..5303875 100644 --- a/content/child/web_data_consumer_handle_impl.h +++ b/content/child/web_data_consumer_handle_impl.h @@ -8,8 +8,8 @@ #include "base/memory/scoped_ptr.h" #include "content/common/content_export.h" #include "mojo/common/handle_watcher.h" -#include "mojo/public/cpp/system/data_pipe.h" #include "third_party/WebKit/public/platform/WebDataConsumerHandle.h" +#include "third_party/mojo/src/mojo/public/cpp/system/data_pipe.h" namespace content { diff --git a/content/child/web_data_consumer_handle_impl_unittest.cc b/content/child/web_data_consumer_handle_impl_unittest.cc index 7ad9d40..4aaa4dc 100644 --- a/content/child/web_data_consumer_handle_impl_unittest.cc +++ b/content/child/web_data_consumer_handle_impl_unittest.cc @@ -12,8 +12,8 @@ #include "base/run_loop.h" #include "base/synchronization/waitable_event.h" #include "base/threading/thread.h" -#include "mojo/public/cpp/system/data_pipe.h" #include "testing/gtest/include/gtest/gtest.h" +#include "third_party/mojo/src/mojo/public/cpp/system/data_pipe.h" namespace content { diff --git a/content/child/web_url_loader_impl.cc b/content/child/web_url_loader_impl.cc index 59574b3..1f852bd 100644 --- a/content/child/web_url_loader_impl.cc +++ b/content/child/web_url_loader_impl.cc @@ -31,7 +31,6 @@ #include "content/common/service_worker/service_worker_types.h" #include "content/public/child/request_peer.h" #include "content/public/common/content_switches.h" -#include "mojo/public/cpp/system/data_pipe.h" #include "net/base/data_url.h" #include "net/base/filename_util.h" #include "net/base/mime_util.h" @@ -48,6 +47,7 @@ #include "third_party/WebKit/public/platform/WebURLRequest.h" #include "third_party/WebKit/public/platform/WebURLResponse.h" #include "third_party/WebKit/public/web/WebSecurityPolicy.h" +#include "third_party/mojo/src/mojo/public/cpp/system/data_pipe.h" using base::Time; using base::TimeTicks; diff --git a/content/common/mojo/service_registry_impl.h b/content/common/mojo/service_registry_impl.h index b3a6576..16426c7 100644 --- a/content/common/mojo/service_registry_impl.h +++ b/content/common/mojo/service_registry_impl.h @@ -14,9 +14,9 @@ #include "base/compiler_specific.h" #include "base/memory/weak_ptr.h" #include "content/public/common/service_registry.h" -#include "mojo/public/cpp/bindings/interface_impl.h" -#include "mojo/public/cpp/system/core.h" -#include "mojo/public/interfaces/application/service_provider.mojom.h" +#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_impl.h" +#include "third_party/mojo/src/mojo/public/cpp/system/core.h" +#include "third_party/mojo/src/mojo/public/interfaces/application/service_provider.mojom.h" namespace content { diff --git a/content/common/render_frame_setup.mojom b/content/common/render_frame_setup.mojom index 0a1d433..22f01ea 100644 --- a/content/common/render_frame_setup.mojom +++ b/content/common/render_frame_setup.mojom @@ -4,7 +4,7 @@ module content; -import "mojo/public/interfaces/application/service_provider.mojom"; +import "third_party/mojo/src/mojo/public/interfaces/application/service_provider.mojom"; interface RenderFrameSetup { GetServiceProviderForFrame(int32 frame_routing_id, diff --git a/content/public/browser/render_view_host.h b/content/public/browser/render_view_host.h index 5e79009..07fc988 100644 --- a/content/public/browser/render_view_host.h +++ b/content/public/browser/render_view_host.h @@ -12,8 +12,8 @@ #include "content/public/browser/render_widget_host.h" #include "content/public/common/file_chooser_params.h" #include "content/public/common/page_zoom.h" -#include "mojo/public/cpp/system/core.h" #include "third_party/WebKit/public/web/WebDragOperation.h" +#include "third_party/mojo/src/mojo/public/cpp/system/core.h" class GURL; diff --git a/content/public/common/service_registry.h b/content/public/common/service_registry.h index be2294e..1ce3b03 100644 --- a/content/public/common/service_registry.h +++ b/content/public/common/service_registry.h @@ -11,9 +11,9 @@ #include "base/callback.h" #include "base/strings/string_piece.h" #include "content/common/content_export.h" -#include "mojo/public/cpp/bindings/interface_ptr.h" -#include "mojo/public/cpp/bindings/interface_request.h" -#include "mojo/public/cpp/system/core.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" +#include "third_party/mojo/src/mojo/public/cpp/system/core.h" namespace content { diff --git a/content/renderer/mojo/service_registry_js_wrapper.cc b/content/renderer/mojo/service_registry_js_wrapper.cc index 73a591e..4840b1e 100644 --- a/content/renderer/mojo/service_registry_js_wrapper.cc +++ b/content/renderer/mojo/service_registry_js_wrapper.cc @@ -6,7 +6,7 @@ #include "content/common/mojo/service_registry_impl.h" #include "content/public/common/service_registry.h" -#include "mojo/edk/js/handle.h" +#include "third_party/mojo/src/mojo/edk/js/handle.h" namespace content { diff --git a/content/renderer/mojo/service_registry_js_wrapper.h b/content/renderer/mojo/service_registry_js_wrapper.h index 2be7f95..fa0eee9 100644 --- a/content/renderer/mojo/service_registry_js_wrapper.h +++ b/content/renderer/mojo/service_registry_js_wrapper.h @@ -11,7 +11,7 @@ #include "gin/handle.h" #include "gin/object_template_builder.h" #include "gin/wrappable.h" -#include "mojo/public/cpp/system/core.h" +#include "third_party/mojo/src/mojo/public/cpp/system/core.h" namespace content { diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc index 4747ed2..b6ba63a 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc @@ -103,8 +103,6 @@ #include "media/blink/webmediaplayer_params.h" #include "media/filters/default_renderer_factory.h" #include "media/filters/gpu_video_accelerator_factories.h" -#include "mojo/edk/js/core.h" -#include "mojo/edk/js/support.h" #include "net/base/data_url.h" #include "net/base/net_errors.h" #include "net/base/registry_controlled_domains/registry_controlled_domain.h" @@ -133,6 +131,8 @@ #include "third_party/WebKit/public/web/WebSurroundingText.h" #include "third_party/WebKit/public/web/WebUserGestureIndicator.h" #include "third_party/WebKit/public/web/WebView.h" +#include "third_party/mojo/src/mojo/edk/js/core.h" +#include "third_party/mojo/src/mojo/edk/js/support.h" #if defined(ENABLE_PLUGINS) #include "content/renderer/npapi/webplugin_impl.h" diff --git a/content/renderer/web_ui_mojo.h b/content/renderer/web_ui_mojo.h index dd9e752..d851a62 100644 --- a/content/renderer/web_ui_mojo.h +++ b/content/renderer/web_ui_mojo.h @@ -10,7 +10,7 @@ #include "content/public/renderer/render_frame_observer.h" #include "content/public/renderer/render_view_observer.h" #include "content/public/renderer/render_view_observer_tracker.h" -#include "mojo/public/cpp/system/core.h" +#include "third_party/mojo/src/mojo/public/cpp/system/core.h" namespace gin { class PerContextData; diff --git a/device/DEPS b/device/DEPS index 80961ee..82ab498 100644 --- a/device/DEPS +++ b/device/DEPS @@ -1,4 +1,4 @@ include_rules = [ "+chromeos", - "+mojo/public", + "+third_party/mojo/src/mojo/public", ] diff --git a/device/battery/battery_monitor_impl.h b/device/battery/battery_monitor_impl.h index 49e85708..7fb1c139 100644 --- a/device/battery/battery_monitor_impl.h +++ b/device/battery/battery_monitor_impl.h @@ -11,7 +11,7 @@ #include "device/battery/battery_export.h" #include "device/battery/battery_monitor.mojom.h" #include "device/battery/battery_status_service.h" -#include "mojo/public/cpp/bindings/strong_binding.h" +#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" namespace device { diff --git a/device/serial/data_receiver.h b/device/serial/data_receiver.h index 14bcdf31..942bb5c 100644 --- a/device/serial/data_receiver.h +++ b/device/serial/data_receiver.h @@ -13,7 +13,7 @@ #include "base/memory/weak_ptr.h" #include "device/serial/buffer.h" #include "device/serial/data_stream.mojom.h" -#include "mojo/public/cpp/system/data_pipe.h" +#include "third_party/mojo/src/mojo/public/cpp/system/data_pipe.h" namespace device { diff --git a/device/serial/data_sender.h b/device/serial/data_sender.h index c056afb..f4db8bc 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 "mojo/public/cpp/system/data_pipe.h" +#include "third_party/mojo/src/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 e8c3e0e..2126cdd 100644 --- a/device/serial/data_sink_receiver.h +++ b/device/serial/data_sink_receiver.h @@ -13,7 +13,7 @@ #include "base/memory/weak_ptr.h" #include "device/serial/buffer.h" #include "device/serial/data_stream.mojom.h" -#include "mojo/public/cpp/system/data_pipe.h" +#include "third_party/mojo/src/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 29f3587..2484362 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 bdd3121..3a90240 100644 --- a/device/serial/data_source_sender.h +++ b/device/serial/data_source_sender.h @@ -12,7 +12,7 @@ #include "base/memory/weak_ptr.h" #include "device/serial/buffer.h" #include "device/serial/data_stream.mojom.h" -#include "mojo/public/cpp/system/data_pipe.h" +#include "third_party/mojo/src/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 3d96f55..71dfa81 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 66f9c54..d0b940f 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 "mojo/public/cpp/bindings/interface_impl.h" +#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_impl.h" namespace device { diff --git a/device/serial/serial_connection_factory.h b/device/serial/serial_connection_factory.h index 13b055c..4200dca 100644 --- a/device/serial/serial_connection_factory.h +++ b/device/serial/serial_connection_factory.h @@ -12,7 +12,7 @@ #include "base/message_loop/message_loop_proxy.h" #include "device/serial/data_stream.mojom.h" #include "device/serial/serial.mojom.h" -#include "mojo/public/cpp/bindings/interface_request.h" +#include "third_party/mojo/src/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 9edec43..151ed77 100644 --- a/device/serial/serial_connection_unittest.cc +++ b/device/serial/serial_connection_unittest.cc @@ -15,10 +15,10 @@ #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/error_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/error_handler.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 77e2ae5..eeae615 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 "mojo/public/cpp/bindings/array.h" +#include "third_party/mojo/src/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 ea48e46..0caf00e 100644 --- a/device/serial/serial_service_impl.h +++ b/device/serial/serial_service_impl.h @@ -11,7 +11,7 @@ #include "device/serial/serial.mojom.h" #include "device/serial/serial_connection_factory.h" #include "device/serial/serial_device_enumerator.h" -#include "mojo/public/cpp/bindings/interface_impl.h" +#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_impl.h" namespace device { diff --git a/device/serial/serial_service_unittest.cc b/device/serial/serial_service_unittest.cc index 489d88e..bf08217 100644 --- a/device/serial/serial_service_unittest.cc +++ b/device/serial/serial_service_unittest.cc @@ -8,10 +8,10 @@ #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/error_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/error_handler.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/test/DEPS b/device/test/DEPS index 7a97c8e..855cb249 100644 --- a/device/test/DEPS +++ b/device/test/DEPS @@ -1,5 +1,5 @@ include_rules = [ - "+mojo/edk/embedder", "+net/proxy", "+net/url_request", + "+third_party/mojo/src/mojo/edk/embedder", ] diff --git a/device/test/run_all_unittests.cc b/device/test/run_all_unittests.cc index d8e2928..cfc0db3 100644 --- a/device/test/run_all_unittests.cc +++ b/device/test/run_all_unittests.cc @@ -5,7 +5,7 @@ #include "base/bind.h" #include "base/test/launcher/unit_test_launcher.h" #include "base/test/test_suite.h" -#include "mojo/edk/embedder/test_embedder.h" +#include "third_party/mojo/src/mojo/edk/embedder/test_embedder.h" int main(int argc, char** argv) { base::TestSuite test_suite(argc, argv); diff --git a/extensions/DEPS b/extensions/DEPS index 1a7b60a..183bba6 100644 --- a/extensions/DEPS +++ b/extensions/DEPS @@ -11,7 +11,7 @@ include_rules = [ "+extensions/test", "+grit/extensions_renderer_resources.h", "+grit/extensions_resources.h", - "+mojo/public", + "+third_party/mojo/src/mojo/public", "+third_party/skia/include", "+testing", diff --git a/extensions/browser/api/mime_handler_private/mime_handler_private.cc b/extensions/browser/api/mime_handler_private/mime_handler_private.cc index b1f816c..e2a25b1 100644 --- a/extensions/browser/api/mime_handler_private/mime_handler_private.cc +++ b/extensions/browser/api/mime_handler_private/mime_handler_private.cc @@ -8,8 +8,8 @@ #include "content/public/browser/stream_info.h" #include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h" #include "extensions/common/constants.h" -#include "mojo/public/cpp/bindings/map.h" #include "net/http/http_response_headers.h" +#include "third_party/mojo/src/mojo/public/cpp/bindings/map.h" namespace extensions { namespace { diff --git a/extensions/browser/mojo/keep_alive_impl.h b/extensions/browser/mojo/keep_alive_impl.h index 0544f95..09473e2 100644 --- a/extensions/browser/mojo/keep_alive_impl.h +++ b/extensions/browser/mojo/keep_alive_impl.h @@ -7,7 +7,7 @@ #include "base/callback.h" #include "extensions/common/mojo/keep_alive.mojom.h" -#include "mojo/public/cpp/bindings/interface_request.h" +#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h" namespace content { class BrowserContext; diff --git a/extensions/browser/mojo/service_registration_manager.h b/extensions/browser/mojo/service_registration_manager.h index 5fed206..e57fba2 100644 --- a/extensions/browser/mojo/service_registration_manager.h +++ b/extensions/browser/mojo/service_registration_manager.h @@ -12,7 +12,7 @@ #include "base/callback.h" #include "base/memory/linked_ptr.h" #include "content/public/common/service_registry.h" -#include "mojo/public/cpp/bindings/interface_request.h" +#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h" namespace content { class RenderFrameHost; diff --git a/extensions/browser/mojo/stash_backend.h b/extensions/browser/mojo/stash_backend.h index b90e43d..2aff134 100644 --- a/extensions/browser/mojo/stash_backend.h +++ b/extensions/browser/mojo/stash_backend.h @@ -10,7 +10,7 @@ #include "base/memory/linked_ptr.h" #include "base/memory/weak_ptr.h" #include "extensions/common/mojo/stash.mojom.h" -#include "mojo/public/cpp/bindings/interface_request.h" +#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h" namespace extensions { diff --git a/extensions/renderer/DEPS b/extensions/renderer/DEPS index fadfee7..fcbffb6 100644 --- a/extensions/renderer/DEPS +++ b/extensions/renderer/DEPS @@ -2,7 +2,7 @@ include_rules = [ "+content/public/renderer", "+gin", - "+mojo/edk/js", + "+third_party/mojo/src/mojo/edk/js", "+third_party/skia/include/core", diff --git a/extensions/renderer/api_test_base.cc b/extensions/renderer/api_test_base.cc index 6b9c837..9457df8 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/edk/js/core.h" -#include "mojo/edk/js/handle.h" -#include "mojo/edk/js/support.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 1989727..26a60a7 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/edk/js/handle.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 943f1fd..ddd1c63 100644 --- a/extensions/renderer/dispatcher.cc +++ b/extensions/renderer/dispatcher.cc @@ -82,7 +82,6 @@ #include "extensions/renderer/utils_native_handler.h" #include "extensions/renderer/v8_context_native_handler.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" @@ -93,6 +92,7 @@ #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 2e76dd3..4f23621 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 "mojo/public/cpp/bindings/interface_impl.h" +#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_impl.h" // A test launcher for tests for the stash client defined in // extensions/test/data/keep_alive_client_unittest.js. diff --git a/extensions/test/DEPS b/extensions/test/DEPS index 27ef4ea..b334588 100644 --- a/extensions/test/DEPS +++ b/extensions/test/DEPS @@ -1,5 +1,5 @@ include_rules = [ "+content/public", - "+mojo/edk/embedder", + "+third_party/mojo/src/mojo/edk/embedder", "+ui/gl", ] diff --git a/extensions/test/extensions_unittests_main.cc b/extensions/test/extensions_unittests_main.cc index cdf926a..9452f31b 100644 --- a/extensions/test/extensions_unittests_main.cc +++ b/extensions/test/extensions_unittests_main.cc @@ -13,7 +13,7 @@ #include "extensions/common/constants.h" #include "extensions/common/extension_paths.h" #include "extensions/test/test_extensions_client.h" -#include "mojo/edk/embedder/test_embedder.h" +#include "third_party/mojo/src/mojo/edk/embedder/test_embedder.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gl/gl_surface.h" diff --git a/ipc/mojo/DEPS b/ipc/mojo/DEPS index 039e243..fb36693 100644 --- a/ipc/mojo/DEPS +++ b/ipc/mojo/DEPS @@ -1,4 +1,4 @@ include_rules = [ - "+mojo/public", - "+mojo/edk/embedder", + "+third_party/mojo/src/mojo/public", + "+third_party/mojo/src/mojo/edk/embedder", ] diff --git a/ipc/mojo/async_handle_waiter.cc b/ipc/mojo/async_handle_waiter.cc index f19d782..7b199ed 100644 --- a/ipc/mojo/async_handle_waiter.cc +++ b/ipc/mojo/async_handle_waiter.cc @@ -10,7 +10,7 @@ #include "base/location.h" #include "base/logging.h" #include "base/message_loop/message_loop.h" -#include "mojo/edk/embedder/embedder.h" +#include "third_party/mojo/src/mojo/edk/embedder/embedder.h" namespace IPC { namespace internal { diff --git a/ipc/mojo/async_handle_waiter.h b/ipc/mojo/async_handle_waiter.h index 16d9c88..55acb3e 100644 --- a/ipc/mojo/async_handle_waiter.h +++ b/ipc/mojo/async_handle_waiter.h @@ -9,7 +9,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "ipc/ipc_export.h" -#include "mojo/public/c/system/types.h" +#include "third_party/mojo/src/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 dd13d46..fbaf3ca 100644 --- a/ipc/mojo/async_handle_waiter_unittest.cc +++ b/ipc/mojo/async_handle_waiter_unittest.cc @@ -8,8 +8,8 @@ #include "base/message_loop/message_loop.h" #include "base/run_loop.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 1f3e3c4..201fe57 100644 --- a/ipc/mojo/ipc_channel_mojo.cc +++ b/ipc/mojo/ipc_channel_mojo.cc @@ -13,8 +13,8 @@ #include "ipc/ipc_message_macros.h" #include "ipc/mojo/client_channel.mojom.h" #include "ipc/mojo/ipc_mojo_bootstrap.h" -#include "mojo/edk/embedder/embedder.h" -#include "mojo/public/cpp/bindings/error_handler.h" +#include "third_party/mojo/src/mojo/edk/embedder/embedder.h" +#include "third_party/mojo/src/mojo/public/cpp/bindings/error_handler.h" namespace IPC { diff --git a/ipc/mojo/ipc_channel_mojo.h b/ipc/mojo/ipc_channel_mojo.h index 43dd0d0..5062577 100644 --- a/ipc/mojo/ipc_channel_mojo.h +++ b/ipc/mojo/ipc_channel_mojo.h @@ -15,8 +15,8 @@ #include "ipc/ipc_export.h" #include "ipc/mojo/ipc_message_pipe_reader.h" #include "ipc/mojo/ipc_mojo_bootstrap.h" -#include "mojo/edk/embedder/channel_info_forward.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 90efe6f..74de71b 100644 --- a/ipc/mojo/ipc_message_pipe_reader.h +++ b/ipc/mojo/ipc_message_pipe_reader.h @@ -10,8 +10,8 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "ipc/ipc_message.h" -#include "mojo/public/c/environment/async_waiter.h" -#include "mojo/public/cpp/system/core.h" +#include "third_party/mojo/src/mojo/public/c/environment/async_waiter.h" +#include "third_party/mojo/src/mojo/public/cpp/system/core.h" namespace IPC { namespace internal { diff --git a/ipc/mojo/ipc_mojo_bootstrap.cc b/ipc/mojo/ipc_mojo_bootstrap.cc index a95dae2..591ced0 100644 --- a/ipc/mojo/ipc_mojo_bootstrap.cc +++ b/ipc/mojo/ipc_mojo_bootstrap.cc @@ -8,7 +8,7 @@ #include "base/process/process_handle.h" #include "ipc/ipc_message_utils.h" #include "ipc/ipc_platform_file.h" -#include "mojo/edk/embedder/platform_channel_pair.h" +#include "third_party/mojo/src/mojo/edk/embedder/platform_channel_pair.h" namespace IPC { diff --git a/ipc/mojo/ipc_mojo_bootstrap.h b/ipc/mojo/ipc_mojo_bootstrap.h index 7267553..eb1a987 100644 --- a/ipc/mojo/ipc_mojo_bootstrap.h +++ b/ipc/mojo/ipc_mojo_bootstrap.h @@ -9,7 +9,7 @@ #include "base/process/process_handle.h" #include "ipc/ipc_channel.h" #include "ipc/ipc_listener.h" -#include "mojo/edk/embedder/scoped_platform_handle.h" +#include "third_party/mojo/src/mojo/edk/embedder/scoped_platform_handle.h" namespace IPC { diff --git a/ipc/mojo/ipc_mojo_perftest.cc b/ipc/mojo/ipc_mojo_perftest.cc index 8bdac8c9..7147cd0 100644 --- a/ipc/mojo/ipc_mojo_perftest.cc +++ b/ipc/mojo/ipc_mojo_perftest.cc @@ -6,7 +6,7 @@ #include "ipc/ipc_perftest_support.h" #include "ipc/mojo/ipc_channel_mojo.h" #include "ipc/mojo/ipc_channel_mojo_host.h" -#include "mojo/edk/embedder/test_embedder.h" +#include "third_party/mojo/src/mojo/edk/embedder/test_embedder.h" namespace { diff --git a/ipc/mojo/run_all_unittests.cc b/ipc/mojo/run_all_unittests.cc index cc5b102..fe2bf85 100644 --- a/ipc/mojo/run_all_unittests.cc +++ b/ipc/mojo/run_all_unittests.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/test/launcher/unit_test_launcher.h" #include "base/test/test_suite.h" -#include "mojo/edk/embedder/test_embedder.h" +#include "third_party/mojo/src/mojo/edk/embedder/test_embedder.h" #if defined(OS_ANDROID) #include "base/android/jni_android.h" diff --git a/media/mojo/DEPS b/media/mojo/DEPS index cc40af5..fe3c60e 100644 --- a/media/mojo/DEPS +++ b/media/mojo/DEPS @@ -2,5 +2,5 @@ include_rules = [ "+mojo/application", "+mojo/common", "+mojo/converters", - "+mojo/public", + "+third_party/mojo/src/mojo/public", ] diff --git a/media/mojo/services/mojo_cdm.cc b/media/mojo/services/mojo_cdm.cc index 24d5905..88c5848 100644 --- a/media/mojo/services/mojo_cdm.cc +++ b/media/mojo/services/mojo_cdm.cc @@ -9,9 +9,9 @@ #include "media/base/cdm_key_information.h" #include "media/base/cdm_promise.h" #include "media/mojo/services/media_type_converters.h" -#include "mojo/public/cpp/application/connect.h" -#include "mojo/public/cpp/bindings/interface_impl.h" -#include "mojo/public/interfaces/application/service_provider.mojom.h" +#include "third_party/mojo/src/mojo/public/cpp/application/connect.h" +#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_impl.h" +#include "third_party/mojo/src/mojo/public/interfaces/application/service_provider.mojom.h" #include "url/gurl.h" namespace media { diff --git a/media/mojo/services/mojo_cdm_promise.h b/media/mojo/services/mojo_cdm_promise.h index 233d5b1..9e6a507 100644 --- a/media/mojo/services/mojo_cdm_promise.h +++ b/media/mojo/services/mojo_cdm_promise.h @@ -9,7 +9,7 @@ #include "media/base/cdm_promise.h" #include "media/mojo/interfaces/content_decryption_module.mojom.h" #include "media/mojo/services/mojo_type_trait.h" -#include "mojo/public/cpp/bindings/callback.h" +#include "third_party/mojo/src/mojo/public/cpp/bindings/callback.h" namespace media { diff --git a/media/mojo/services/mojo_cdm_service.h b/media/mojo/services/mojo_cdm_service.h index da8f372..77f6149 100644 --- a/media/mojo/services/mojo_cdm_service.h +++ b/media/mojo/services/mojo_cdm_service.h @@ -11,7 +11,7 @@ #include "base/memory/weak_ptr.h" #include "media/base/media_keys.h" #include "media/mojo/interfaces/content_decryption_module.mojom.h" -#include "mojo/public/cpp/bindings/interface_impl.h" +#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_impl.h" namespace media { diff --git a/media/mojo/services/mojo_demuxer_stream_adapter.cc b/media/mojo/services/mojo_demuxer_stream_adapter.cc index ca04816..52139fc 100644 --- a/media/mojo/services/mojo_demuxer_stream_adapter.cc +++ b/media/mojo/services/mojo_demuxer_stream_adapter.cc @@ -8,7 +8,7 @@ #include "base/callback_helpers.h" #include "media/base/decoder_buffer.h" #include "media/mojo/services/media_type_converters.h" -#include "mojo/public/cpp/system/data_pipe.h" +#include "third_party/mojo/src/mojo/public/cpp/system/data_pipe.h" namespace media { diff --git a/media/mojo/services/mojo_demuxer_stream_impl.cc b/media/mojo/services/mojo_demuxer_stream_impl.cc index ffc7914..b5f24de 100644 --- a/media/mojo/services/mojo_demuxer_stream_impl.cc +++ b/media/mojo/services/mojo_demuxer_stream_impl.cc @@ -11,8 +11,8 @@ #include "media/base/video_decoder_config.h" #include "media/mojo/interfaces/demuxer_stream.mojom.h" #include "media/mojo/services/media_type_converters.h" -#include "mojo/public/cpp/bindings/interface_impl.h" -#include "mojo/public/cpp/system/data_pipe.h" +#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_impl.h" +#include "third_party/mojo/src/mojo/public/cpp/system/data_pipe.h" namespace media { diff --git a/media/mojo/services/mojo_demuxer_stream_impl.h b/media/mojo/services/mojo_demuxer_stream_impl.h index ec22040..adec06d 100644 --- a/media/mojo/services/mojo_demuxer_stream_impl.h +++ b/media/mojo/services/mojo_demuxer_stream_impl.h @@ -9,7 +9,7 @@ #include "base/memory/weak_ptr.h" #include "media/base/demuxer_stream.h" #include "media/mojo/interfaces/demuxer_stream.mojom.h" -#include "mojo/public/cpp/bindings/interface_impl.h" +#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_impl.h" namespace media { class DemuxerStream; diff --git a/media/mojo/services/mojo_media_application.cc b/media/mojo/services/mojo_media_application.cc index 145dec69..24f6e29 100644 --- a/media/mojo/services/mojo_media_application.cc +++ b/media/mojo/services/mojo_media_application.cc @@ -7,11 +7,11 @@ #include "base/strings/utf_string_conversions.h" #include "media/mojo/services/mojo_renderer_service.h" #include "mojo/application/application_runner_chromium.h" -#include "mojo/public/c/system/main.h" -#include "mojo/public/cpp/application/application_connection.h" -#include "mojo/public/cpp/application/application_delegate.h" -#include "mojo/public/cpp/application/application_impl.h" -#include "mojo/public/cpp/application/interface_factory_impl.h" +#include "third_party/mojo/src/mojo/public/c/system/main.h" +#include "third_party/mojo/src/mojo/public/cpp/application/application_connection.h" +#include "third_party/mojo/src/mojo/public/cpp/application/application_delegate.h" +#include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h" +#include "third_party/mojo/src/mojo/public/cpp/application/interface_factory_impl.h" namespace media { diff --git a/media/mojo/services/mojo_renderer_factory.h b/media/mojo/services/mojo_renderer_factory.h index 5ebcffa..2aa6cfc 100644 --- a/media/mojo/services/mojo_renderer_factory.h +++ b/media/mojo/services/mojo_renderer_factory.h @@ -8,7 +8,7 @@ #include "media/base/media_export.h" #include "media/base/renderer_factory.h" #include "media/mojo/interfaces/media_renderer.mojom.h" -#include "mojo/public/cpp/bindings/interface_ptr.h" +#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_ptr.h" namespace media { diff --git a/media/mojo/services/mojo_renderer_impl.cc b/media/mojo/services/mojo_renderer_impl.cc index c177031..08a8ca5 100644 --- a/media/mojo/services/mojo_renderer_impl.cc +++ b/media/mojo/services/mojo_renderer_impl.cc @@ -11,9 +11,9 @@ #include "media/base/bind_to_current_loop.h" #include "media/base/demuxer_stream_provider.h" #include "media/mojo/services/mojo_demuxer_stream_impl.h" -#include "mojo/public/cpp/application/connect.h" -#include "mojo/public/cpp/bindings/interface_impl.h" -#include "mojo/public/interfaces/application/service_provider.mojom.h" +#include "third_party/mojo/src/mojo/public/cpp/application/connect.h" +#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_impl.h" +#include "third_party/mojo/src/mojo/public/interfaces/application/service_provider.mojom.h" namespace media { diff --git a/media/mojo/services/mojo_renderer_service.h b/media/mojo/services/mojo_renderer_service.h index 7ad544b..19efe0f 100644 --- a/media/mojo/services/mojo_renderer_service.h +++ b/media/mojo/services/mojo_renderer_service.h @@ -14,7 +14,7 @@ #include "media/base/buffering_state.h" #include "media/base/pipeline_status.h" #include "media/mojo/interfaces/media_renderer.mojom.h" -#include "mojo/public/cpp/bindings/interface_impl.h" +#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_impl.h" namespace mojo { class ApplicationConnection; diff --git a/media/mojo/services/mojo_type_trait.h b/media/mojo/services/mojo_type_trait.h index d041b76..19d87a1 100644 --- a/media/mojo/services/mojo_type_trait.h +++ b/media/mojo/services/mojo_type_trait.h @@ -6,8 +6,8 @@ #define MEDIA_MOJO_SERVICES_MOJO_TYPE_TRAIT_H_ #include "media/base/media_keys.h" -#include "mojo/public/cpp/bindings/array.h" -#include "mojo/public/cpp/bindings/string.h" +#include "third_party/mojo/src/mojo/public/cpp/bindings/array.h" +#include "third_party/mojo/src/mojo/public/cpp/bindings/string.h" namespace media { diff --git a/media/test/DEPS b/media/test/DEPS index ef8ad28..5f8633a 100644 --- a/media/test/DEPS +++ b/media/test/DEPS @@ -1,3 +1,3 @@ include_rules = [ - "+mojo/public", + "+third_party/mojo/src/mojo/public", ] diff --git a/media/test/pipeline_integration_test.cc b/media/test/pipeline_integration_test.cc index c4782c6..d326a6c 100644 --- a/media/test/pipeline_integration_test.cc +++ b/media/test/pipeline_integration_test.cc @@ -24,9 +24,9 @@ #if defined(MOJO_RENDERER) #include "media/mojo/services/mojo_renderer_impl.h" -#include "mojo/public/cpp/application/application_impl.h" -#include "mojo/public/cpp/application/application_test_base.h" -#include "mojo/public/cpp/application/connect.h" +#include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h" +#include "third_party/mojo/src/mojo/public/cpp/application/application_test_base.h" +#include "third_party/mojo/src/mojo/public/cpp/application/connect.h" // TODO(dalecurtis): The mojo renderer is in another process, so we have no way // currently to get hashes for video and audio samples. This also means that @@ -2,6 +2,8 @@ include_rules = [ "+base", "+build", "+mojo", - "-mojo/edk/system", "+testing", + "+third_party/mojo/src/mojo/edk", + "-third_party/mojo/src/mojo/edk/system", + "+third_party/mojo/src/mojo/public", ] diff --git a/mojo/android/javatests/init_library.cc b/mojo/android/javatests/init_library.cc index c738981..958d8ee 100644 --- a/mojo/android/javatests/init_library.cc +++ b/mojo/android/javatests/init_library.cc @@ -9,8 +9,8 @@ #include "mojo/android/javatests/mojo_test_case.h" #include "mojo/android/javatests/validation_test_util.h" #include "mojo/android/system/core_impl.h" -#include "mojo/edk/embedder/embedder.h" -#include "mojo/edk/embedder/simple_platform_support.h" +#include "third_party/mojo/src/mojo/edk/embedder/embedder.h" +#include "third_party/mojo/src/mojo/edk/embedder/simple_platform_support.h" namespace { diff --git a/mojo/android/javatests/mojo_test_case.cc b/mojo/android/javatests/mojo_test_case.cc index 419d14d..74998a4 100644 --- a/mojo/android/javatests/mojo_test_case.cc +++ b/mojo/android/javatests/mojo_test_case.cc @@ -15,7 +15,7 @@ #include "jni/MojoTestCase_jni.h" #include "mojo/common/message_pump_mojo.h" -#include "mojo/public/cpp/environment/environment.h" +#include "third_party/mojo/src/mojo/public/cpp/environment/environment.h" namespace { diff --git a/mojo/android/javatests/validation_test_util.cc b/mojo/android/javatests/validation_test_util.cc index 2289e02..a01974f 100644 --- a/mojo/android/javatests/validation_test_util.cc +++ b/mojo/android/javatests/validation_test_util.cc @@ -9,7 +9,7 @@ #include "base/android/scoped_java_ref.h" #include "base/test/test_support_android.h" #include "jni/ValidationTestUtil_jni.h" -#include "mojo/public/cpp/bindings/tests/validation_test_input_parser.h" +#include "third_party/mojo/src/mojo/public/cpp/bindings/tests/validation_test_input_parser.h" namespace mojo { namespace android { diff --git a/mojo/android/system/core_impl.cc b/mojo/android/system/core_impl.cc index 55a374e..4898eec 100644 --- a/mojo/android/system/core_impl.cc +++ b/mojo/android/system/core_impl.cc @@ -13,9 +13,9 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "jni/CoreImpl_jni.h" -#include "mojo/public/c/environment/async_waiter.h" -#include "mojo/public/c/system/core.h" -#include "mojo/public/cpp/environment/environment.h" +#include "third_party/mojo/src/mojo/public/c/environment/async_waiter.h" +#include "third_party/mojo/src/mojo/public/c/system/core.h" +#include "third_party/mojo/src/mojo/public/cpp/environment/environment.h" namespace { diff --git a/mojo/application/application_runner_chromium.cc b/mojo/application/application_runner_chromium.cc index e49b8e2..ed6d013 100644 --- a/mojo/application/application_runner_chromium.cc +++ b/mojo/application/application_runner_chromium.cc @@ -10,8 +10,8 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "mojo/common/message_pump_mojo.h" -#include "mojo/public/cpp/application/application_delegate.h" -#include "mojo/public/cpp/application/application_impl.h" +#include "third_party/mojo/src/mojo/public/cpp/application/application_delegate.h" +#include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h" namespace mojo { diff --git a/mojo/application/application_runner_chromium.h b/mojo/application/application_runner_chromium.h index 8671342..cb58685 100644 --- a/mojo/application/application_runner_chromium.h +++ b/mojo/application/application_runner_chromium.h @@ -7,7 +7,7 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" -#include "mojo/public/cpp/system/core.h" +#include "third_party/mojo/src/mojo/public/cpp/system/core.h" namespace mojo { diff --git a/mojo/application/application_test_main_chromium.cc b/mojo/application/application_test_main_chromium.cc index ace886d..33c4084 100644 --- a/mojo/application/application_test_main_chromium.cc +++ b/mojo/application/application_test_main_chromium.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "base/at_exit.h" -#include "mojo/public/c/system/main.h" -#include "mojo/public/cpp/application/application_test_base.h" +#include "third_party/mojo/src/mojo/public/c/system/main.h" +#include "third_party/mojo/src/mojo/public/cpp/application/application_test_base.h" MojoResult MojoMain(MojoHandle shell_handle) { // An AtExitManager instance is needed to construct message loops. diff --git a/mojo/cc/context_provider_mojo.cc b/mojo/cc/context_provider_mojo.cc index 16c6f8c..8e5411d 100644 --- a/mojo/cc/context_provider_mojo.cc +++ b/mojo/cc/context_provider_mojo.cc @@ -5,7 +5,7 @@ #include "mojo/cc/context_provider_mojo.h" #include "base/logging.h" -#include "mojo/public/cpp/environment/environment.h" +#include "third_party/mojo/src/mojo/public/cpp/environment/environment.h" namespace mojo { diff --git a/mojo/cc/context_provider_mojo.h b/mojo/cc/context_provider_mojo.h index 014b973..76cd19f 100644 --- a/mojo/cc/context_provider_mojo.h +++ b/mojo/cc/context_provider_mojo.h @@ -7,8 +7,8 @@ #include "base/macros.h" #include "cc/output/context_provider.h" -#include "mojo/public/c/gles2/gles2.h" -#include "mojo/public/cpp/system/core.h" +#include "third_party/mojo/src/mojo/public/c/gles2/gles2.h" +#include "third_party/mojo/src/mojo/public/cpp/system/core.h" namespace mojo { diff --git a/mojo/common/DEPS b/mojo/common/DEPS index e8ac428..f3ee1c8 100644 --- a/mojo/common/DEPS +++ b/mojo/common/DEPS @@ -2,5 +2,5 @@ include_rules = [ # common must not depend on embedder. "-mojo", "+mojo/common", - "+mojo/public", + "+third_party/mojo/src/mojo/public", ] diff --git a/mojo/common/common_type_converters.h b/mojo/common/common_type_converters.h index 7b0260a..8ba2708 100644 --- a/mojo/common/common_type_converters.h +++ b/mojo/common/common_type_converters.h @@ -8,9 +8,9 @@ #include "base/strings/string16.h" #include "base/strings/string_piece.h" #include "mojo/common/mojo_common_export.h" -#include "mojo/public/cpp/bindings/array.h" -#include "mojo/public/cpp/bindings/string.h" -#include "mojo/public/cpp/bindings/type_converter.h" +#include "third_party/mojo/src/mojo/public/cpp/bindings/array.h" +#include "third_party/mojo/src/mojo/public/cpp/bindings/string.h" +#include "third_party/mojo/src/mojo/public/cpp/bindings/type_converter.h" class GURL; diff --git a/mojo/common/data_pipe_utils.h b/mojo/common/data_pipe_utils.h index dc2197b..65a0b8b 100644 --- a/mojo/common/data_pipe_utils.h +++ b/mojo/common/data_pipe_utils.h @@ -9,7 +9,7 @@ #include "base/callback_forward.h" #include "mojo/common/mojo_common_export.h" -#include "mojo/public/cpp/system/core.h" +#include "third_party/mojo/src/mojo/public/cpp/system/core.h" namespace base { class FilePath; diff --git a/mojo/common/handle_watcher.h b/mojo/common/handle_watcher.h index dfcb145..9056ec4 100644 --- a/mojo/common/handle_watcher.h +++ b/mojo/common/handle_watcher.h @@ -10,7 +10,7 @@ #include "base/memory/scoped_ptr.h" #include "base/run_loop.h" #include "mojo/common/mojo_common_export.h" -#include "mojo/public/cpp/system/core.h" +#include "third_party/mojo/src/mojo/public/cpp/system/core.h" namespace base { class Thread; diff --git a/mojo/common/handle_watcher_unittest.cc b/mojo/common/handle_watcher_unittest.cc index 61913cd..3323421 100644 --- a/mojo/common/handle_watcher_unittest.cc +++ b/mojo/common/handle_watcher_unittest.cc @@ -15,9 +15,9 @@ #include "base/threading/thread.h" #include "mojo/common/message_pump_mojo.h" #include "mojo/common/time_helper.h" -#include "mojo/public/cpp/system/core.h" -#include "mojo/public/cpp/test_support/test_utils.h" #include "testing/gtest/include/gtest/gtest.h" +#include "third_party/mojo/src/mojo/public/cpp/system/core.h" +#include "third_party/mojo/src/mojo/public/cpp/test_support/test_utils.h" namespace mojo { namespace common { diff --git a/mojo/common/message_pump_mojo.h b/mojo/common/message_pump_mojo.h index b313271..899f979 100644 --- a/mojo/common/message_pump_mojo.h +++ b/mojo/common/message_pump_mojo.h @@ -14,7 +14,7 @@ #include "base/synchronization/lock.h" #include "base/time/time.h" #include "mojo/common/mojo_common_export.h" -#include "mojo/public/cpp/system/core.h" +#include "third_party/mojo/src/mojo/public/cpp/system/core.h" namespace mojo { namespace common { diff --git a/mojo/common/message_pump_mojo_handler.h b/mojo/common/message_pump_mojo_handler.h index ba40f80..dd136ed 100644 --- a/mojo/common/message_pump_mojo_handler.h +++ b/mojo/common/message_pump_mojo_handler.h @@ -6,7 +6,7 @@ #define MOJO_COMMON_MESSAGE_PUMP_MOJO_HANDLER_H_ #include "mojo/common/mojo_common_export.h" -#include "mojo/public/cpp/system/core.h" +#include "third_party/mojo/src/mojo/public/cpp/system/core.h" namespace mojo { namespace common { diff --git a/mojo/common/message_pump_mojo_unittest.cc b/mojo/common/message_pump_mojo_unittest.cc index 09cbe54..5d695f6 100644 --- a/mojo/common/message_pump_mojo_unittest.cc +++ b/mojo/common/message_pump_mojo_unittest.cc @@ -7,8 +7,8 @@ #include "base/message_loop/message_loop_test.h" #include "base/run_loop.h" #include "mojo/common/message_pump_mojo_handler.h" -#include "mojo/public/cpp/system/core.h" #include "testing/gtest/include/gtest/gtest.h" +#include "third_party/mojo/src/mojo/public/cpp/system/core.h" namespace mojo { namespace common { diff --git a/mojo/environment/default_async_waiter_impl.h b/mojo/environment/default_async_waiter_impl.h index 5140e35..dea4621 100644 --- a/mojo/environment/default_async_waiter_impl.h +++ b/mojo/environment/default_async_waiter_impl.h @@ -6,7 +6,7 @@ #define MOJO_ENVIRONMENT_DEFAULT_ASYNC_WAITER_IMPL_H_ #include "mojo/environment/mojo_environment_impl_export.h" -#include "mojo/public/c/environment/async_waiter.h" +#include "third_party/mojo/src/mojo/public/c/environment/async_waiter.h" namespace mojo { namespace internal { diff --git a/mojo/environment/default_logger_impl.h b/mojo/environment/default_logger_impl.h index c87a727..ca73237 100644 --- a/mojo/environment/default_logger_impl.h +++ b/mojo/environment/default_logger_impl.h @@ -6,7 +6,7 @@ #define MOJO_ENVIRONMENT_DEFAULT_LOGGER_IMPL_H_ #include "mojo/environment/mojo_environment_impl_export.h" -#include "mojo/public/c/environment/logger.h" +#include "third_party/mojo/src/mojo/public/c/environment/logger.h" namespace mojo { namespace internal { diff --git a/mojo/environment/environment.cc b/mojo/environment/environment.cc index 418d89e6..ec18166 100644 --- a/mojo/environment/environment.cc +++ b/mojo/environment/environment.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "mojo/public/cpp/environment/environment.h" +#include "third_party/mojo/src/mojo/public/cpp/environment/environment.h" #include "mojo/environment/default_async_waiter_impl.h" #include "mojo/environment/default_logger_impl.h" diff --git a/mojo/nacl/generator/libmojo.cc.tmpl b/mojo/nacl/generator/libmojo.cc.tmpl index 7a70376..a58ad81 100644 --- a/mojo/nacl/generator/libmojo.cc.tmpl +++ b/mojo/nacl/generator/libmojo.cc.tmpl @@ -4,10 +4,10 @@ {{generator_warning}} -#include "mojo/public/c/system/core.h" #include "native_client/src/public/chrome_main.h" #include "native_client/src/public/imc_syscalls.h" #include "native_client/src/public/imc_types.h" +#include "third_party/mojo/src/mojo/public/c/system/core.h" // The value for this FD must not conflict with uses inside Chromium. However, // mojo/nacl doesn't depend on any Chromium headers, so we can't use a #define diff --git a/mojo/nacl/generator/mojo_syscall.cc.tmpl b/mojo/nacl/generator/mojo_syscall.cc.tmpl index 8ba7665..c3d835a 100644 --- a/mojo/nacl/generator/mojo_syscall.cc.tmpl +++ b/mojo/nacl/generator/mojo_syscall.cc.tmpl @@ -9,10 +9,10 @@ #include <stdio.h> #include "mojo/nacl/mojo_syscall_internal.h" -#include "mojo/public/c/system/core.h" #include "native_client/src/public/chrome_main.h" #include "native_client/src/public/nacl_app.h" #include "native_client/src/trusted/desc/nacl_desc_custom.h" +#include "third_party/mojo/src/mojo/public/c/system/core.h" namespace { diff --git a/mojo/nacl/monacl_shell.cc b/mojo/nacl/monacl_shell.cc index 7922d9a..e838fa7 100644 --- a/mojo/nacl/monacl_shell.cc +++ b/mojo/nacl/monacl_shell.cc @@ -4,9 +4,9 @@ #include <iostream> -#include "mojo/edk/embedder/embedder.h" -#include "mojo/edk/embedder/simple_platform_support.h" #include "mojo/nacl/monacl_sel_main.h" +#include "third_party/mojo/src/mojo/edk/embedder/embedder.h" +#include "third_party/mojo/src/mojo/edk/embedder/simple_platform_support.h" int main(int argc, char* argv[]) { diff --git a/mojo/services/DEPS b/mojo/services/DEPS index 2bbe62d..a7ee274 100644 --- a/mojo/services/DEPS +++ b/mojo/services/DEPS @@ -3,6 +3,7 @@ include_rules = [ "+mojo/common", "+mojo/public", "+jni", + "+third_party/mojo/src/mojo/public", # TODO(abarth) Instead of having the services depend on the shell, we # probably should create a layer below the services. diff --git a/mojo/services/html_viewer/ax_provider_impl.h b/mojo/services/html_viewer/ax_provider_impl.h index 5f03e47..fba6be4 100644 --- a/mojo/services/html_viewer/ax_provider_impl.h +++ b/mojo/services/html_viewer/ax_provider_impl.h @@ -5,8 +5,8 @@ #ifndef MOJO_SERVICES_HTML_VIEWER_AX_PROVIDER_IMPL_H_ #define MOJO_SERVICES_HTML_VIEWER_AX_PROVIDER_IMPL_H_ -#include "mojo/public/cpp/bindings/interface_impl.h" #include "mojo/services/accessibility/public/interfaces/accessibility.mojom.h" +#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_impl.h" namespace blink { class WebAXObject; diff --git a/mojo/services/html_viewer/blink_basic_type_converters.cc b/mojo/services/html_viewer/blink_basic_type_converters.cc index cf6d610..5324a7c 100644 --- a/mojo/services/html_viewer/blink_basic_type_converters.cc +++ b/mojo/services/html_viewer/blink_basic_type_converters.cc @@ -4,9 +4,9 @@ #include "mojo/services/html_viewer/blink_basic_type_converters.h" -#include "mojo/public/cpp/bindings/string.h" #include "third_party/WebKit/public/platform/WebRect.h" #include "third_party/WebKit/public/platform/WebString.h" +#include "third_party/mojo/src/mojo/public/cpp/bindings/string.h" using blink::WebRect; using blink::WebString; diff --git a/mojo/services/html_viewer/blink_basic_type_converters.h b/mojo/services/html_viewer/blink_basic_type_converters.h index 7fc2f9b..65f0681 100644 --- a/mojo/services/html_viewer/blink_basic_type_converters.h +++ b/mojo/services/html_viewer/blink_basic_type_converters.h @@ -5,11 +5,11 @@ #ifndef MOJO_SERVICES_HTML_VIEWER_BLINK_BASIC_TYPE_CONVERTERS_H_ #define MOJO_SERVICES_HTML_VIEWER_BLINK_BASIC_TYPE_CONVERTERS_H_ -#include "mojo/public/cpp/bindings/type_converter.h" +#include "third_party/mojo/src/mojo/public/cpp/bindings/type_converter.h" -#include "mojo/public/cpp/bindings/array.h" #include "mojo/services/geometry/public/interfaces/geometry.mojom.h" #include "third_party/WebKit/public/platform/WebVector.h" +#include "third_party/mojo/src/mojo/public/cpp/bindings/array.h" namespace blink { struct WebRect; diff --git a/mojo/services/html_viewer/blink_url_request_type_converters.cc b/mojo/services/html_viewer/blink_url_request_type_converters.cc index 9428d92..85fd796 100644 --- a/mojo/services/html_viewer/blink_url_request_type_converters.cc +++ b/mojo/services/html_viewer/blink_url_request_type_converters.cc @@ -5,9 +5,9 @@ #include "mojo/services/html_viewer/blink_url_request_type_converters.h" #include "base/strings/string_util.h" -#include "mojo/public/cpp/system/data_pipe.h" #include "third_party/WebKit/public/platform/WebHTTPHeaderVisitor.h" #include "third_party/WebKit/public/platform/WebURLRequest.h" +#include "third_party/mojo/src/mojo/public/cpp/system/data_pipe.h" namespace mojo { namespace { diff --git a/mojo/services/html_viewer/html_document.cc b/mojo/services/html_viewer/html_document.cc index 6bd33a1..a6929581 100644 --- a/mojo/services/html_viewer/html_document.cc +++ b/mojo/services/html_viewer/html_document.cc @@ -14,9 +14,6 @@ #include "base/thread_task_runner_handle.h" #include "media/blink/webencryptedmediaclient_impl.h" #include "media/cdm/default_cdm_factory.h" -#include "mojo/public/cpp/application/connect.h" -#include "mojo/public/cpp/system/data_pipe.h" -#include "mojo/public/interfaces/application/shell.mojom.h" #include "mojo/services/html_viewer/blink_input_events_type_converters.h" #include "mojo/services/html_viewer/blink_url_request_type_converters.h" #include "mojo/services/html_viewer/weblayertreeview_impl.h" @@ -37,6 +34,9 @@ #include "third_party/WebKit/public/web/WebScriptSource.h" #include "third_party/WebKit/public/web/WebSettings.h" #include "third_party/WebKit/public/web/WebView.h" +#include "third_party/mojo/src/mojo/public/cpp/application/connect.h" +#include "third_party/mojo/src/mojo/public/cpp/system/data_pipe.h" +#include "third_party/mojo/src/mojo/public/interfaces/application/shell.mojom.h" #include "third_party/skia/include/core/SkCanvas.h" #include "third_party/skia/include/core/SkColor.h" #include "third_party/skia/include/core/SkDevice.h" diff --git a/mojo/services/html_viewer/html_document.h b/mojo/services/html_viewer/html_document.h index 42bf166..40515b6 100644 --- a/mojo/services/html_viewer/html_document.h +++ b/mojo/services/html_viewer/html_document.h @@ -9,11 +9,6 @@ #include "base/callback.h" #include "base/macros.h" -#include "mojo/public/cpp/application/interface_factory.h" -#include "mojo/public/cpp/application/lazy_interface_ptr.h" -#include "mojo/public/cpp/application/service_provider_impl.h" -#include "mojo/public/cpp/bindings/interface_impl.h" -#include "mojo/public/interfaces/application/application.mojom.h" #include "mojo/services/content_handler/public/interfaces/content_handler.mojom.h" #include "mojo/services/html_viewer/ax_provider_impl.h" #include "mojo/services/navigation/public/interfaces/navigation.mojom.h" @@ -24,6 +19,11 @@ #include "third_party/WebKit/public/web/WebFrameClient.h" #include "third_party/WebKit/public/web/WebSandboxFlags.h" #include "third_party/WebKit/public/web/WebViewClient.h" +#include "third_party/mojo/src/mojo/public/cpp/application/interface_factory.h" +#include "third_party/mojo/src/mojo/public/cpp/application/lazy_interface_ptr.h" +#include "third_party/mojo/src/mojo/public/cpp/application/service_provider_impl.h" +#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_impl.h" +#include "third_party/mojo/src/mojo/public/interfaces/application/application.mojom.h" namespace base { class MessageLoopProxy; diff --git a/mojo/services/html_viewer/html_viewer.cc b/mojo/services/html_viewer/html_viewer.cc index e5fd211..df1bd55 100644 --- a/mojo/services/html_viewer/html_viewer.cc +++ b/mojo/services/html_viewer/html_viewer.cc @@ -10,12 +10,6 @@ #include "base/threading/thread.h" #include "gin/public/isolate_holder.h" #include "mojo/application/application_runner_chromium.h" -#include "mojo/public/c/system/main.h" -#include "mojo/public/cpp/application/application_connection.h" -#include "mojo/public/cpp/application/application_delegate.h" -#include "mojo/public/cpp/application/application_impl.h" -#include "mojo/public/cpp/application/connect.h" -#include "mojo/public/cpp/application/interface_factory_impl.h" #include "mojo/services/content_handler/public/interfaces/content_handler.mojom.h" #include "mojo/services/html_viewer/html_document.h" #include "mojo/services/html_viewer/mojo_blink_platform_impl.h" @@ -23,6 +17,12 @@ #include "mojo/services/network/public/interfaces/network_service.mojom.h" #include "third_party/WebKit/public/web/WebKit.h" #include "third_party/WebKit/public/web/WebRuntimeFeatures.h" +#include "third_party/mojo/src/mojo/public/c/system/main.h" +#include "third_party/mojo/src/mojo/public/cpp/application/application_connection.h" +#include "third_party/mojo/src/mojo/public/cpp/application/application_delegate.h" +#include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h" +#include "third_party/mojo/src/mojo/public/cpp/application/connect.h" +#include "third_party/mojo/src/mojo/public/cpp/application/interface_factory_impl.h" #if !defined(COMPONENT_BUILD) #include "base/i18n/icu_util.h" diff --git a/mojo/services/html_viewer/mojo_blink_platform_impl.cc b/mojo/services/html_viewer/mojo_blink_platform_impl.cc index 40419b1..6b27ab16 100644 --- a/mojo/services/html_viewer/mojo_blink_platform_impl.cc +++ b/mojo/services/html_viewer/mojo_blink_platform_impl.cc @@ -4,11 +4,11 @@ #include "mojo/services/html_viewer/mojo_blink_platform_impl.h" -#include "mojo/public/cpp/application/application_impl.h" #include "mojo/services/html_viewer/webclipboard_impl.h" #include "mojo/services/html_viewer/webcookiejar_impl.h" #include "mojo/services/html_viewer/websockethandle_impl.h" #include "mojo/services/html_viewer/weburlloader_impl.h" +#include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h" namespace html_viewer { diff --git a/mojo/services/html_viewer/webmediaplayer_factory.cc b/mojo/services/html_viewer/webmediaplayer_factory.cc index df113bf..e3c925e 100644 --- a/mojo/services/html_viewer/webmediaplayer_factory.cc +++ b/mojo/services/html_viewer/webmediaplayer_factory.cc @@ -21,8 +21,8 @@ #include "media/filters/gpu_video_accelerator_factories.h" #include "media/mojo/interfaces/media_renderer.mojom.h" #include "media/mojo/services/mojo_renderer_factory.h" -#include "mojo/public/cpp/application/connect.h" -#include "mojo/public/interfaces/application/shell.mojom.h" +#include "third_party/mojo/src/mojo/public/cpp/application/connect.h" +#include "third_party/mojo/src/mojo/public/interfaces/application/shell.mojom.h" using mojo::ServiceProviderPtr; diff --git a/mojo/services/network/net_address_type_converters.h b/mojo/services/network/net_address_type_converters.h index f999908..a1af10e 100644 --- a/mojo/services/network/net_address_type_converters.h +++ b/mojo/services/network/net_address_type_converters.h @@ -5,9 +5,9 @@ #ifndef MOJO_SERVICES_NETWORK_NET_ADDRESS_TYPE_CONVERTERS_H_ #define MOJO_SERVICES_NETWORK_NET_ADDRESS_TYPE_CONVERTERS_H_ -#include "mojo/public/cpp/bindings/type_converter.h" #include "mojo/services/network/public/interfaces/net_address.mojom.h" #include "net/base/ip_endpoint.h" +#include "third_party/mojo/src/mojo/public/cpp/bindings/type_converter.h" namespace mojo { diff --git a/mojo/services/network/network_service.cc b/mojo/services/network/network_service.cc index 0f604fb..8079ba1 100644 --- a/mojo/services/network/network_service.cc +++ b/mojo/services/network/network_service.cc @@ -9,13 +9,13 @@ #include "base/message_loop/message_loop.h" #include "base/path_service.h" #include "mojo/application/application_runner_chromium.h" -#include "mojo/public/c/system/main.h" -#include "mojo/public/cpp/application/application_connection.h" -#include "mojo/public/cpp/application/application_delegate.h" -#include "mojo/public/cpp/application/interface_factory.h" -#include "mojo/public/cpp/bindings/interface_ptr.h" #include "mojo/services/network/network_context.h" #include "mojo/services/network/network_service_impl.h" +#include "third_party/mojo/src/mojo/public/c/system/main.h" +#include "third_party/mojo/src/mojo/public/cpp/application/application_connection.h" +#include "third_party/mojo/src/mojo/public/cpp/application/application_delegate.h" +#include "third_party/mojo/src/mojo/public/cpp/application/interface_factory.h" +#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_ptr.h" class NetworkServiceDelegate : public mojo::ApplicationDelegate, diff --git a/mojo/services/network/network_service_impl.cc b/mojo/services/network/network_service_impl.cc index 708208a..64eb337 100644 --- a/mojo/services/network/network_service_impl.cc +++ b/mojo/services/network/network_service_impl.cc @@ -4,13 +4,13 @@ #include "mojo/services/network/network_service_impl.h" -#include "mojo/public/cpp/application/application_connection.h" #include "mojo/services/network/cookie_store_impl.h" #include "mojo/services/network/net_adapters.h" #include "mojo/services/network/tcp_bound_socket_impl.h" #include "mojo/services/network/udp_socket_impl.h" #include "mojo/services/network/url_loader_impl.h" #include "mojo/services/network/web_socket_impl.h" +#include "third_party/mojo/src/mojo/public/cpp/application/application_connection.h" namespace mojo { diff --git a/mojo/services/network/network_service_impl.h b/mojo/services/network/network_service_impl.h index c3bebe4..9d4baae 100644 --- a/mojo/services/network/network_service_impl.h +++ b/mojo/services/network/network_service_impl.h @@ -6,8 +6,8 @@ #define MOJO_SERVICES_NETWORK_NETWORK_SERVICE_IMPL_H_ #include "base/compiler_specific.h" -#include "mojo/public/cpp/bindings/interface_impl.h" #include "mojo/services/network/public/interfaces/network_service.mojom.h" +#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_impl.h" #include "url/gurl.h" namespace mojo { diff --git a/mojo/services/network/public/DEPS b/mojo/services/network/public/DEPS index ae35a92..b8b14d2 100644 --- a/mojo/services/network/public/DEPS +++ b/mojo/services/network/public/DEPS @@ -6,6 +6,6 @@ include_rules = [ "-testing", "!base", "!mojo/common", - "+mojo/public", "+mojo/services/network/public", + "+third_party/mojo/src/mojo/public", ] diff --git a/mojo/services/network/public/cpp/udp_socket_wrapper.cc b/mojo/services/network/public/cpp/udp_socket_wrapper.cc index 8d8b7ea..4510c27 100644 --- a/mojo/services/network/public/cpp/udp_socket_wrapper.cc +++ b/mojo/services/network/public/cpp/udp_socket_wrapper.cc @@ -6,7 +6,7 @@ #include <assert.h> -#include "mojo/public/cpp/environment/logging.h" +#include "third_party/mojo/src/mojo/public/cpp/environment/logging.h" namespace mojo { namespace { diff --git a/mojo/services/network/public/cpp/web_socket_read_queue.h b/mojo/services/network/public/cpp/web_socket_read_queue.h index 905f94e..2731510 100644 --- a/mojo/services/network/public/cpp/web_socket_read_queue.h +++ b/mojo/services/network/public/cpp/web_socket_read_queue.h @@ -8,7 +8,7 @@ #include "base/callback.h" #include "base/memory/scoped_vector.h" #include "mojo/common/handle_watcher.h" -#include "mojo/public/cpp/system/data_pipe.h" +#include "third_party/mojo/src/mojo/public/cpp/system/data_pipe.h" namespace mojo { diff --git a/mojo/services/network/public/cpp/web_socket_write_queue.h b/mojo/services/network/public/cpp/web_socket_write_queue.h index e683be4..b2c48fc 100644 --- a/mojo/services/network/public/cpp/web_socket_write_queue.h +++ b/mojo/services/network/public/cpp/web_socket_write_queue.h @@ -8,7 +8,7 @@ #include "base/callback.h" #include "base/memory/scoped_vector.h" #include "mojo/common/handle_watcher.h" -#include "mojo/public/cpp/system/data_pipe.h" +#include "third_party/mojo/src/mojo/public/cpp/system/data_pipe.h" namespace mojo { diff --git a/mojo/services/network/tcp_bound_socket_impl.h b/mojo/services/network/tcp_bound_socket_impl.h index bb2fe67..e5e1b6c2 100644 --- a/mojo/services/network/tcp_bound_socket_impl.h +++ b/mojo/services/network/tcp_bound_socket_impl.h @@ -6,9 +6,9 @@ #define MOJO_SERVICES_NETWORK_TCP_BOUND_SOCKET_H_ #include "base/memory/scoped_ptr.h" -#include "mojo/public/cpp/bindings/interface_impl.h" #include "mojo/services/network/public/interfaces/tcp_bound_socket.mojom.h" #include "net/socket/tcp_socket.h" +#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_impl.h" namespace mojo { diff --git a/mojo/services/network/tcp_connected_socket_impl.h b/mojo/services/network/tcp_connected_socket_impl.h index 041f858..0eb95e2 100644 --- a/mojo/services/network/tcp_connected_socket_impl.h +++ b/mojo/services/network/tcp_connected_socket_impl.h @@ -8,9 +8,9 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "mojo/common/handle_watcher.h" -#include "mojo/public/cpp/bindings/interface_impl.h" #include "mojo/services/network/public/interfaces/tcp_connected_socket.mojom.h" #include "net/socket/tcp_socket.h" +#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_impl.h" namespace mojo { diff --git a/mojo/services/network/tcp_server_socket_impl.h b/mojo/services/network/tcp_server_socket_impl.h index 0009951..0039f8d 100644 --- a/mojo/services/network/tcp_server_socket_impl.h +++ b/mojo/services/network/tcp_server_socket_impl.h @@ -6,10 +6,10 @@ #define MOJO_SERVICES_NETWORK_TCP_SERVER_SOCKET_H_ #include "base/memory/scoped_ptr.h" -#include "mojo/public/cpp/bindings/interface_impl.h" #include "mojo/services/network/public/interfaces/tcp_server_socket.mojom.h" #include "net/base/ip_endpoint.h" #include "net/socket/tcp_socket.h" +#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_impl.h" namespace mojo { diff --git a/mojo/services/network/udp_socket_impl.h b/mojo/services/network/udp_socket_impl.h index f5d3f82..eb63d93 100644 --- a/mojo/services/network/udp_socket_impl.h +++ b/mojo/services/network/udp_socket_impl.h @@ -9,10 +9,10 @@ #include "base/macros.h" #include "base/memory/ref_counted.h" -#include "mojo/public/cpp/bindings/interface_impl.h" #include "mojo/services/network/public/interfaces/udp_socket.mojom.h" #include "net/base/ip_endpoint.h" #include "net/udp/udp_socket.h" +#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_impl.h" namespace net { class IOBuffer; diff --git a/mojo/services/network/udp_socket_unittest.cc b/mojo/services/network/udp_socket_unittest.cc index ae6f512..ddb9d93 100644 --- a/mojo/services/network/udp_socket_unittest.cc +++ b/mojo/services/network/udp_socket_unittest.cc @@ -5,13 +5,13 @@ #include "base/at_exit.h" #include "base/macros.h" #include "base/memory/scoped_ptr.h" -#include "mojo/public/cpp/bindings/callback.h" #include "mojo/services/network/public/cpp/udp_socket_wrapper.h" #include "mojo/services/network/public/interfaces/network_service.mojom.h" #include "mojo/services/network/public/interfaces/udp_socket.mojom.h" #include "mojo/shell/shell_test_helper.h" #include "net/base/net_errors.h" #include "testing/gtest/include/gtest/gtest.h" +#include "third_party/mojo/src/mojo/public/cpp/bindings/callback.h" #include "url/gurl.h" namespace mojo { diff --git a/mojo/services/network/url_loader_impl.h b/mojo/services/network/url_loader_impl.h index 40d087d..8c259bd 100644 --- a/mojo/services/network/url_loader_impl.h +++ b/mojo/services/network/url_loader_impl.h @@ -8,12 +8,12 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "mojo/common/handle_watcher.h" -#include "mojo/public/cpp/bindings/binding.h" -#include "mojo/public/cpp/bindings/error_handler.h" -#include "mojo/public/cpp/bindings/interface_impl.h" #include "mojo/services/network/public/interfaces/url_loader.mojom.h" #include "net/base/net_errors.h" #include "net/url_request/url_request.h" +#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" +#include "third_party/mojo/src/mojo/public/cpp/bindings/error_handler.h" +#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_impl.h" namespace mojo { diff --git a/mojo/services/network/web_socket_impl.h b/mojo/services/network/web_socket_impl.h index 457f4ff..bb41104 100644 --- a/mojo/services/network/web_socket_impl.h +++ b/mojo/services/network/web_socket_impl.h @@ -6,8 +6,8 @@ #define MOJO_SERVICES_NETWORK_WEB_SOCKET_IMPL_H_ #include "base/memory/scoped_ptr.h" -#include "mojo/public/cpp/bindings/interface_impl.h" #include "mojo/services/network/public/interfaces/web_socket.mojom.h" +#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_impl.h" namespace net { class WebSocketChannel; diff --git a/ppapi/tests/mojo/DEPS b/ppapi/tests/mojo/DEPS index ef8ad28..5f8633a 100644 --- a/ppapi/tests/mojo/DEPS +++ b/ppapi/tests/mojo/DEPS @@ -1,3 +1,3 @@ include_rules = [ - "+mojo/public", + "+third_party/mojo/src/mojo/public", ] diff --git a/ppapi/tests/mojo/test_mojo.cc b/ppapi/tests/mojo/test_mojo.cc index f49943e..2743d06 100644 --- a/ppapi/tests/mojo/test_mojo.cc +++ b/ppapi/tests/mojo/test_mojo.cc @@ -4,7 +4,7 @@ #include "ppapi/tests/mojo/test_mojo.h" -#include "mojo/public/cpp/system/message_pipe.h" +#include "third_party/mojo/src/mojo/public/cpp/system/message_pipe.h" REGISTER_TEST_CASE(Mojo); diff --git a/third_party/khronos/DEPS b/third_party/khronos/DEPS index 63aa5d9..971f63f 100644 --- a/third_party/khronos/DEPS +++ b/third_party/khronos/DEPS @@ -1,4 +1,4 @@ include_rules = [ - "+mojo/public/c/gles2/gles2_export.h", "+gpu/command_buffer/client/gles2_c_lib_export.h", + "+third_party/mojo/src/mojo/public/c/gles2/gles2_export.h", ] diff --git a/third_party/khronos/KHR/khrplatform.h b/third_party/khronos/KHR/khrplatform.h index ee062de..026c9c7 100644 --- a/third_party/khronos/KHR/khrplatform.h +++ b/third_party/khronos/KHR/khrplatform.h @@ -124,7 +124,7 @@ #undef KHRONOS_APICALL #if defined(GLES2_USE_MOJO) -#include "mojo/public/c/gles2/gles2_export.h" +#include "third_party/mojo/src/mojo/public/c/gles2/gles2_export.h" #define KHRONOS_APICALL MOJO_GLES2_EXPORT #else #include "gpu/command_buffer/client/gles2_c_lib_export.h" diff --git a/ui/keyboard/webui/DEPS b/ui/keyboard/webui/DEPS index ef8ad28..5f8633a 100644 --- a/ui/keyboard/webui/DEPS +++ b/ui/keyboard/webui/DEPS @@ -1,3 +1,3 @@ include_rules = [ - "+mojo/public", + "+third_party/mojo/src/mojo/public", ] diff --git a/ui/keyboard/webui/vk_mojo_handler.h b/ui/keyboard/webui/vk_mojo_handler.h index 8d69d15..750120d 100644 --- a/ui/keyboard/webui/vk_mojo_handler.h +++ b/ui/keyboard/webui/vk_mojo_handler.h @@ -6,7 +6,7 @@ #define UI_KEYBOARD_WEBUI_VK_MOJO_HANDLER_H_ #include "base/macros.h" -#include "mojo/public/cpp/bindings/binding.h" +#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" #include "ui/base/ime/input_method_observer.h" #include "ui/keyboard/webui/keyboard.mojom.h" diff --git a/ui/keyboard/webui/vk_webui_controller.cc b/ui/keyboard/webui/vk_webui_controller.cc index 5fd04ce..9a4688d 100644 --- a/ui/keyboard/webui/vk_webui_controller.cc +++ b/ui/keyboard/webui/vk_webui_controller.cc @@ -13,8 +13,8 @@ #include "content/public/common/service_registry.h" #include "grit/keyboard_resources.h" #include "grit/keyboard_resources_map.h" -#include "mojo/public/cpp/bindings/interface_impl.h" -#include "mojo/public/cpp/system/core.h" +#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_impl.h" +#include "third_party/mojo/src/mojo/public/cpp/system/core.h" #include "ui/keyboard/keyboard_constants.h" #include "ui/keyboard/keyboard_util.h" #include "ui/keyboard/webui/vk_mojo_handler.h" diff --git a/ui/keyboard/webui/vk_webui_controller.h b/ui/keyboard/webui/vk_webui_controller.h index 30d1e25..e1b1876 100644 --- a/ui/keyboard/webui/vk_webui_controller.h +++ b/ui/keyboard/webui/vk_webui_controller.h @@ -10,8 +10,8 @@ #include "base/memory/weak_ptr.h" #include "content/public/browser/web_ui_controller.h" #include "content/public/browser/web_ui_controller_factory.h" -#include "mojo/public/cpp/bindings/interface_request.h" -#include "mojo/public/cpp/system/core.h" +#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h" +#include "third_party/mojo/src/mojo/public/cpp/system/core.h" #include "ui/keyboard/keyboard_export.h" #include "ui/keyboard/webui/keyboard.mojom.h" |