From 85dce086001825a2faa4e75755a669f5e08a1cad Mon Sep 17 00:00:00 2001 From: rockot Date: Thu, 12 Nov 2015 17:33:59 -0800 Subject: [PATCH] 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 | 1 - chrome/DEPS | 2 +- chrome/browser/BUILD.gn | 4 +- chrome/browser/chromeos/BUILD.gn | 2 +- .../attestation/platform_verification_impl.h | 2 +- chrome/browser/media/router/BUILD.gn | 5 +- .../media/router/media_router_mojo_impl.h | 2 +- .../media/router/media_router_mojo_test.h | 2 +- chrome/browser/ui/webui/engagement/BUILD.gn | 2 +- .../ui/webui/engagement/site_engagement_ui.cc | 2 +- .../ui/webui/mojo_web_ui_controller.cc | 2 +- .../browser/ui/webui/mojo_web_ui_controller.h | 2 +- chrome/browser/ui/webui/omnibox/BUILD.gn | 2 +- .../ui/webui/omnibox/omnibox_ui_handler.h | 2 +- chrome/browser/usb/usb_tab_helper.h | 2 +- .../browser/usb/web_usb_permission_provider.h | 4 +- chrome/common/BUILD.gn | 6 +- .../resource_usage_reporter_type_converters.h | 2 +- .../chrome_render_process_observer.cc | 2 +- .../utility/chrome_content_utility_client.cc | 2 +- components/bitmap_uploader/BUILD.gn | 2 +- components/bitmap_uploader/DEPS | 1 - components/bitmap_uploader/bitmap_uploader.cc | 2 +- components/bitmap_uploader/bitmap_uploader.h | 2 +- components/clipboard/BUILD.gn | 6 +- components/clipboard/DEPS | 2 +- .../clipboard/clipboard_standalone_impl.cc | 6 +- .../clipboard/clipboard_standalone_impl.h | 2 +- components/clipboard/main.cc | 2 +- .../clipboard/public/interfaces/BUILD.gn | 2 +- .../content/browser/BUILD.gn | 2 +- components/devtools_service/BUILD.gn | 6 +- components/devtools_service/DEPS | 2 +- .../devtools_service/devtools_agent_host.h | 4 +- .../devtools_service/devtools_http_server.cc | 2 +- .../devtools_service/devtools_http_server.h | 2 +- components/devtools_service/main.cc | 2 +- .../public/interfaces/BUILD.gn | 2 +- components/dom_distiller/content/BUILD.gn | 6 +- components/dom_distiller/content/browser/DEPS | 2 +- .../distiller_javascript_service_impl.cc | 2 +- .../distiller_javascript_service_impl.h | 4 +- .../browser/dom_distiller_viewer_source.cc | 2 +- .../dom_distiller/content/renderer/DEPS | 2 +- .../distiller_page_notifier_service_impl.h | 2 +- components/filesystem/BUILD.gn | 6 +- components/filesystem/DEPS | 1 - components/filesystem/directory_impl.h | 4 +- components/filesystem/file_impl.h | 4 +- components/filesystem/file_impl_unittest.cc | 4 +- components/filesystem/file_system_impl.h | 4 +- components/filesystem/files_test_base.h | 2 +- components/filesystem/main.cc | 2 +- .../filesystem/public/interfaces/BUILD.gn | 2 +- components/filesystem/util.cc | 2 +- components/font_service/BUILD.gn | 4 +- components/font_service/DEPS | 2 +- components/font_service/main.cc | 2 +- components/font_service/public/cpp/BUILD.gn | 4 +- .../font_service/public/interfaces/BUILD.gn | 2 +- components/gpu/public/interfaces/BUILD.gn | 2 +- components/html_viewer/BUILD.gn | 8 +- components/html_viewer/DEPS | 1 - components/html_viewer/ax_provider_impl.h | 2 +- .../blink_basic_type_converters.cc | 2 +- .../html_viewer/blink_basic_type_converters.h | 4 +- .../html_viewer/blink_find_type_converters.h | 2 +- .../blink_text_input_type_converters.h | 2 +- .../blink_url_request_type_converters.cc | 2 +- components/html_viewer/content_handler_impl.h | 2 +- components/html_viewer/devtools_agent_impl.h | 2 +- .../html_viewer/document_resource_waiter.h | 2 +- components/html_viewer/html_document.cc | 2 +- .../html_document_application_delegate.h | 2 +- components/html_viewer/html_frame.cc | 2 +- components/html_viewer/html_frame.h | 2 +- .../html_viewer/html_frame_properties.h | 6 +- components/html_viewer/html_viewer_main.cc | 2 +- .../layout_test_html_viewer_main.cc | 2 +- .../html_viewer/public/interfaces/BUILD.gn | 2 +- .../html_viewer/replicated_frame_state.h | 6 +- .../html_viewer/test_html_viewer_impl.h | 2 +- ...graphics_context_3d_command_buffer_impl.cc | 4 +- ..._graphics_context_3d_command_buffer_impl.h | 4 +- .../html_viewer/web_layer_tree_view_impl.cc | 2 +- .../html_viewer/web_socket_handle_impl.cc | 2 +- components/message_port/BUILD.gn | 2 +- components/message_port/DEPS | 2 +- .../web_message_port_channel_impl.cc | 2 +- .../web_message_port_channel_impl.h | 2 +- components/mus/BUILD.gn | 2 +- components/mus/DEPS | 2 +- components/mus/example/main/BUILD.gn | 4 +- components/mus/example/main/main.cc | 2 +- components/mus/example/mock_sysui/BUILD.gn | 2 +- components/mus/example/mock_sysui/main.cc | 2 +- .../mus/example/views_examples/BUILD.gn | 4 +- components/mus/example/views_examples/main.cc | 2 +- .../mus/example/window_type_launcher/BUILD.gn | 4 +- components/mus/example/wm/BUILD.gn | 4 +- components/mus/example/wm/main.cc | 2 +- .../mus/example/wm/public/interfaces/BUILD.gn | 2 +- components/mus/gles2/BUILD.gn | 6 +- components/mus/gles2/DEPS | 2 +- components/mus/gles2/command_buffer_impl.h | 2 +- .../gles2/command_buffer_type_conversions.h | 2 +- components/mus/gles2/gpu_impl.h | 4 +- components/mus/gles2/mojo_buffer_backing.h | 2 +- components/mus/main.cc | 2 +- components/mus/mus_app.cc | 2 +- components/mus/public/cpp/BUILD.gn | 6 +- components/mus/public/cpp/context_provider.h | 4 +- .../mus/public/cpp/lib/context_provider.cc | 2 +- .../public/cpp/lib/window_tree_client_impl.h | 2 +- components/mus/public/cpp/output_surface.h | 2 +- .../mus/public/cpp/property_type_converters.h | 2 +- components/mus/public/cpp/tests/BUILD.gn | 2 +- .../cpp/tests/window_server_test_suite.h | 2 +- components/mus/public/cpp/window.h | 4 +- components/mus/public/cpp/window_surface.h | 4 +- components/mus/public/cpp/window_tracker.h | 2 +- .../mus/public/cpp/window_tree_connection.h | 2 +- .../mus/public/cpp/window_tree_host_factory.h | 2 +- components/mus/public/interfaces/BUILD.gn | 2 +- components/mus/surfaces/DEPS | 2 +- .../mus/surfaces/top_level_display_client.h | 2 +- components/mus/ws/BUILD.gn | 6 +- components/mus/ws/client_connection.h | 2 +- components/mus/ws/connection_manager.h | 4 +- .../mus/ws/connection_manager_delegate.h | 2 +- components/mus/ws/display_manager.h | 2 +- components/mus/ws/display_manager_factory.h | 2 +- components/mus/ws/server_window.h | 2 +- components/mus/ws/server_window_surface.h | 2 +- .../mus/ws/server_window_surface_manager.h | 2 +- components/mus/ws/test_change_tracker.h | 2 +- .../mus/ws/window_tree_host_connection.h | 2 +- components/pdf_viewer/BUILD.gn | 4 +- components/pdf_viewer/DEPS | 1 - components/pdf_viewer/pdf_viewer.cc | 4 +- components/resource_provider/BUILD.gn | 2 +- components/resource_provider/DEPS | 2 +- components/resource_provider/main.cc | 2 +- .../resource_provider/public/cpp/BUILD.gn | 4 +- .../public/cpp/resource_loader.h | 4 +- .../public/interfaces/BUILD.gn | 2 +- .../resource_provider/resource_provider_app.h | 2 +- .../resource_provider_apptest.cc | 4 +- components/web_view/BUILD.gn | 2 +- components/web_view/DEPS | 2 +- components/web_view/frame.h | 2 +- components/web_view/frame_devtools_agent.h | 2 +- components/web_view/frame_tree.h | 2 +- components/web_view/local_find_options.h | 2 +- components/web_view/main.cc | 2 +- components/web_view/public/cpp/BUILD.gn | 4 +- components/web_view/public/cpp/web_view.h | 2 +- .../web_view/public/interfaces/BUILD.gn | 7 +- components/web_view/test_runner/BUILD.gn | 2 +- components/web_view/test_runner/DEPS | 2 +- .../test_runner/public/interfaces/BUILD.gn | 2 +- .../web_view/test_runner/test_runner_main.cc | 2 +- components/web_view/web_view_impl.h | 2 +- components/webusb/public/interfaces/BUILD.gn | 2 +- content/DEPS | 2 +- content/app/mojo/mojo_browsertest.cc | 2 +- content/browser/BUILD.gn | 6 +- .../background_sync_registration.h | 2 +- .../background_sync_service_impl.h | 2 +- .../background_sync_service_impl_unittest.cc | 2 +- ...battery_monitor_integration_browsertest.cc | 2 +- content/browser/frame_host/frame_mojo_shell.h | 2 +- .../geolocation/geolocation_service_impl.h | 2 +- content/browser/mojo/mojo_shell_context.cc | 4 +- .../service_port_service_impl.h | 2 +- .../permissions/permission_service_context.h | 2 +- .../permissions/permission_service_impl.h | 2 +- .../presentation/presentation_service_impl.h | 2 +- .../presentation_service_impl_unittest.cc | 4 +- .../renderer_host/render_process_host_impl.h | 2 +- ...bration_manager_integration_browsertest.cc | 2 +- .../wake_lock/wake_lock_service_context.h | 2 +- .../wake_lock/wake_lock_service_impl.h | 4 +- .../browser/webui/web_ui_data_source_impl.cc | 2 +- .../browser/webui/web_ui_mojo_browsertest.cc | 6 +- .../background_sync_type_converters.h | 2 +- content/child/mojo/mojo_application.cc | 2 +- content/child/mojo/type_converters.h | 2 +- .../service_port_dispatcher_impl.h | 2 +- .../navigator_connect/service_port_provider.h | 2 +- content/child/process_control_impl.h | 2 +- .../child/web_data_consumer_handle_impl.cc | 2 +- content/child/web_data_consumer_handle_impl.h | 2 +- .../web_data_consumer_handle_impl_unittest.cc | 2 +- content/common/BUILD.gn | 2 +- content/common/mojo/channel_init.h | 2 +- content/common/mojo/service_registry_impl.h | 4 +- content/common/service_port_type_converters.h | 2 +- content/content_resources.grd | 16 +- content/gpu/gpu_child_thread.h | 2 +- content/public/android/BUILD.gn | 10 +- content/public/browser/BUILD.gn | 4 +- content/public/browser/mojo_app_connection.h | 6 +- content/public/browser/render_view_host.h | 2 +- content/public/common/BUILD.gn | 4 +- content/public/common/service_registry.h | 6 +- content/public/test/test_mojo_app.h | 2 +- content/renderer/BUILD.gn | 4 +- .../background_sync_client_impl.h | 2 +- .../image_downloader/image_downloader_impl.h | 2 +- .../mojo/service_registry_js_wrapper.h | 2 +- .../presentation/presentation_dispatcher.h | 2 +- content/renderer/render_frame_impl.cc | 2 +- content/renderer/render_thread_impl.cc | 2 +- content/renderer/usb/type_converters.h | 2 +- content/renderer/usb/web_usb_client_impl.cc | 4 +- content/renderer/web_ui_mojo.h | 2 +- content/shell/android/BUILD.gn | 2 +- content/test/BUILD.gn | 8 +- content/utility/BUILD.gn | 2 +- device/BUILD.gn | 2 +- device/DEPS | 2 +- device/battery/BUILD.gn | 4 +- device/battery/android/BUILD.gn | 4 +- device/battery/battery_monitor_impl.h | 2 +- device/devices_app/BUILD.gn | 4 +- device/devices_app/devices_app.cc | 2 +- device/devices_app/main.cc | 2 +- device/devices_app/usb/device_impl.h | 6 +- .../devices_app/usb/device_impl_unittest.cc | 2 +- device/devices_app/usb/device_manager_impl.cc | 4 +- device/devices_app/usb/device_manager_impl.h | 6 +- .../usb/fake_permission_provider.h | 4 +- .../usb/public/interfaces/BUILD.gn | 2 +- device/devices_app/usb/type_converters.cc | 2 +- device/devices_app/usb/type_converters.h | 4 +- device/serial/BUILD.gn | 4 +- device/serial/data_receiver.h | 4 +- device/serial/data_sender.h | 2 +- device/serial/data_sink_receiver.h | 4 +- device/serial/data_sink_unittest.cc | 4 +- device/serial/data_source_sender.h | 4 +- device/serial/data_source_unittest.cc | 4 +- device/serial/serial_connection.h | 2 +- device/serial/serial_connection_factory.h | 2 +- device/serial/serial_connection_unittest.cc | 4 +- device/serial/serial_device_enumerator.h | 2 +- device/serial/serial_service_impl.h | 2 +- device/serial/serial_service_unittest.cc | 4 +- device/vibration/BUILD.gn | 4 +- device/vibration/android/BUILD.gn | 4 +- .../vibration_manager_impl_default.cc | 2 +- extensions/BUILD.gn | 4 +- extensions/DEPS | 2 +- .../mime_handler_private.cc | 2 +- .../mime_handler_private.h | 2 +- extensions/browser/mojo/keep_alive_impl.h | 4 +- extensions/browser/mojo/stash_backend.cc | 4 +- extensions/browser/mojo/stash_backend.h | 2 +- extensions/common/BUILD.gn | 2 +- extensions/common/api/BUILD.gn | 2 +- extensions/renderer/BUILD.gn | 2 +- extensions/renderer/api_test_base.cc | 4 +- extensions/renderer/api_test_base.h | 4 +- extensions/renderer/dispatcher.cc | 2 +- .../mojo/keep_alive_client_unittest.cc | 2 +- .../renderer/mojo/stash_client_unittest.cc | 2 +- gpu/command_buffer/build_gles2_cmd_buffer.py | 9 +- ipc/mojo/BUILD.gn | 6 +- ipc/mojo/DEPS | 2 +- ipc/mojo/async_handle_waiter.h | 2 +- ipc/mojo/async_handle_waiter_unittest.cc | 2 +- ipc/mojo/ipc_channel_mojo.cc | 2 +- ipc/mojo/ipc_channel_mojo.h | 2 +- ipc/mojo/ipc_message_pipe_reader.h | 4 +- ipc/mojo/ipc_mojo_handle_attachment.h | 2 +- ipc/mojo/ipc_mojo_message_helper.h | 2 +- ipc/mojo/ipc_mojo_param_traits.h | 2 +- mandoline/app/DEPS | 1 - mandoline/services/core_services/BUILD.gn | 2 +- mandoline/services/core_services/DEPS | 2 +- mandoline/services/core_services/main.cc | 2 +- mandoline/services/updater/BUILD.gn | 4 +- mandoline/services/updater/DEPS | 2 - mandoline/services/updater/updater_app.cc | 2 +- mandoline/services/updater/updater_impl.h | 2 +- mandoline/ui/desktop_ui/BUILD.gn | 4 +- mandoline/ui/desktop_ui/DEPS | 2 +- mandoline/ui/desktop_ui/main.cc | 2 +- .../ui/desktop_ui/public/interfaces/BUILD.gn | 2 +- mandoline/ui/omnibox/BUILD.gn | 2 +- mandoline/ui/omnibox/DEPS | 2 +- mandoline/ui/omnibox/main.cc | 2 +- mandoline/ui/phone_ui/BUILD.gn | 4 +- mandoline/ui/phone_ui/DEPS | 2 +- mandoline/ui/phone_ui/main.cc | 2 +- media/mojo/DEPS | 1 - media/mojo/interfaces/BUILD.gn | 2 +- media/mojo/services/BUILD.gn | 10 +- media/mojo/services/main.cc | 2 +- media/mojo/services/media_type_converters.h | 2 +- media/mojo/services/mojo_cdm.h | 2 +- media/mojo/services/mojo_cdm_factory.cc | 2 +- media/mojo/services/mojo_cdm_promise.h | 2 +- media/mojo/services/mojo_cdm_service.h | 2 +- .../services/mojo_demuxer_stream_adapter.cc | 2 +- .../mojo/services/mojo_demuxer_stream_impl.cc | 2 +- .../mojo/services/mojo_demuxer_stream_impl.h | 2 +- media/mojo/services/mojo_renderer_factory.cc | 2 +- media/mojo/services/mojo_renderer_factory.h | 2 +- media/mojo/services/mojo_renderer_impl.h | 2 +- media/mojo/services/mojo_renderer_service.h | 2 +- media/mojo/services/mojo_type_trait.h | 4 +- media/mojo/services/service_factory_impl.h | 2 +- mojo/BUILD.gn | 2 +- mojo/DEPS | 1 - mojo/android/BUILD.gn | 20 +- mojo/android/javatests/mojo_test_case.cc | 2 +- .../android/javatests/validation_test_util.cc | 2 +- mojo/android/system/core_impl.cc | 6 +- mojo/application/public/cpp/BUILD.gn | 10 +- .../public/cpp/application_delegate.h | 2 +- .../application/public/cpp/application_impl.h | 6 +- .../public/cpp/application_runner.h | 2 +- .../public/cpp/application_test_base.h | 6 +- .../public/cpp/initialize_base_and_icu.cc | 2 +- .../public/cpp/interface_factory.h | 2 +- .../public/cpp/lib/application_impl.cc | 4 +- .../public/cpp/lib/application_test_base.cc | 6 +- .../public/cpp/lib/application_test_main.cc | 2 +- .../public/cpp/lib/content_handler_factory.cc | 2 +- .../cpp/lib/interface_factory_connector.h | 2 +- .../cpp/lib/service_connector_registry.h | 2 +- .../public/cpp/lib/service_provider_impl.cc | 2 +- .../public/cpp/lib/service_registry.h | 2 +- .../public/cpp/service_connector.h | 2 +- .../public/cpp/service_provider_impl.h | 2 +- mojo/application/public/interfaces/BUILD.gn | 2 +- mojo/application/public/java/BUILD.gn | 4 +- mojo/common/BUILD.gn | 16 +- mojo/common/DEPS | 2 +- mojo/common/common_type_converters.h | 6 +- mojo/common/data_pipe_drainer.h | 2 +- mojo/common/data_pipe_utils.h | 2 +- mojo/common/url_type_converters.h | 4 +- mojo/common/weak_binding_set.h | 2 +- mojo/common/weak_interface_ptr_set.h | 2 +- mojo/converters/geometry/BUILD.gn | 2 +- mojo/converters/ime/BUILD.gn | 2 +- mojo/converters/input_events/BUILD.gn | 2 +- mojo/converters/surfaces/BUILD.gn | 2 +- mojo/converters/transform/BUILD.gn | 2 +- mojo/edk/embedder/BUILD.gn | 6 +- mojo/edk/embedder/embedder.h | 2 +- mojo/edk/embedder/embedder_unittest.cc | 8 +- mojo/edk/embedder/entrypoints.cc | 8 +- mojo/edk/embedder/platform_channel_pair.h | 2 +- .../platform_channel_pair_posix_unittest.cc | 2 +- mojo/edk/embedder/platform_shared_buffer.h | 2 +- mojo/edk/embedder/platform_support.h | 2 +- mojo/edk/embedder/process_delegate.h | 2 +- mojo/edk/embedder/scoped_platform_handle.h | 2 +- .../embedder/simple_platform_shared_buffer.h | 2 +- .../simple_platform_shared_buffer_unittest.cc | 2 +- mojo/edk/embedder/simple_platform_support.h | 2 +- mojo/edk/js/BUILD.gn | 6 +- mojo/edk/js/drain_data.cc | 4 +- mojo/edk/js/drain_data.h | 4 +- mojo/edk/js/handle.h | 2 +- mojo/edk/js/handle_unittest.cc | 2 +- mojo/edk/js/mojo_runner_delegate.h | 2 +- mojo/edk/js/support.cc | 2 +- mojo/edk/js/test/BUILD.gn | 14 +- mojo/edk/js/test/run_js_tests.cc | 2 +- mojo/edk/js/tests/BUILD.gn | 10 +- mojo/edk/js/tests/js_to_cpp_tests.cc | 6 +- mojo/edk/js/waiting_callback.cc | 2 +- mojo/edk/js/waiting_callback.h | 4 +- mojo/edk/mojo_edk.gni | 12 +- mojo/edk/system/BUILD.gn | 14 +- mojo/edk/system/async_waiter.h | 4 +- mojo/edk/system/awakable.h | 2 +- mojo/edk/system/awakable_list.h | 4 +- mojo/edk/system/core.cc | 4 +- mojo/edk/system/core.h | 18 +- mojo/edk/system/core_test_base.cc | 2 +- mojo/edk/system/core_test_base.h | 4 +- mojo/edk/system/core_unittest.cc | 2 +- mojo/edk/system/data_pipe.h | 6 +- .../system/data_pipe_consumer_dispatcher.h | 2 +- .../system/data_pipe_producer_dispatcher.h | 2 +- mojo/edk/system/data_pipe_unittest.cc | 8 +- mojo/edk/system/dispatcher.h | 10 +- mojo/edk/system/dispatcher_unittest.cc | 2 +- mojo/edk/system/handle_signals_state.h | 2 +- mojo/edk/system/handle_table.h | 4 +- mojo/edk/system/mapping_table.h | 4 +- mojo/edk/system/master_impl.h | 2 +- mojo/edk/system/master_impl_unittest.cc | 2 +- mojo/edk/system/message_in_transit.h | 2 +- mojo/edk/system/message_in_transit_queue.h | 2 +- mojo/edk/system/message_pipe_dispatcher.h | 2 +- mojo/edk/system/message_pipe_perftest.cc | 4 +- mojo/edk/system/message_pipe_test_utils.h | 2 +- mojo/edk/system/message_pipe_unittest.cc | 4 +- mojo/edk/system/options_validation.h | 4 +- .../edk/system/options_validation_unittest.cc | 2 +- mojo/edk/system/platform_handle_dispatcher.h | 2 +- mojo/edk/system/raw_channel.h | 2 +- mojo/edk/system/raw_channel_posix.cc | 2 +- mojo/edk/system/raw_channel_unittest.cc | 2 +- mojo/edk/system/raw_channel_win.cc | 2 +- mojo/edk/system/shared_buffer_dispatcher.cc | 2 +- mojo/edk/system/shared_buffer_dispatcher.h | 2 +- .../shared_buffer_dispatcher_unittest.cc | 2 +- mojo/edk/system/simple_dispatcher.h | 2 +- mojo/edk/system/simple_dispatcher_unittest.cc | 2 +- mojo/edk/system/test_utils.h | 4 +- mojo/edk/system/transport_data.h | 2 +- mojo/edk/system/waiter.h | 4 +- mojo/edk/system/waiter_test_utils.h | 4 +- mojo/edk/system/waiter_unittest.cc | 2 +- mojo/edk/test/BUILD.gn | 35 +- mojo/edk/test/multiprocess_test_helper.h | 2 +- mojo/edk/test/run_all_perftests.cc | 2 +- mojo/edk/test/run_all_unittests.cc | 2 +- mojo/edk/test/scoped_ipc_support.cc | 3 +- mojo/edk/test/scoped_ipc_support.h | 2 +- mojo/edk/test/test_support_impl.h | 4 +- mojo/environment/BUILD.gn | 26 +- mojo/environment/default_async_waiter_impl.h | 2 +- mojo/environment/default_logger_impl.h | 2 +- mojo/environment/default_task_tracker_impl.h | 2 +- mojo/environment/environment.cc | 2 +- mojo/fetcher/BUILD.gn | 4 +- mojo/fetcher/data_fetcher.cc | 2 +- mojo/fetcher/data_fetcher_unittest.cc | 2 +- mojo/fetcher/network_fetcher_unittest.cc | 2 +- mojo/gles2/BUILD.gn | 12 +- mojo/gles2/command_buffer_client_impl.h | 2 +- mojo/gles2/gles2_context.cc | 4 +- mojo/gles2/gles2_context.h | 2 +- mojo/gles2/gles2_impl.cc | 8 +- mojo/gpu/BUILD.gn | 2 +- mojo/gpu/mojo_gles2_impl_autogen.cc | 4 +- mojo/gpu/mojo_gles2_impl_autogen.h | 2 +- mojo/message_pump/BUILD.gn | 9 +- mojo/message_pump/handle_watcher.h | 2 +- mojo/message_pump/handle_watcher_perftest.cc | 4 +- mojo/message_pump/handle_watcher_unittest.cc | 4 +- mojo/message_pump/message_pump_mojo.h | 2 +- mojo/message_pump/message_pump_mojo_handler.h | 2 +- .../message_pump_mojo_unittest.cc | 2 +- mojo/mojo_base.gyp | 14 +- ...mojo_public_gles2_for_loadable_module.gypi | 48 - .../content_handler_unittest.cc | 2 +- mojo/platform_handle/BUILD.gn | 9 +- .../platform_handle_functions.h | 2 +- .../mojo/src/mojo => mojo}/public/BUILD.gn | 21 - .../mojo/src/mojo => mojo}/public/DEPS | 0 .../mojo/src/mojo => mojo}/public/LICENSE | 0 .../mojo/src/mojo => mojo}/public/README.md | 0 .../mojo/src/mojo => mojo}/public/c/README.md | 0 .../public/c/environment/BUILD.gn | 0 .../public/c/environment/async_waiter.h | 8 +- .../public/c/environment/logger.h | 6 +- .../src/mojo => mojo}/public/c/gles2/BUILD.gn | 0 .../public/c/gles2/chromium_extension.h | 14 +- .../src/mojo => mojo}/public/c/gles2/gles2.h | 16 +- .../c/gles2/gles2_call_visitor_autogen.h | 0 ..._call_visitor_chromium_extension_autogen.h | 0 .../public/c/gles2/gles2_export.h | 6 +- .../public/c/gles2/gles2_types.h | 8 +- .../src/mojo => mojo}/public/c/gpu/BUILD.gn | 19 - .../mojo/src/mojo => mojo}/public/c/gpu/DEPS | 0 .../src/mojo => mojo}/public/c/gpu/MGL/mgl.h | 10 +- .../public/c/gpu/MGL/mgl_onscreen.h | 8 +- .../public/c/gpu/MGL/mgl_types.h | 0 .../mojo => mojo}/public/c/system/BUILD.gn | 4 +- .../mojo => mojo}/public/c/system/buffer.h | 12 +- mojo/public/c/system/core.h | 21 + .../mojo => mojo}/public/c/system/data_pipe.h | 12 +- .../mojo => mojo}/public/c/system/functions.h | 10 +- .../mojo => mojo}/public/c/system/macros.h | 6 +- .../src/mojo => mojo}/public/c/system/main.h | 8 +- .../public/c/system/message_pipe.h | 12 +- .../public/c/system/system_export.h | 6 +- .../public/c/system/tests/BUILD.gn | 6 +- .../public/c/system/tests/core_perftest.cc | 10 +- .../public/c/system/tests/core_unittest.cc | 2 +- .../c/system/tests/core_unittest_pure_c.c | 6 +- .../public/c/system/tests/macros_unittest.cc | 2 +- .../src/mojo => mojo}/public/c/system/types.h | 8 +- .../public/c/test_support/BUILD.gn | 0 .../public/c/test_support/test_support.h | 8 +- .../c/test_support/test_support_export.h | 6 +- .../src/mojo => mojo}/public/cpp/README.md | 0 .../public/cpp/bindings/BUILD.gn | 0 .../mojo => mojo}/public/cpp/bindings/array.h | 16 +- .../bindings/associated_interface_ptr_info.h | 8 +- .../bindings/associated_interface_request.h | 8 +- .../public/cpp/bindings/binding.h | 28 +- .../public/cpp/bindings/callback.h | 12 +- .../public/cpp/bindings/interface_ptr.h | 16 +- .../public/cpp/bindings/interface_ptr_info.h | 10 +- .../public/cpp/bindings/interface_request.h | 8 +- .../public/cpp/bindings/lib/TODO | 0 .../public/cpp/bindings/lib/array_internal.cc | 2 +- .../public/cpp/bindings/lib/array_internal.h | 26 +- .../cpp/bindings/lib/array_serialization.h | 18 +- .../cpp/bindings/lib/bindings_internal.h | 12 +- .../bindings/lib/bindings_serialization.cc | 4 +- .../cpp/bindings/lib/bindings_serialization.h | 12 +- .../public/cpp/bindings/lib/bounds_checker.cc | 8 +- .../public/cpp/bindings/lib/bounds_checker.h | 8 +- .../public/cpp/bindings/lib/buffer.h | 6 +- .../cpp/bindings/lib/callback_internal.h | 8 +- .../public/cpp/bindings/lib/connector.cc | 4 +- .../public/cpp/bindings/lib/connector.h | 16 +- .../bindings/lib/control_message_handler.cc | 8 +- .../bindings/lib/control_message_handler.h | 10 +- .../cpp/bindings/lib/control_message_proxy.cc | 10 +- .../cpp/bindings/lib/control_message_proxy.h | 10 +- .../public/cpp/bindings/lib/filter_chain.cc | 4 +- .../public/cpp/bindings/lib/filter_chain.h | 12 +- .../public/cpp/bindings/lib/fixed_buffer.cc | 6 +- .../public/cpp/bindings/lib/fixed_buffer.h | 10 +- .../cpp/bindings/lib/interface_ptr_internal.h | 20 +- .../cpp/bindings/lib/map_data_internal.h | 14 +- .../public/cpp/bindings/lib/map_internal.h | 10 +- .../cpp/bindings/lib/map_serialization.h | 16 +- .../public/cpp/bindings/lib/message.cc | 4 +- .../cpp/bindings/lib/message_builder.cc | 6 +- .../public/cpp/bindings/lib/message_builder.h | 12 +- .../public/cpp/bindings/lib/message_filter.cc | 2 +- .../bindings/lib/message_header_validator.cc | 8 +- .../bindings/lib/message_header_validator.h | 10 +- .../cpp/bindings/lib/message_internal.h | 8 +- .../public/cpp/bindings/lib/no_interface.cc | 2 +- .../public/cpp/bindings/lib/router.cc | 4 +- .../public/cpp/bindings/lib/router.h | 20 +- .../public/cpp/bindings/lib/shared_data.h | 10 +- .../public/cpp/bindings/lib/shared_ptr.h | 8 +- .../cpp/bindings/lib/string_serialization.cc | 2 +- .../cpp/bindings/lib/string_serialization.h | 10 +- .../public/cpp/bindings/lib/template_util.h | 6 +- .../public/cpp/bindings/lib/thread_checker.h | 10 +- .../cpp/bindings/lib/thread_checker_posix.cc | 2 +- .../cpp/bindings/lib/thread_checker_posix.h | 8 +- .../public/cpp/bindings/lib/union_accessor.h | 6 +- .../public/cpp/bindings/lib/validate_params.h | 8 +- .../cpp/bindings/lib/validation_errors.cc | 4 +- .../cpp/bindings/lib/validation_errors.h | 8 +- .../cpp/bindings/lib/validation_util.cc | 10 +- .../public/cpp/bindings/lib/validation_util.h | 10 +- .../public/cpp/bindings/lib/value_traits.h | 8 +- .../mojo => mojo}/public/cpp/bindings/map.h | 10 +- .../public/cpp/bindings/message.h | 10 +- .../public/cpp/bindings/message_filter.h | 10 +- .../public/cpp/bindings/no_interface.h | 12 +- .../public/cpp/bindings/string.h | 12 +- .../public/cpp/bindings/strong_binding.h | 24 +- .../public/cpp/bindings/struct_ptr.h | 12 +- .../public/cpp/bindings/tests/BUILD.gn | 55 - .../cpp/bindings/tests/array_unittest.cc | 12 +- .../tests/binding_callback_unittest.cc | 12 +- .../cpp/bindings/tests/binding_unittest.cc | 10 +- .../cpp/bindings/tests/bindings_perftest.cc | 10 +- .../bindings/tests/bounds_checker_unittest.cc | 6 +- .../cpp/bindings/tests/buffer_unittest.cc | 4 +- .../cpp/bindings/tests/callback_unittest.cc | 6 +- .../cpp/bindings/tests/connector_unittest.cc | 8 +- .../cpp/bindings/tests/constant_unittest.cc | 2 +- .../cpp/bindings/tests/container_test_util.cc | 2 +- .../cpp/bindings/tests/container_test_util.h | 8 +- .../cpp/bindings/tests/equals_unittest.cc | 4 +- .../bindings/tests/handle_passing_unittest.cc | 8 +- .../bindings/tests/interface_ptr_unittest.cc | 12 +- .../public/cpp/bindings/tests/map_unittest.cc | 16 +- .../cpp/bindings/tests/message_queue.cc | 6 +- .../public/cpp/bindings/tests/message_queue.h | 8 +- .../tests/request_response_unittest.cc | 8 +- .../cpp/bindings/tests/router_unittest.cc | 8 +- .../bindings/tests/sample_service_unittest.cc | 2 +- .../tests/serialization_warning_unittest.cc | 16 +- .../cpp/bindings/tests/string_unittest.cc | 2 +- .../cpp/bindings/tests/struct_unittest.cc | 6 +- .../tests/type_conversion_unittest.cc | 2 +- .../cpp/bindings/tests/union_unittest.cc | 20 +- .../tests/validation_test_input_parser.cc | 4 +- .../tests/validation_test_input_parser.h | 6 +- .../cpp/bindings/tests/validation_unittest.cc | 26 +- .../cpp/bindings/tests/versioning_apptest.cc | 4 +- .../bindings/tests/versioning_test_service.cc | 8 +- .../public/cpp/bindings/type_converter.h | 6 +- .../public/cpp/environment/BUILD.gn | 0 .../public/cpp/environment/async_waiter.h | 14 +- .../public/cpp/environment/environment.h | 8 +- .../cpp/environment/lib/async_waiter.cc | 2 +- .../environment/lib/default_async_waiter.cc | 8 +- .../environment/lib/default_async_waiter.h | 6 +- .../cpp/environment/lib/default_logger.cc | 4 +- .../cpp/environment/lib/default_logger.h | 6 +- .../environment/lib/default_task_tracker.cc | 4 +- .../environment/lib/default_task_tracker.h | 6 +- .../public/cpp/environment/lib/environment.cc | 12 +- .../public/cpp/environment/lib/logging.cc | 4 +- .../environment/lib/scoped_task_tracking.cc | 4 +- .../environment/lib/scoped_task_tracking.h | 10 +- .../public/cpp/environment/logging.h | 12 +- .../public/cpp/environment/task_tracker.h | 6 +- .../public/cpp/environment/tests/BUILD.gn | 0 .../environment/tests/async_wait_unittest.cc | 12 +- .../tests/async_waiter_unittest.cc | 8 +- .../cpp/environment/tests/logger_unittest.cc | 4 +- .../cpp/environment/tests/logging_unittest.cc | 6 +- .../mojo => mojo}/public/cpp/system/BUILD.gn | 0 .../mojo => mojo}/public/cpp/system/buffer.h | 14 +- mojo/public/cpp/system/core.h | 15 + .../public/cpp/system/data_pipe.h | 14 +- .../public/cpp/system/functions.h | 10 +- .../mojo => mojo}/public/cpp/system/handle.h | 14 +- .../mojo => mojo}/public/cpp/system/macros.h | 12 +- .../public/cpp/system/message_pipe.h | 14 +- .../public/cpp/system/tests/BUILD.gn | 0 .../public/cpp/system/tests/core_unittest.cc | 4 +- .../cpp/system/tests/macros_unittest.cc | 2 +- .../public/cpp/test_support/BUILD.gn | 0 .../cpp/test_support/lib/test_support.cc | 2 +- .../public/cpp/test_support/lib/test_utils.cc | 6 +- .../public/cpp/test_support/test_support.h | 8 +- .../public/cpp/test_support/test_utils.h | 8 +- .../mojo => mojo}/public/cpp/utility/BUILD.gn | 0 .../public/cpp/utility/lib/mutex.cc | 2 +- .../public/cpp/utility/lib/run_loop.cc | 6 +- .../public/cpp/utility/lib/thread.cc | 2 +- .../public/cpp/utility/lib/thread_local.h | 8 +- .../cpp/utility/lib/thread_local_posix.cc | 2 +- .../cpp/utility/lib/thread_local_win.cc | 2 +- .../mojo => mojo}/public/cpp/utility/mutex.h | 8 +- .../public/cpp/utility/run_loop.h | 10 +- .../public/cpp/utility/run_loop_handler.h | 8 +- .../public/cpp/utility/tests/BUILD.gn | 0 .../cpp/utility/tests/mutex_unittest.cc | 6 +- .../cpp/utility/tests/run_loop_unittest.cc | 8 +- .../cpp/utility/tests/thread_unittest.cc | 4 +- .../mojo => mojo}/public/cpp/utility/thread.h | 8 +- .../src/mojo => mojo}/public/gles2/BUILD.gn | 6 +- .../mojo => mojo}/public/interfaces/BUILD.gn | 0 .../public/interfaces/bindings/BUILD.gn | 0 .../bindings/interface_control_messages.mojom | 0 .../public/interfaces/bindings/tests/BUILD.gn | 0 .../bindings/tests/data/message_data | 0 .../boundscheck_msghdr_no_such_method.data | 0 ...boundscheck_msghdr_no_such_method.expected | 0 .../data/validation/conformance_empty.data | 0 .../validation/conformance_empty.expected | 0 .../conformance_msghdr_incomplete_struct.data | 0 ...formance_msghdr_incomplete_struct.expected | 0 ...mance_msghdr_incomplete_struct_header.data | 0 ...e_msghdr_incomplete_struct_header.expected | 0 ...conformance_msghdr_invalid_flag_combo.data | 0 ...ormance_msghdr_invalid_flag_combo.expected | 0 ...conformance_msghdr_missing_request_id.data | 0 ...ormance_msghdr_missing_request_id.expected | 0 .../conformance_msghdr_no_such_method.data | 0 ...conformance_msghdr_no_such_method.expected | 0 .../conformance_msghdr_num_bytes_huge.data | 0 ...conformance_msghdr_num_bytes_huge.expected | 0 ...r_num_bytes_less_than_min_requirement.data | 0 ...m_bytes_less_than_min_requirement.expected | 0 ...hdr_num_bytes_less_than_struct_header.data | 0 ...num_bytes_less_than_struct_header.expected | 0 ...e_msghdr_num_bytes_version_mismatch_1.data | 0 ...ghdr_num_bytes_version_mismatch_1.expected | 0 ...e_msghdr_num_bytes_version_mismatch_2.data | 0 ...ghdr_num_bytes_version_mismatch_2.expected | 0 ...e_msghdr_num_bytes_version_mismatch_3.data | 0 ...ghdr_num_bytes_version_mismatch_3.expected | 0 .../validation/conformance_mthd0_good.data | 0 .../conformance_mthd0_good.expected | 0 .../conformance_mthd0_incomplete_struct.data | 0 ...nformance_mthd0_incomplete_struct.expected | 0 ...rmance_mthd0_incomplete_struct_header.data | 0 ...ce_mthd0_incomplete_struct_header.expected | 0 ...nformance_mthd0_invalid_request_flags.data | 0 ...mance_mthd0_invalid_request_flags.expected | 0 ...formance_mthd0_invalid_request_flags2.data | 0 ...ance_mthd0_invalid_request_flags2.expected | 0 ...nformance_mthd0_struct_num_bytes_huge.data | 0 ...mance_mthd0_struct_num_bytes_huge.expected | 0 ...t_num_bytes_less_than_min_requirement.data | 0 ...m_bytes_less_than_min_requirement.expected | 0 ...uct_num_bytes_less_than_struct_header.data | 0 ...num_bytes_less_than_struct_header.expected | 0 .../validation/conformance_mthd10_good.data | 0 .../conformance_mthd10_good.expected | 0 ...nformance_mthd10_good_non_unique_keys.data | 0 ...mance_mthd10_good_non_unique_keys.expected | 0 .../conformance_mthd10_null_keys.data | 0 .../conformance_mthd10_null_keys.expected | 0 .../conformance_mthd10_null_values.data | 0 .../conformance_mthd10_null_values.expected | 0 .../conformance_mthd10_one_null_key.data | 0 .../conformance_mthd10_one_null_key.expected | 0 ...conformance_mthd10_unequal_array_size.data | 0 ...ormance_mthd10_unequal_array_size.expected | 0 .../conformance_mthd11_good_version0.data | 0 .../conformance_mthd11_good_version0.expected | 0 .../conformance_mthd11_good_version1.data | 0 .../conformance_mthd11_good_version1.expected | 0 .../conformance_mthd11_good_version2.data | 0 .../conformance_mthd11_good_version2.expected | 0 .../conformance_mthd11_good_version3.data | 0 .../conformance_mthd11_good_version3.expected | 0 ...thd11_good_version_newer_than_known_1.data | 0 ...1_good_version_newer_than_known_1.expected | 0 ...thd11_good_version_newer_than_known_2.data | 0 ...1_good_version_newer_than_known_2.expected | 0 ...e_mthd11_num_bytes_version_mismatch_1.data | 0 ...hd11_num_bytes_version_mismatch_1.expected | 0 ...e_mthd11_num_bytes_version_mismatch_2.data | 0 ...hd11_num_bytes_version_mismatch_2.expected | 0 ...formance_mthd12_invalid_request_flags.data | 0 ...ance_mthd12_invalid_request_flags.expected | 0 .../validation/conformance_mthd13_good_1.data | 0 .../conformance_mthd13_good_1.expected | 0 .../validation/conformance_mthd13_good_2.data | 0 .../conformance_mthd13_good_2.expected | 0 .../validation/conformance_mthd1_good.data | 0 .../conformance_mthd1_good.expected | 0 .../conformance_mthd1_misaligned_struct.data | 0 ...nformance_mthd1_misaligned_struct.expected | 0 ...ormance_mthd1_struct_pointer_overflow.data | 0 ...nce_mthd1_struct_pointer_overflow.expected | 0 ...formance_mthd1_unexpected_null_struct.data | 0 ...ance_mthd1_unexpected_null_struct.expected | 0 .../validation/conformance_mthd2_good.data | 0 .../conformance_mthd2_good.expected | 0 ...thd2_multiple_pointers_to_same_struct.data | 0 ..._multiple_pointers_to_same_struct.expected | 0 .../conformance_mthd2_overlapped_objects.data | 0 ...formance_mthd2_overlapped_objects.expected | 0 .../conformance_mthd2_wrong_layout_order.data | 0 ...formance_mthd2_wrong_layout_order.expected | 0 ...onformance_mthd3_array_num_bytes_huge.data | 0 ...rmance_mthd3_array_num_bytes_huge.expected | 0 ...rray_num_bytes_less_than_array_header.data | 0 ..._num_bytes_less_than_array_header.expected | 0 ...ay_num_bytes_less_than_necessary_size.data | 0 ...um_bytes_less_than_necessary_size.expected | 0 ...formance_mthd3_array_pointer_overflow.data | 0 ...ance_mthd3_array_pointer_overflow.expected | 0 .../validation/conformance_mthd3_good.data | 0 .../conformance_mthd3_good.expected | 0 .../conformance_mthd3_incomplete_array.data | 0 ...onformance_mthd3_incomplete_array.expected | 0 ...ormance_mthd3_incomplete_array_header.data | 0 ...nce_mthd3_incomplete_array_header.expected | 0 .../conformance_mthd3_misaligned_array.data | 0 ...onformance_mthd3_misaligned_array.expected | 0 ...nformance_mthd3_unexpected_null_array.data | 0 ...mance_mthd3_unexpected_null_array.expected | 0 .../validation/conformance_mthd4_good.data | 0 .../conformance_mthd4_good.expected | 0 ...mthd4_multiple_pointers_to_same_array.data | 0 ...4_multiple_pointers_to_same_array.expected | 0 .../conformance_mthd4_overlapped_objects.data | 0 ...formance_mthd4_overlapped_objects.expected | 0 .../conformance_mthd4_wrong_layout_order.data | 0 ...formance_mthd4_wrong_layout_order.expected | 0 .../validation/conformance_mthd5_good.data | 0 .../conformance_mthd5_good.expected | 0 ...conformance_mthd5_handle_out_of_range.data | 0 ...ormance_mthd5_handle_out_of_range.expected | 0 ...d5_multiple_handles_with_same_value_1.data | 0 ...ultiple_handles_with_same_value_1.expected | 0 ...d5_multiple_handles_with_same_value_2.data | 0 ...ultiple_handles_with_same_value_2.expected | 0 ...mance_mthd5_unexpected_invalid_handle.data | 0 ...e_mthd5_unexpected_invalid_handle.expected | 0 .../conformance_mthd5_wrong_handle_order.data | 0 ...formance_mthd5_wrong_handle_order.expected | 0 .../validation/conformance_mthd6_good.data | 0 .../conformance_mthd6_good.expected | 0 ...ay_num_bytes_less_than_necessary_size.data | 0 ...um_bytes_less_than_necessary_size.expected | 0 .../validation/conformance_mthd7_good.data | 0 .../conformance_mthd7_good.expected | 0 ...nce_mthd7_unexpected_null_fixed_array.data | 0 ...mthd7_unexpected_null_fixed_array.expected | 0 ...rmance_mthd7_unmatched_array_elements.data | 0 ...ce_mthd7_unmatched_array_elements.expected | 0 ...mthd7_unmatched_array_elements_nested.data | 0 ...7_unmatched_array_elements_nested.expected | 0 ...rmance_mthd8_array_num_bytes_overflow.data | 0 ...ce_mthd8_array_num_bytes_overflow.expected | 0 .../validation/conformance_mthd8_good.data | 0 .../conformance_mthd8_good.expected | 0 ...nformance_mthd8_unexpected_null_array.data | 0 ...mance_mthd8_unexpected_null_array.expected | 0 ...formance_mthd8_unexpected_null_string.data | 0 ...ance_mthd8_unexpected_null_string.expected | 0 .../validation/conformance_mthd9_good.data | 0 .../conformance_mthd9_good.expected | 0 .../conformance_mthd9_good_null_array.data | 0 ...conformance_mthd9_good_null_array.expected | 0 ...nformance_mthd9_unexpected_null_array.data | 0 ...mance_mthd9_unexpected_null_array.expected | 0 .../integration_intf_resp_mthd0_good.data | 0 .../integration_intf_resp_mthd0_good.expected | 0 ...tf_resp_mthd0_unexpected_array_header.data | 0 ...esp_mthd0_unexpected_array_header.expected | 0 .../integration_intf_rqst_mthd0_good.data | 0 .../integration_intf_rqst_mthd0_good.expected | 0 ...f_rqst_mthd0_unexpected_struct_header.data | 0 ...st_mthd0_unexpected_struct_header.expected | 0 .../integration_msghdr_invalid_flags.data | 0 .../integration_msghdr_invalid_flags.expected | 0 ...esp_boundscheck_msghdr_no_such_method.data | 0 ...boundscheck_msghdr_no_such_method.expected | 0 ...rmance_msghdr_invalid_response_flags1.data | 0 ...ce_msghdr_invalid_response_flags1.expected | 0 ...rmance_msghdr_invalid_response_flags2.data | 0 ...ce_msghdr_invalid_response_flags2.expected | 0 ...esp_conformance_msghdr_no_such_method.data | 0 ...conformance_msghdr_no_such_method.expected | 0 .../bindings/tests/math_calculator.mojom | 0 .../interfaces/bindings/tests/no_module.mojom | 0 .../bindings/tests/ping_service.mojom | 0 .../interfaces/bindings/tests/rect.mojom | 0 .../bindings/tests/regression_tests.mojom | 0 .../bindings/tests/sample_factory.mojom | 0 .../bindings/tests/sample_import.mojom | 0 .../bindings/tests/sample_import2.mojom | 0 .../bindings/tests/sample_interfaces.mojom | 0 .../bindings/tests/sample_service.mojom | 0 .../interfaces/bindings/tests/scoping.mojom | 0 .../tests/serialization_test_structs.mojom | 0 .../tests/test_associated_interfaces.mojom | 0 .../bindings/tests/test_constants.mojom | 0 .../bindings/tests/test_structs.mojom | 2 +- .../bindings/tests/test_unions.mojom | 0 .../tests/validation_test_interfaces.mojom | 0 .../tests/versioning_test_client.mojom | 0 .../tests/versioning_test_service.mojom | 0 .../src/mojo => mojo}/public/java/BUILD.gn | 19 - .../mojo/bindings/AutoCloseableRouter.java | 0 .../mojo/bindings/BindingsHelper.java | 0 .../org/chromium/mojo/bindings/Callbacks.java | 0 .../mojo/bindings/ConnectionErrorHandler.java | 0 .../org/chromium/mojo/bindings/Connector.java | 0 .../chromium/mojo/bindings/DataHeader.java | 0 .../org/chromium/mojo/bindings/Decoder.java | 0 .../DelegatingConnectionErrorHandler.java | 0 .../bindings/DeserializationException.java | 0 .../org/chromium/mojo/bindings/Encoder.java | 0 .../mojo/bindings/ExecutorFactory.java | 0 .../chromium/mojo/bindings/HandleOwner.java | 0 .../org/chromium/mojo/bindings/Interface.java | 0 .../InterfaceControlMessagesHelper.java | 0 .../mojo/bindings/InterfaceRequest.java | 0 .../org/chromium/mojo/bindings/Message.java | 0 .../chromium/mojo/bindings/MessageHeader.java | 0 .../mojo/bindings/MessageReceiver.java | 0 .../MessageReceiverWithResponder.java | 0 .../org/chromium/mojo/bindings/Router.java | 0 .../chromium/mojo/bindings/RouterImpl.java | 0 .../mojo/bindings/SerializationException.java | 0 .../mojo/bindings/ServiceMessage.java | 0 .../bindings/SideEffectFreeCloseable.java | 0 .../org/chromium/mojo/bindings/Struct.java | 0 .../src/org/chromium/mojo/bindings/Union.java | 0 .../org/chromium/mojo/system/AsyncWaiter.java | 0 .../src/org/chromium/mojo/system/Core.java | 0 .../org/chromium/mojo/system/DataPipe.java | 0 .../src/org/chromium/mojo/system/Flags.java | 0 .../src/org/chromium/mojo/system/Handle.java | 0 .../chromium/mojo/system/InvalidHandle.java | 0 .../mojo/system/MessagePipeHandle.java | 0 .../chromium/mojo/system/MojoException.java | 0 .../org/chromium/mojo/system/MojoResult.java | 0 .../src/org/chromium/mojo/system/Pair.java | 0 .../org/chromium/mojo/system/ResultAnd.java | 0 .../src/org/chromium/mojo/system/RunLoop.java | 0 .../mojo/system/SharedBufferHandle.java | 0 .../chromium/mojo/system/UntypedHandle.java | 0 .../mojo/src/mojo => mojo}/public/js/BUILD.gn | 0 .../src/mojo => mojo}/public/js/bindings.js | 0 .../src/mojo => mojo}/public/js/buffer.js | 0 .../mojo/src/mojo => mojo}/public/js/codec.js | 0 .../public/js/codec_unittests.js | 0 .../src/mojo => mojo}/public/js/connection.js | 0 .../src/mojo => mojo}/public/js/connector.js | 0 .../src/mojo => mojo}/public/js/constants.cc | 2 +- .../src/mojo => mojo}/public/js/constants.h | 0 .../mojo/src/mojo => mojo}/public/js/core.js | 0 .../mojo => mojo}/public/js/core_unittests.js | 0 .../src/mojo => mojo}/public/js/router.js | 0 .../public/js/struct_unittests.js | 0 .../src/mojo => mojo}/public/js/support.js | 0 .../js/test/validation_test_input_parser.js | 0 .../src/mojo => mojo}/public/js/threading.js | 0 .../src/mojo => mojo}/public/js/unicode.js | 0 .../public/js/union_unittests.js | 0 .../public/js/validation_unittests.js | 0 .../src/mojo => mojo}/public/js/validator.js | 0 mojo/public/mojo.gni | 14 - mojo/public/mojo_application.gni | 48 +- .../src/mojo => mojo}/public/mojo_sdk.gni | 34 +- .../public/platform/nacl/BUILD.gn | 0 .../mojo => mojo}/public/platform/nacl/DEPS | 0 .../public/platform/nacl/libmojo.cc | 4 +- .../platform/nacl/mojo_initial_handle.h | 8 +- .../public/platform/nacl/mojo_irt.h | 14 +- .../public/platform/nacl/mojo_main_thunk.cc | 4 +- .../public/platform/native/BUILD.gn | 0 .../gles2_impl_chromium_extension_thunks.cc | 6 +- .../gles2_impl_chromium_extension_thunks.h | 12 +- .../platform/native/gles2_impl_thunks.cc | 6 +- .../platform/native/gles2_impl_thunks.h | 12 +- .../public/platform/native/gles2_thunks.cc | 4 +- .../public/platform/native/gles2_thunks.h | 8 +- .../platform/native/mgl_onscreen_thunks.c | 4 +- .../platform/native/mgl_onscreen_thunks.h | 8 +- .../public/platform/native/mgl_thunks.c | 4 +- .../public/platform/native/mgl_thunks.h | 8 +- .../public/platform/native/system_thunks.cc | 4 +- .../public/platform/native/system_thunks.h | 8 +- .../public/platform/native/thunk_export.h | 6 +- .../public/tests/test_support_private.cc | 2 +- .../public/tests/test_support_private.h | 8 +- .../public/third_party/README.txt | 0 .../public/third_party/jinja2/AUTHORS | 0 .../jinja2/Jinja2-2.7.1.tar.gz.md5 | 0 .../jinja2/Jinja2-2.7.1.tar.gz.sha512 | 0 .../public/third_party/jinja2/LICENSE | 0 .../public/third_party/jinja2/OWNERS | 0 .../public/third_party/jinja2/README.chromium | 0 .../public/third_party/jinja2/__init__.py | 0 .../public/third_party/jinja2/_compat.py | 0 .../public/third_party/jinja2/_stringdefs.py | 0 .../public/third_party/jinja2/bccache.py | 0 .../public/third_party/jinja2/compiler.py | 0 .../public/third_party/jinja2/constants.py | 0 .../public/third_party/jinja2/debug.py | 0 .../public/third_party/jinja2/defaults.py | 0 .../public/third_party/jinja2/environment.py | 0 .../public/third_party/jinja2/exceptions.py | 0 .../public/third_party/jinja2/ext.py | 0 .../public/third_party/jinja2/filters.py | 0 .../public/third_party/jinja2/get_jinja2.sh | 0 .../public/third_party/jinja2/lexer.py | 0 .../public/third_party/jinja2/loaders.py | 0 .../public/third_party/jinja2/meta.py | 0 .../public/third_party/jinja2/nodes.py | 0 .../public/third_party/jinja2/optimizer.py | 0 .../public/third_party/jinja2/parser.py | 0 .../public/third_party/jinja2/runtime.py | 0 .../public/third_party/jinja2/sandbox.py | 0 .../public/third_party/jinja2/tests.py | 0 .../public/third_party/jinja2/utils.py | 0 .../public/third_party/jinja2/visitor.py | 0 .../public/third_party/markupsafe/AUTHORS | 0 .../public/third_party/markupsafe/LICENSE | 0 .../markupsafe/MarkupSafe-0.18.tar.gz.md5 | 0 .../markupsafe/MarkupSafe-0.18.tar.gz.sha512 | 0 .../public/third_party/markupsafe/OWNERS | 0 .../third_party/markupsafe/README.chromium | 0 .../public/third_party/markupsafe/__init__.py | 0 .../public/third_party/markupsafe/_compat.py | 0 .../third_party/markupsafe/_constants.py | 0 .../public/third_party/markupsafe/_native.py | 0 .../public/third_party/markupsafe/_speedups.c | 0 .../third_party/markupsafe/get_markupsafe.sh | 0 .../public/third_party/ply/LICENSE | 0 .../public/third_party/ply/README | 0 .../public/third_party/ply/README.chromium | 0 .../public/third_party/ply/__init__.py | 0 .../public/third_party/ply/lex.py | 0 .../public/third_party/ply/license.patch | 0 .../public/third_party/ply/yacc.py | 0 .../generators/cpp_templates/enum_macros.tmpl | 0 .../cpp_templates/interface_declaration.tmpl | 0 .../cpp_templates/interface_definition.tmpl | 0 .../cpp_templates/interface_macros.tmpl | 0 .../interface_proxy_declaration.tmpl | 0 ...terface_request_validator_declaration.tmpl | 0 ...erface_response_validator_declaration.tmpl | 0 .../interface_stub_declaration.tmpl | 0 .../cpp_templates/module-internal.h.tmpl | 10 +- .../generators/cpp_templates/module.cc.tmpl | 26 +- .../generators/cpp_templates/module.h.tmpl | 26 +- .../cpp_templates/struct_declaration.tmpl | 0 .../cpp_templates/struct_definition.tmpl | 0 .../cpp_templates/struct_macros.tmpl | 0 .../struct_serialization_declaration.tmpl | 0 .../struct_serialization_definition.tmpl | 0 .../cpp_templates/union_declaration.tmpl | 0 .../cpp_templates/union_definition.tmpl | 0 .../union_serialization_declaration.tmpl | 0 .../union_serialization_definition.tmpl | 0 .../cpp_templates/validation_macros.tmpl | 0 .../wrapper_class_declaration.tmpl | 0 .../wrapper_class_definition.tmpl | 0 .../wrapper_union_class_declaration.tmpl | 0 .../wrapper_union_class_definition.tmpl | 0 .../java_templates/constant_definition.tmpl | 0 .../java_templates/constants.java.tmpl | 0 .../java_templates/data_types_definition.tmpl | 0 .../generators/java_templates/enum.java.tmpl | 0 .../java_templates/enum_definition.tmpl | 0 .../java_templates/header.java.tmpl | 0 .../java_templates/interface.java.tmpl | 0 .../java_templates/interface_definition.tmpl | 0 .../interface_internal.java.tmpl | 0 .../java_templates/struct.java.tmpl | 0 .../generators/java_templates/union.java.tmpl | 0 .../js_templates/enum_definition.tmpl | 0 .../js_templates/interface_definition.tmpl | 0 .../generators/js_templates/module.amd.tmpl | 0 .../js_templates/module_definition.tmpl | 0 .../js_templates/struct_definition.tmpl | 0 .../js_templates/union_definition.tmpl | 0 .../js_templates/validation_macros.tmpl | 0 .../generators/mojom_cpp_generator.py | 0 .../generators/mojom_java_generator.py | 0 .../bindings/generators/mojom_js_generator.py | 0 .../bindings/generators/run_cpp_generator.py | 0 .../public/tools/bindings/mojom.gni | 30 +- .../bindings/mojom_bindings_generator.py | 0 .../mojom_bindings_generator_unittest.py | 0 .../tools/bindings/mojom_list_outputs.py | 0 .../tools/bindings/pylib/mojom/__init__.py | 0 .../tools/bindings/pylib/mojom/error.py | 0 .../tools/bindings/pylib/mojom/fileutil.py | 0 .../bindings/pylib/mojom/generate/__init__.py | 0 .../pylib/mojom/generate/constant_resolver.py | 0 .../bindings/pylib/mojom/generate/data.py | 0 .../pylib/mojom/generate/data_tests.py | 0 .../pylib/mojom/generate/generator.py | 0 .../mojom/generate/generator_unittest.py | 0 .../bindings/pylib/mojom/generate/module.py | 2 +- .../pylib/mojom/generate/module_tests.py | 0 .../bindings/pylib/mojom/generate/pack.py | 0 .../pylib/mojom/generate/pack_tests.py | 0 .../pylib/mojom/generate/run_tests.py | 0 .../pylib/mojom/generate/template_expander.py | 0 .../pylib/mojom/generate/test_support.py | 0 .../bindings/pylib/mojom/parse/__init__.py | 0 .../tools/bindings/pylib/mojom/parse/ast.py | 0 .../tools/bindings/pylib/mojom/parse/lexer.py | 0 .../bindings/pylib/mojom/parse/parser.py | 0 .../bindings/pylib/mojom/parse/translate.py | 0 .../bindings/pylib/mojom_tests/__init__.py | 0 .../pylib/mojom_tests/fileutil_unittest.py | 0 .../pylib/mojom_tests/generate/__init__.py | 0 .../mojom_tests/generate/data_unittest.py | 0 .../generate/generator_unittest.py | 0 .../mojom_tests/generate/module_unittest.py | 0 .../mojom_tests/generate/pack_unittest.py | 0 .../pylib/mojom_tests/parse/__init__.py | 0 .../pylib/mojom_tests/parse/ast_unittest.py | 0 .../pylib/mojom_tests/parse/lexer_unittest.py | 0 .../mojom_tests/parse/parser_unittest.py | 0 .../pylib/mojom_tests/parse/run_parser.py | 0 .../pylib/mojom_tests/parse/run_translate.py | 0 .../mojom_tests/parse/translate_unittest.py | 0 .../pylib/mojom_tests/support/__init__.py | 0 .../pylib/mojom_tests/support/find_files.py | 0 .../support/run_bindings_generator.py | 0 .../src/mojo => mojo}/public/tools/gn/zip.py | 0 .../src/mojo => mojo}/public/tools/prepend.py | 0 mojo/runner/BUILD.gn | 2 +- mojo/runner/android/android_handler.cc | 2 +- mojo/runner/child/BUILD.gn | 2 +- mojo/runner/child/runner_connection.cc | 2 +- mojo/runner/context.cc | 2 +- mojo/runner/host/BUILD.gn | 2 +- mojo/runner/host/child_process.cc | 4 +- mojo/runner/host/child_process_host.cc | 4 +- .../runner/host/native_application_support.cc | 8 +- mojo/runner/host/native_application_support.h | 2 +- mojo/runner/shell_apptest.cc | 199 ++ mojo/runner/shell_test_base.h | 4 +- mojo/runner/shell_test_base_unittest.cc | 4 +- mojo/runner/test/BUILD.gn | 28 + mojo/runner/test/pingable_app.cc | 8 +- mojo/services/DEPS | 1 - mojo/services/network/BUILD.gn | 8 +- mojo/services/network/cookie_store_impl.h | 2 +- mojo/services/network/http_connection_impl.cc | 4 +- mojo/services/network/http_connection_impl.h | 2 +- mojo/services/network/main.cc | 2 +- .../network/net_address_type_converters.h | 2 +- mojo/services/network/network_service_impl.h | 2 +- mojo/services/network/public/DEPS | 2 +- mojo/services/network/public/cpp/BUILD.gn | 6 +- .../network/public/cpp/udp_socket_wrapper.cc | 2 +- .../network/public/cpp/udp_socket_wrapper.h | 2 +- .../public/cpp/web_socket_read_queue.h | 2 +- .../public/cpp/web_socket_write_queue.h | 2 +- .../network/public/interfaces/BUILD.gn | 2 +- mojo/services/network/tcp_bound_socket_impl.h | 2 +- .../network/tcp_connected_socket_impl.h | 2 +- .../services/network/tcp_server_socket_impl.h | 2 +- mojo/services/network/udp_socket_apptest.cc | 2 +- mojo/services/network/udp_socket_impl.h | 2 +- .../network/url_loader_factory_impl.h | 2 +- mojo/services/network/url_loader_impl.h | 2 +- .../network/url_loader_impl_apptest.cc | 2 +- .../network/web_socket_factory_impl.h | 2 +- mojo/services/network/web_socket_impl.h | 2 +- mojo/services/test_service/BUILD.gn | 2 +- .../test_request_tracker_application.cc | 2 +- .../test_request_tracker_application.h | 2 +- .../test_service/test_request_tracker_impl.h | 4 +- .../test_service/test_service_application.cc | 2 +- .../test_service/test_service_application.h | 2 +- .../services/test_service/test_service_impl.h | 4 +- .../test_service/test_time_service_impl.h | 6 +- mojo/services/test_service/tracked_service.h | 2 +- mojo/services/tracing/BUILD.gn | 2 +- mojo/services/tracing/main.cc | 2 +- mojo/services/tracing/public/cpp/BUILD.gn | 2 +- .../tracing/public/cpp/trace_provider_impl.h | 4 +- .../tracing/public/interfaces/BUILD.gn | 2 +- mojo/services/tracing/trace_data_sink.h | 2 +- mojo/services/tracing/trace_recorder_impl.h | 4 +- mojo/services/tracing/tracing_app.h | 2 +- mojo/services/updater/BUILD.gn | 3 +- mojo/shell/BUILD.gn | 6 +- mojo/shell/application_instance.h | 2 +- mojo/shell/application_loader.h | 2 +- mojo/shell/application_manager.cc | 2 +- mojo/shell/application_manager.h | 4 +- mojo/shell/application_manager_unittest.cc | 2 +- mojo/shell/capability_filter.h | 2 +- mojo/shell/capability_filter_test.cc | 2 +- mojo/shell/connect_to_application_params.h | 2 +- mojo/shell/connect_util.h | 4 +- mojo/shell/data_pipe_peek.h | 2 +- mojo/shell/native_runner.h | 2 +- mojo/shell/static_application_loader.cc | 2 +- mojo/util/capture_util.h | 2 +- net/BUILD.gn | 6 +- net/DEPS | 2 +- net/dns/host_resolver_mojo.cc | 2 +- net/dns/host_resolver_mojo_unittest.cc | 2 +- net/dns/mojo_host_resolver_impl_unittest.cc | 4 +- net/dns/mojo_host_type_converters.cc | 2 +- net/interfaces/BUILD.gn | 2 +- net/proxy/mojo_proxy_resolver_factory.h | 2 +- net/proxy/mojo_proxy_resolver_factory_impl.h | 2 +- ...jo_proxy_resolver_factory_impl_unittest.cc | 2 +- .../mojo_proxy_resolver_impl_unittest.cc | 2 +- net/proxy/mojo_proxy_type_converters.h | 2 +- net/proxy/proxy_resolver_factory_mojo.cc | 2 +- net/proxy/proxy_resolver_factory_mojo.h | 2 +- .../proxy_resolver_factory_mojo_unittest.cc | 2 +- skia/public/BUILD.gn | 2 +- skia/public/interfaces/BUILD.gn | 2 +- sql/mojo/BUILD.gn | 2 +- sql/mojo/DEPS | 1 - sql/mojo/mojo_vfs.cc | 2 +- sql/mojo/sql_test_base.h | 2 +- third_party/khronos/DEPS | 2 +- third_party/khronos/KHR/khrplatform.h | 2 +- third_party/mojo/mojo_edk_tests.gyp | 62 +- third_party/mojo/mojo_public.gyp | 268 +-- third_party/mojo/mojo_variables.gypi | 10 +- .../mojom_bindings_generator_explicit.gypi | 2 +- .../mojom_bindings_generator_variables.gypi | 104 +- .../mojo/src/mojo/edk/embedder/embedder.h | 2 +- .../mojo/edk/embedder/embedder_unittest.cc | 8 +- .../mojo/src/mojo/edk/embedder/entrypoints.cc | 8 +- .../edk/embedder/master_process_delegate.h | 2 +- .../mojo/edk/embedder/platform_channel_pair.h | 2 +- .../platform_channel_pair_posix_unittest.cc | 2 +- .../edk/embedder/platform_shared_buffer.h | 2 +- .../src/mojo/edk/embedder/platform_support.h | 2 +- .../src/mojo/edk/embedder/process_delegate.h | 2 +- .../edk/embedder/scoped_platform_handle.h | 2 +- .../embedder/simple_platform_shared_buffer.h | 2 +- .../simple_platform_shared_buffer_unittest.cc | 2 +- .../edk/embedder/simple_platform_support.h | 2 +- .../edk/embedder/slave_process_delegate.h | 2 +- .../mojo/src/mojo/edk/js/drain_data.cc | 4 +- third_party/mojo/src/mojo/edk/js/drain_data.h | 4 +- third_party/mojo/src/mojo/edk/js/handle.h | 2 +- .../mojo/src/mojo/edk/js/handle_unittest.cc | 2 +- .../src/mojo/edk/js/mojo_runner_delegate.h | 2 +- third_party/mojo/src/mojo/edk/js/support.cc | 2 +- .../mojo/src/mojo/edk/js/test/BUILD.gn | 14 +- .../mojo/src/mojo/edk/js/test/run_js_tests.cc | 2 +- .../mojo/src/mojo/edk/js/tests/BUILD.gn | 2 +- .../src/mojo/edk/js/tests/js_to_cpp_tests.cc | 6 +- .../mojo/src/mojo/edk/js/waiting_callback.cc | 2 +- .../mojo/src/mojo/edk/js/waiting_callback.h | 4 +- third_party/mojo/src/mojo/edk/mojo_edk.gni | 28 +- third_party/mojo/src/mojo/edk/system/BUILD.gn | 8 +- .../mojo/src/mojo/edk/system/async_waiter.h | 4 +- .../mojo/src/mojo/edk/system/awakable.h | 2 +- .../mojo/src/mojo/edk/system/awakable_list.h | 4 +- .../mojo/src/mojo/edk/system/channel.h | 4 +- .../src/mojo/edk/system/channel_endpoint.cc | 2 +- .../src/mojo/edk/system/channel_endpoint.h | 2 +- .../mojo/edk/system/channel_endpoint_client.h | 2 +- .../src/mojo/edk/system/channel_endpoint_id.h | 2 +- .../edk/system/channel_endpoint_unittest.cc | 2 +- .../src/mojo/edk/system/channel_manager.h | 2 +- .../edk/system/channel_manager_unittest.cc | 2 +- .../src/mojo/edk/system/channel_test_base.h | 2 +- .../src/mojo/edk/system/connection_manager.h | 2 +- .../edk/system/connection_manager_unittest.cc | 2 +- third_party/mojo/src/mojo/edk/system/core.cc | 4 +- third_party/mojo/src/mojo/edk/system/core.h | 18 +- .../src/mojo/edk/system/core_test_base.cc | 2 +- .../mojo/src/mojo/edk/system/core_test_base.h | 4 +- .../mojo/src/mojo/edk/system/core_unittest.cc | 2 +- .../mojo/src/mojo/edk/system/data_pipe.h | 6 +- .../system/data_pipe_consumer_dispatcher.h | 2 +- .../mojo/src/mojo/edk/system/data_pipe_impl.h | 6 +- .../edk/system/data_pipe_impl_unittest.cc | 2 +- .../system/data_pipe_producer_dispatcher.h | 2 +- .../src/mojo/edk/system/data_pipe_unittest.cc | 2 +- .../mojo/src/mojo/edk/system/dispatcher.h | 10 +- .../mojo/edk/system/dispatcher_unittest.cc | 2 +- .../src/mojo/edk/system/endpoint_relayer.h | 2 +- .../edk/system/endpoint_relayer_unittest.cc | 2 +- .../mojo/edk/system/handle_signals_state.h | 2 +- .../mojo/src/mojo/edk/system/handle_table.h | 4 +- .../src/mojo/edk/system/incoming_endpoint.h | 2 +- .../mojo/src/mojo/edk/system/ipc_support.h | 2 +- .../mojo/edk/system/ipc_support_unittest.cc | 2 +- .../mojo/edk/system/local_data_pipe_impl.h | 2 +- .../edk/system/local_message_pipe_endpoint.h | 2 +- .../mojo/src/mojo/edk/system/mapping_table.h | 4 +- .../edk/system/master_connection_manager.cc | 2 +- .../edk/system/master_connection_manager.h | 2 +- third_party/mojo/src/mojo/edk/system/memory.h | 4 +- .../src/mojo/edk/system/memory_unittest.cc | 2 +- .../src/mojo/edk/system/message_in_transit.h | 2 +- .../edk/system/message_in_transit_queue.h | 2 +- .../mojo/src/mojo/edk/system/message_pipe.h | 6 +- .../mojo/edk/system/message_pipe_dispatcher.h | 2 +- .../message_pipe_dispatcher_unittest.cc | 2 +- .../mojo/edk/system/message_pipe_endpoint.h | 6 +- .../mojo/edk/system/message_pipe_test_utils.h | 2 +- third_party/mojo/src/mojo/edk/system/mutex.h | 2 +- .../src/mojo/edk/system/mutex_unittest.cc | 2 +- .../src/mojo/edk/system/options_validation.h | 4 +- .../edk/system/options_validation_unittest.cc | 2 +- .../edk/system/platform_handle_dispatcher.h | 2 +- .../edk/system/proxy_message_pipe_endpoint.h | 2 +- .../mojo/src/mojo/edk/system/raw_channel.h | 2 +- .../src/mojo/edk/system/raw_channel_posix.cc | 2 +- .../mojo/edk/system/raw_channel_unittest.cc | 2 +- .../src/mojo/edk/system/raw_channel_win.cc | 2 +- .../system/remote_consumer_data_pipe_impl.h | 2 +- .../system/remote_data_pipe_impl_unittest.cc | 2 +- .../system/remote_message_pipe_unittest.cc | 2 +- .../system/remote_producer_data_pipe_impl.h | 2 +- .../edk/system/shared_buffer_dispatcher.cc | 2 +- .../edk/system/shared_buffer_dispatcher.h | 2 +- .../shared_buffer_dispatcher_unittest.cc | 2 +- .../src/mojo/edk/system/simple_dispatcher.h | 2 +- .../edk/system/simple_dispatcher_unittest.cc | 2 +- .../edk/system/slave_connection_manager.h | 2 +- .../edk/system/test_channel_endpoint_client.h | 2 +- .../mojo/src/mojo/edk/system/test_utils.h | 4 +- .../edk/system/thread_annotations_unittest.cc | 2 +- .../mojo/src/mojo/edk/system/transport_data.h | 2 +- .../src/mojo/edk/system/unique_identifier.h | 2 +- .../edk/system/unique_identifier_unittest.cc | 2 +- third_party/mojo/src/mojo/edk/system/waiter.h | 4 +- .../src/mojo/edk/system/waiter_test_utils.h | 4 +- .../src/mojo/edk/system/waiter_unittest.cc | 2 +- third_party/mojo/src/mojo/edk/test/BUILD.gn | 26 +- .../mojo/edk/test/multiprocess_test_helper.h | 2 +- .../src/mojo/edk/test/run_all_perftests.cc | 2 +- .../src/mojo/edk/test/run_all_unittests.cc | 2 +- .../src/mojo/edk/test/scoped_ipc_support.h | 2 +- .../src/mojo/edk/test/test_support_impl.h | 4 +- third_party/mojo/src/mojo/public/.gitignore | 1 - .../mojo/src/mojo/public/c/gpu/GLES2/gl2.h | 526 ----- .../mojo/src/mojo/public/c/gpu/GLES2/gl2ext.h | 2026 ----------------- .../src/mojo/public/c/gpu/GLES2/gl2extmojo.h | 788 ------- .../src/mojo/public/c/gpu/GLES2/gl2mojo.h | 32 - .../mojo/public/c/gpu/GLES2/gl2mojo_autogen.h | 325 --- .../src/mojo/public/c/gpu/GLES2/gl2platform.h | 30 - .../src/mojo/public/c/gpu/KHR/khrplatform.h | 298 --- .../mojo/src/mojo/public/c/system/core.h | 21 - .../mojo/src/mojo/public/cpp/system/core.h | 15 - .../mojo/src/mojo/public/mojo_application.gni | 472 ---- .../accessibility/public/interfaces/BUILD.gn | 2 +- .../src/clipboard/public/interfaces/BUILD.gn | 2 +- tools/android/eclipse/.classpath | 4 +- tools/battor_agent/BUILD.gn | 2 +- ui/mojo/geometry/BUILD.gn | 2 +- ui/mojo/ime/BUILD.gn | 2 +- ui/views/mus/BUILD.gn | 2 +- ui/views/mus/DEPS | 1 - ui/views/mus/surface_binding.cc | 2 +- 1304 files changed, 2357 insertions(+), 6885 deletions(-) delete mode 100644 mojo/mojo_public_gles2_for_loadable_module.gypi rename {third_party/mojo/src/mojo => mojo}/public/BUILD.gn (64%) rename {third_party/mojo/src/mojo => mojo}/public/DEPS (100%) rename {third_party/mojo/src/mojo => mojo}/public/LICENSE (100%) rename {third_party/mojo/src/mojo => mojo}/public/README.md (100%) rename {third_party/mojo/src/mojo => mojo}/public/c/README.md (100%) rename {third_party/mojo/src/mojo => mojo}/public/c/environment/BUILD.gn (100%) rename {third_party/mojo/src/mojo => mojo}/public/c/environment/async_waiter.h (91%) rename {third_party/mojo/src/mojo => mojo}/public/c/environment/logger.h (92%) rename {third_party/mojo/src/mojo => mojo}/public/c/gles2/BUILD.gn (100%) rename {third_party/mojo/src/mojo => mojo}/public/c/gles2/chromium_extension.h (52%) rename {third_party/mojo/src/mojo => mojo}/public/c/gles2/gles2.h (72%) rename {third_party/mojo/src/mojo => mojo}/public/c/gles2/gles2_call_visitor_autogen.h (100%) rename {third_party/mojo/src/mojo => mojo}/public/c/gles2/gles2_call_visitor_chromium_extension_autogen.h (100%) rename {third_party/mojo/src/mojo => mojo}/public/c/gles2/gles2_export.h (79%) rename {third_party/mojo/src/mojo => mojo}/public/c/gles2/gles2_types.h (65%) rename {third_party/mojo/src/mojo => mojo}/public/c/gpu/BUILD.gn (77%) rename {third_party/mojo/src/mojo => mojo}/public/c/gpu/DEPS (100%) rename {third_party/mojo/src/mojo => mojo}/public/c/gpu/MGL/mgl.h (86%) rename {third_party/mojo/src/mojo => mojo}/public/c/gpu/MGL/mgl_onscreen.h (69%) rename {third_party/mojo/src/mojo => mojo}/public/c/gpu/MGL/mgl_types.h (100%) rename {third_party/mojo/src/mojo => mojo}/public/c/system/BUILD.gn (93%) rename {third_party/mojo/src/mojo => mojo}/public/c/system/buffer.h (95%) create mode 100644 mojo/public/c/system/core.h rename {third_party/mojo/src/mojo => mojo}/public/c/system/data_pipe.h (97%) rename {third_party/mojo/src/mojo => mojo}/public/c/system/functions.h (95%) rename {third_party/mojo/src/mojo => mojo}/public/c/system/macros.h (93%) rename {third_party/mojo/src/mojo => mojo}/public/c/system/main.h (76%) rename {third_party/mojo/src/mojo => mojo}/public/c/system/message_pipe.h (95%) rename {third_party/mojo/src/mojo => mojo}/public/c/system/system_export.h (79%) rename {third_party/mojo/src/mojo => mojo}/public/c/system/tests/BUILD.gn (86%) rename {third_party/mojo/src/mojo => mojo}/public/c/system/tests/core_perftest.cc (96%) rename {third_party/mojo/src/mojo => mojo}/public/c/system/tests/core_unittest.cc (99%) rename {third_party/mojo/src/mojo => mojo}/public/c/system/tests/core_unittest_pure_c.c (95%) rename {third_party/mojo/src/mojo => mojo}/public/c/system/tests/macros_unittest.cc (97%) rename {third_party/mojo/src/mojo => mojo}/public/c/system/types.h (97%) rename {third_party/mojo/src/mojo => mojo}/public/c/test_support/BUILD.gn (100%) rename {third_party/mojo/src/mojo => mojo}/public/c/test_support/test_support.h (84%) rename {third_party/mojo/src/mojo => mojo}/public/c/test_support/test_support_export.h (70%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/README.md (100%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/BUILD.gn (100%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/array.h (93%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/associated_interface_ptr_info.h (68%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/associated_interface_request.h (67%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/binding.h (90%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/callback.h (89%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/interface_ptr.h (92%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/interface_ptr_info.h (80%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/interface_request.h (93%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/lib/TODO (100%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/lib/array_internal.cc (96%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/lib/array_internal.h (94%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/lib/array_serialization.h (94%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/lib/bindings_internal.h (86%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/lib/bindings_serialization.cc (93%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/lib/bindings_serialization.h (86%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/lib/bounds_checker.cc (88%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/lib/bounds_checker.h (86%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/lib/buffer.h (71%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/lib/callback_internal.h (79%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/lib/connector.cc (98%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/lib/connector.h (89%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/lib/control_message_handler.cc (87%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/lib/control_message_handler.h (73%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/lib/control_message_proxy.cc (89%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/lib/control_message_proxy.h (67%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/lib/filter_chain.cc (87%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/lib/filter_chain.h (77%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/lib/fixed_buffer.cc (83%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/lib/fixed_buffer.h (84%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/lib/interface_ptr_internal.h (84%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/lib/map_data_internal.h (88%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/lib/map_internal.h (95%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/lib/map_serialization.h (90%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/lib/message.cc (94%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/lib/message_builder.cc (86%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/lib/message_builder.h (78%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/lib/message_filter.cc (86%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/lib/message_header_validator.cc (87%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/lib/message_header_validator.h (51%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/lib/message_internal.h (80%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/lib/no_interface.cc (86%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/lib/router.cc (97%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/lib/router.h (85%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/lib/shared_data.h (82%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/lib/shared_ptr.h (78%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/lib/string_serialization.cc (91%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/lib/string_serialization.h (53%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/lib/template_util.h (93%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/lib/thread_checker.h (70%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/lib/thread_checker_posix.cc (86%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/lib/thread_checker_posix.h (65%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/lib/union_accessor.h (78%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/lib/validate_params.h (82%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/lib/validation_errors.cc (95%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/lib/validation_errors.h (94%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/lib/validation_util.cc (87%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/lib/validation_util.h (84%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/lib/value_traits.h (89%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/map.h (96%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/message.h (94%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/message_filter.h (74%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/no_interface.h (74%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/string.h (90%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/strong_binding.h (79%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/struct_ptr.h (91%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/tests/BUILD.gn (63%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/tests/array_unittest.cc (96%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/tests/binding_callback_unittest.cc (95%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/tests/binding_unittest.cc (96%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/tests/bindings_perftest.cc (88%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/tests/bounds_checker_unittest.cc (96%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/tests/buffer_unittest.cc (93%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/tests/callback_unittest.cc (96%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/tests/connector_unittest.cc (97%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/tests/constant_unittest.cc (93%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/tests/container_test_util.cc (92%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/tests/container_test_util.h (78%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/tests/equals_unittest.cc (95%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/tests/handle_passing_unittest.cc (97%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/tests/interface_ptr_unittest.cc (97%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/tests/map_unittest.cc (94%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/tests/message_queue.cc (77%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/tests/message_queue.h (72%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/tests/request_response_unittest.cc (91%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/tests/router_unittest.cc (97%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/tests/sample_service_unittest.cc (99%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/tests/serialization_warning_unittest.cc (92%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/tests/string_unittest.cc (96%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/tests/struct_unittest.cc (98%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/tests/type_conversion_unittest.cc (98%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/tests/union_unittest.cc (97%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/tests/validation_test_input_parser.cc (98%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/tests/validation_test_input_parser.h (93%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/tests/validation_unittest.cc (94%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/tests/versioning_apptest.cc (96%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/tests/versioning_test_service.cc (92%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/bindings/type_converter.h (92%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/environment/BUILD.gn (100%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/environment/async_waiter.h (63%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/environment/environment.h (85%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/environment/lib/async_waiter.cc (92%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/environment/lib/default_async_waiter.cc (88%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/environment/lib/default_async_waiter.h (56%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/environment/lib/default_logger.cc (92%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/environment/lib/default_logger.h (56%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/environment/lib/default_task_tracker.cc (83%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/environment/lib/default_task_tracker.h (55%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/environment/lib/environment.cc (84%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/environment/lib/logging.cc (89%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/environment/lib/scoped_task_tracking.cc (88%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/environment/lib/scoped_task_tracking.h (65%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/environment/logging.h (87%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/environment/task_tracker.h (80%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/environment/tests/BUILD.gn (100%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/environment/tests/async_wait_unittest.cc (88%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/environment/tests/async_waiter_unittest.cc (91%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/environment/tests/logger_unittest.cc (95%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/environment/tests/logging_unittest.cc (98%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/system/BUILD.gn (100%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/system/buffer.h (89%) create mode 100644 mojo/public/cpp/system/core.h rename {third_party/mojo/src/mojo => mojo}/public/cpp/system/data_pipe.h (92%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/system/functions.h (70%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/system/handle.h (95%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/system/macros.h (87%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/system/message_pipe.h (89%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/system/tests/BUILD.gn (100%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/system/tests/core_unittest.cc (99%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/system/tests/macros_unittest.cc (98%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/test_support/BUILD.gn (100%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/test_support/lib/test_support.cc (89%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/test_support/lib/test_utils.cc (93%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/test_support/test_support.h (75%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/test_support/test_utils.h (83%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/utility/BUILD.gn (100%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/utility/lib/mutex.cc (94%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/utility/lib/run_loop.cc (97%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/utility/lib/thread.cc (95%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/utility/lib/thread_local.h (80%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/utility/lib/thread_local_posix.cc (91%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/utility/lib/thread_local_win.cc (91%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/utility/mutex.h (85%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/utility/run_loop.h (94%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/utility/run_loop_handler.h (63%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/utility/tests/BUILD.gn (100%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/utility/tests/mutex_unittest.cc (96%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/utility/tests/run_loop_unittest.cc (97%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/utility/tests/thread_unittest.cc (94%) rename {third_party/mojo/src/mojo => mojo}/public/cpp/utility/thread.h (82%) rename {third_party/mojo/src/mojo => mojo}/public/gles2/BUILD.gn (86%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/BUILD.gn (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/BUILD.gn (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/interface_control_messages.mojom (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/BUILD.gn (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/message_data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/boundscheck_msghdr_no_such_method.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/boundscheck_msghdr_no_such_method.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_empty.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_empty.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_msghdr_incomplete_struct.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_msghdr_incomplete_struct.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_msghdr_incomplete_struct_header.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_msghdr_incomplete_struct_header.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_msghdr_invalid_flag_combo.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_msghdr_invalid_flag_combo.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_msghdr_missing_request_id.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_msghdr_missing_request_id.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_msghdr_no_such_method.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_msghdr_no_such_method.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_huge.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_huge.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_less_than_min_requirement.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_less_than_min_requirement.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_less_than_struct_header.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_less_than_struct_header.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_version_mismatch_1.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_version_mismatch_1.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_version_mismatch_2.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_version_mismatch_2.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_version_mismatch_3.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_version_mismatch_3.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd0_good.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd0_good.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd0_incomplete_struct.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd0_incomplete_struct.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd0_incomplete_struct_header.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd0_incomplete_struct_header.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd0_invalid_request_flags.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd0_invalid_request_flags.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd0_invalid_request_flags2.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd0_invalid_request_flags2.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd0_struct_num_bytes_huge.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd0_struct_num_bytes_huge.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd0_struct_num_bytes_less_than_min_requirement.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd0_struct_num_bytes_less_than_min_requirement.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd0_struct_num_bytes_less_than_struct_header.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd0_struct_num_bytes_less_than_struct_header.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd10_good.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd10_good.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd10_good_non_unique_keys.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd10_good_non_unique_keys.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd10_null_keys.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd10_null_keys.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd10_null_values.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd10_null_values.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd10_one_null_key.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd10_one_null_key.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd10_unequal_array_size.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd10_unequal_array_size.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd11_good_version0.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd11_good_version0.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd11_good_version1.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd11_good_version1.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd11_good_version2.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd11_good_version2.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd11_good_version3.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd11_good_version3.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd11_good_version_newer_than_known_1.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd11_good_version_newer_than_known_1.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd11_good_version_newer_than_known_2.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd11_good_version_newer_than_known_2.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd11_num_bytes_version_mismatch_1.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd11_num_bytes_version_mismatch_1.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd11_num_bytes_version_mismatch_2.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd11_num_bytes_version_mismatch_2.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd12_invalid_request_flags.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd12_invalid_request_flags.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd13_good_1.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd13_good_1.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd13_good_2.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd13_good_2.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd1_good.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd1_good.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd1_misaligned_struct.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd1_misaligned_struct.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd1_struct_pointer_overflow.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd1_struct_pointer_overflow.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd1_unexpected_null_struct.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd1_unexpected_null_struct.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd2_good.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd2_good.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd2_multiple_pointers_to_same_struct.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd2_multiple_pointers_to_same_struct.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd2_overlapped_objects.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd2_overlapped_objects.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd2_wrong_layout_order.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd2_wrong_layout_order.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_num_bytes_huge.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_num_bytes_huge.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_num_bytes_less_than_array_header.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_num_bytes_less_than_array_header.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_num_bytes_less_than_necessary_size.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_num_bytes_less_than_necessary_size.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_pointer_overflow.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_pointer_overflow.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd3_good.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd3_good.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd3_incomplete_array.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd3_incomplete_array.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd3_incomplete_array_header.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd3_incomplete_array_header.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd3_misaligned_array.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd3_misaligned_array.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd3_unexpected_null_array.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd3_unexpected_null_array.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd4_good.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd4_good.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd4_multiple_pointers_to_same_array.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd4_multiple_pointers_to_same_array.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd4_overlapped_objects.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd4_overlapped_objects.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd4_wrong_layout_order.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd4_wrong_layout_order.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd5_good.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd5_good.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd5_handle_out_of_range.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd5_handle_out_of_range.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd5_multiple_handles_with_same_value_1.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd5_multiple_handles_with_same_value_1.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd5_multiple_handles_with_same_value_2.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd5_multiple_handles_with_same_value_2.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd5_unexpected_invalid_handle.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd5_unexpected_invalid_handle.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd5_wrong_handle_order.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd5_wrong_handle_order.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd6_good.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd6_good.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd6_nested_array_num_bytes_less_than_necessary_size.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd6_nested_array_num_bytes_less_than_necessary_size.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd7_good.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd7_good.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd7_unexpected_null_fixed_array.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd7_unexpected_null_fixed_array.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd7_unmatched_array_elements.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd7_unmatched_array_elements.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd7_unmatched_array_elements_nested.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd7_unmatched_array_elements_nested.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd8_array_num_bytes_overflow.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd8_array_num_bytes_overflow.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd8_good.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd8_good.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd8_unexpected_null_array.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd8_unexpected_null_array.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd8_unexpected_null_string.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd8_unexpected_null_string.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd9_good.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd9_good.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd9_good_null_array.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd9_good_null_array.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd9_unexpected_null_array.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/conformance_mthd9_unexpected_null_array.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/integration_intf_resp_mthd0_good.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/integration_intf_resp_mthd0_good.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/integration_intf_resp_mthd0_unexpected_array_header.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/integration_intf_resp_mthd0_unexpected_array_header.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/integration_intf_rqst_mthd0_good.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/integration_intf_rqst_mthd0_good.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/integration_intf_rqst_mthd0_unexpected_struct_header.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/integration_intf_rqst_mthd0_unexpected_struct_header.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/integration_msghdr_invalid_flags.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/integration_msghdr_invalid_flags.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/resp_boundscheck_msghdr_no_such_method.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/resp_boundscheck_msghdr_no_such_method.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/resp_conformance_msghdr_invalid_response_flags1.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/resp_conformance_msghdr_invalid_response_flags1.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/resp_conformance_msghdr_invalid_response_flags2.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/resp_conformance_msghdr_invalid_response_flags2.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/resp_conformance_msghdr_no_such_method.data (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/data/validation/resp_conformance_msghdr_no_such_method.expected (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/math_calculator.mojom (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/no_module.mojom (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/ping_service.mojom (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/rect.mojom (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/regression_tests.mojom (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/sample_factory.mojom (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/sample_import.mojom (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/sample_import2.mojom (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/sample_interfaces.mojom (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/sample_service.mojom (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/scoping.mojom (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/serialization_test_structs.mojom (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/test_associated_interfaces.mojom (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/test_constants.mojom (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/test_structs.mojom (99%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/test_unions.mojom (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/validation_test_interfaces.mojom (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/versioning_test_client.mojom (100%) rename {third_party/mojo/src/mojo => mojo}/public/interfaces/bindings/tests/versioning_test_service.mojom (100%) rename {third_party/mojo/src/mojo => mojo}/public/java/BUILD.gn (80%) rename {third_party/mojo/src/mojo => mojo}/public/java/bindings/src/org/chromium/mojo/bindings/AutoCloseableRouter.java (100%) rename {third_party/mojo/src/mojo => mojo}/public/java/bindings/src/org/chromium/mojo/bindings/BindingsHelper.java (100%) rename {third_party/mojo/src/mojo => mojo}/public/java/bindings/src/org/chromium/mojo/bindings/Callbacks.java (100%) rename {third_party/mojo/src/mojo => mojo}/public/java/bindings/src/org/chromium/mojo/bindings/ConnectionErrorHandler.java (100%) rename {third_party/mojo/src/mojo => mojo}/public/java/bindings/src/org/chromium/mojo/bindings/Connector.java (100%) rename {third_party/mojo/src/mojo => mojo}/public/java/bindings/src/org/chromium/mojo/bindings/DataHeader.java (100%) rename {third_party/mojo/src/mojo => mojo}/public/java/bindings/src/org/chromium/mojo/bindings/Decoder.java (100%) rename {third_party/mojo/src/mojo => mojo}/public/java/bindings/src/org/chromium/mojo/bindings/DelegatingConnectionErrorHandler.java (100%) rename {third_party/mojo/src/mojo => mojo}/public/java/bindings/src/org/chromium/mojo/bindings/DeserializationException.java (100%) rename {third_party/mojo/src/mojo => mojo}/public/java/bindings/src/org/chromium/mojo/bindings/Encoder.java (100%) rename {third_party/mojo/src/mojo => mojo}/public/java/bindings/src/org/chromium/mojo/bindings/ExecutorFactory.java (100%) rename {third_party/mojo/src/mojo => mojo}/public/java/bindings/src/org/chromium/mojo/bindings/HandleOwner.java (100%) rename {third_party/mojo/src/mojo => mojo}/public/java/bindings/src/org/chromium/mojo/bindings/Interface.java (100%) rename {third_party/mojo/src/mojo => mojo}/public/java/bindings/src/org/chromium/mojo/bindings/InterfaceControlMessagesHelper.java (100%) rename {third_party/mojo/src/mojo => mojo}/public/java/bindings/src/org/chromium/mojo/bindings/InterfaceRequest.java (100%) rename {third_party/mojo/src/mojo => mojo}/public/java/bindings/src/org/chromium/mojo/bindings/Message.java (100%) rename {third_party/mojo/src/mojo => mojo}/public/java/bindings/src/org/chromium/mojo/bindings/MessageHeader.java (100%) rename {third_party/mojo/src/mojo => mojo}/public/java/bindings/src/org/chromium/mojo/bindings/MessageReceiver.java (100%) rename {third_party/mojo/src/mojo => mojo}/public/java/bindings/src/org/chromium/mojo/bindings/MessageReceiverWithResponder.java (100%) rename {third_party/mojo/src/mojo => mojo}/public/java/bindings/src/org/chromium/mojo/bindings/Router.java (100%) rename {third_party/mojo/src/mojo => mojo}/public/java/bindings/src/org/chromium/mojo/bindings/RouterImpl.java (100%) rename {third_party/mojo/src/mojo => mojo}/public/java/bindings/src/org/chromium/mojo/bindings/SerializationException.java (100%) rename {third_party/mojo/src/mojo => mojo}/public/java/bindings/src/org/chromium/mojo/bindings/ServiceMessage.java (100%) rename {third_party/mojo/src/mojo => mojo}/public/java/bindings/src/org/chromium/mojo/bindings/SideEffectFreeCloseable.java (100%) rename {third_party/mojo/src/mojo => mojo}/public/java/bindings/src/org/chromium/mojo/bindings/Struct.java (100%) rename {third_party/mojo/src/mojo => mojo}/public/java/bindings/src/org/chromium/mojo/bindings/Union.java (100%) rename {third_party/mojo/src/mojo => mojo}/public/java/system/src/org/chromium/mojo/system/AsyncWaiter.java (100%) rename {third_party/mojo/src/mojo => mojo}/public/java/system/src/org/chromium/mojo/system/Core.java (100%) rename {third_party/mojo/src/mojo => mojo}/public/java/system/src/org/chromium/mojo/system/DataPipe.java (100%) rename {third_party/mojo/src/mojo => mojo}/public/java/system/src/org/chromium/mojo/system/Flags.java (100%) rename {third_party/mojo/src/mojo => mojo}/public/java/system/src/org/chromium/mojo/system/Handle.java (100%) rename {third_party/mojo/src/mojo => mojo}/public/java/system/src/org/chromium/mojo/system/InvalidHandle.java (100%) rename {third_party/mojo/src/mojo => mojo}/public/java/system/src/org/chromium/mojo/system/MessagePipeHandle.java (100%) rename {third_party/mojo/src/mojo => mojo}/public/java/system/src/org/chromium/mojo/system/MojoException.java (100%) rename {third_party/mojo/src/mojo => mojo}/public/java/system/src/org/chromium/mojo/system/MojoResult.java (100%) rename {third_party/mojo/src/mojo => mojo}/public/java/system/src/org/chromium/mojo/system/Pair.java (100%) rename {third_party/mojo/src/mojo => mojo}/public/java/system/src/org/chromium/mojo/system/ResultAnd.java (100%) rename {third_party/mojo/src/mojo => mojo}/public/java/system/src/org/chromium/mojo/system/RunLoop.java (100%) rename {third_party/mojo/src/mojo => mojo}/public/java/system/src/org/chromium/mojo/system/SharedBufferHandle.java (100%) rename {third_party/mojo/src/mojo => mojo}/public/java/system/src/org/chromium/mojo/system/UntypedHandle.java (100%) rename {third_party/mojo/src/mojo => mojo}/public/js/BUILD.gn (100%) rename {third_party/mojo/src/mojo => mojo}/public/js/bindings.js (100%) rename {third_party/mojo/src/mojo => mojo}/public/js/buffer.js (100%) rename {third_party/mojo/src/mojo => mojo}/public/js/codec.js (100%) rename {third_party/mojo/src/mojo => mojo}/public/js/codec_unittests.js (100%) rename {third_party/mojo/src/mojo => mojo}/public/js/connection.js (100%) rename {third_party/mojo/src/mojo => mojo}/public/js/connector.js (100%) rename {third_party/mojo/src/mojo => mojo}/public/js/constants.cc (92%) rename {third_party/mojo/src/mojo => mojo}/public/js/constants.h (100%) rename {third_party/mojo/src/mojo => mojo}/public/js/core.js (100%) rename {third_party/mojo/src/mojo => mojo}/public/js/core_unittests.js (100%) rename {third_party/mojo/src/mojo => mojo}/public/js/router.js (100%) rename {third_party/mojo/src/mojo => mojo}/public/js/struct_unittests.js (100%) rename {third_party/mojo/src/mojo => mojo}/public/js/support.js (100%) rename {third_party/mojo/src/mojo => mojo}/public/js/test/validation_test_input_parser.js (100%) rename {third_party/mojo/src/mojo => mojo}/public/js/threading.js (100%) rename {third_party/mojo/src/mojo => mojo}/public/js/unicode.js (100%) rename {third_party/mojo/src/mojo => mojo}/public/js/union_unittests.js (100%) rename {third_party/mojo/src/mojo => mojo}/public/js/validation_unittests.js (100%) rename {third_party/mojo/src/mojo => mojo}/public/js/validator.js (100%) delete mode 100644 mojo/public/mojo.gni rename {third_party/mojo/src/mojo => mojo}/public/mojo_sdk.gni (78%) rename {third_party/mojo/src/mojo => mojo}/public/platform/nacl/BUILD.gn (100%) rename {third_party/mojo/src/mojo => mojo}/public/platform/nacl/DEPS (100%) rename {third_party/mojo/src/mojo => mojo}/public/platform/nacl/libmojo.cc (98%) rename {third_party/mojo/src/mojo => mojo}/public/platform/nacl/mojo_initial_handle.h (54%) rename {third_party/mojo/src/mojo => mojo}/public/platform/nacl/mojo_irt.h (89%) rename {third_party/mojo/src/mojo => mojo}/public/platform/nacl/mojo_main_thunk.cc (65%) rename {third_party/mojo/src/mojo => mojo}/public/platform/native/BUILD.gn (100%) rename {third_party/mojo/src/mojo => mojo}/public/platform/native/gles2_impl_chromium_extension_thunks.cc (78%) rename {third_party/mojo/src/mojo => mojo}/public/platform/native/gles2_impl_chromium_extension_thunks.h (69%) rename {third_party/mojo/src/mojo => mojo}/public/platform/native/gles2_impl_thunks.cc (77%) rename {third_party/mojo/src/mojo => mojo}/public/platform/native/gles2_impl_thunks.h (76%) rename {third_party/mojo/src/mojo => mojo}/public/platform/native/gles2_thunks.cc (92%) rename {third_party/mojo/src/mojo => mojo}/public/platform/native/gles2_thunks.h (89%) rename {third_party/mojo/src/mojo => mojo}/public/platform/native/mgl_onscreen_thunks.c (83%) rename {third_party/mojo/src/mojo => mojo}/public/platform/native/mgl_onscreen_thunks.h (83%) rename {third_party/mojo/src/mojo => mojo}/public/platform/native/mgl_thunks.c (90%) rename {third_party/mojo/src/mojo => mojo}/public/platform/native/mgl_thunks.h (87%) rename {third_party/mojo/src/mojo => mojo}/public/platform/native/system_thunks.cc (97%) rename {third_party/mojo/src/mojo => mojo}/public/platform/native/system_thunks.h (95%) rename {third_party/mojo/src/mojo => mojo}/public/platform/native/thunk_export.h (66%) rename {third_party/mojo/src/mojo => mojo}/public/tests/test_support_private.cc (96%) rename {third_party/mojo/src/mojo => mojo}/public/tests/test_support_private.h (76%) rename {third_party/mojo/src/mojo => mojo}/public/third_party/README.txt (100%) rename {third_party/mojo/src/mojo => mojo}/public/third_party/jinja2/AUTHORS (100%) rename {third_party/mojo/src/mojo => mojo}/public/third_party/jinja2/Jinja2-2.7.1.tar.gz.md5 (100%) rename {third_party/mojo/src/mojo => mojo}/public/third_party/jinja2/Jinja2-2.7.1.tar.gz.sha512 (100%) rename {third_party/mojo/src/mojo => mojo}/public/third_party/jinja2/LICENSE (100%) rename {third_party/mojo/src/mojo => mojo}/public/third_party/jinja2/OWNERS (100%) rename {third_party/mojo/src/mojo => mojo}/public/third_party/jinja2/README.chromium (100%) rename {third_party/mojo/src/mojo => mojo}/public/third_party/jinja2/__init__.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/third_party/jinja2/_compat.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/third_party/jinja2/_stringdefs.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/third_party/jinja2/bccache.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/third_party/jinja2/compiler.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/third_party/jinja2/constants.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/third_party/jinja2/debug.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/third_party/jinja2/defaults.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/third_party/jinja2/environment.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/third_party/jinja2/exceptions.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/third_party/jinja2/ext.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/third_party/jinja2/filters.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/third_party/jinja2/get_jinja2.sh (100%) rename {third_party/mojo/src/mojo => mojo}/public/third_party/jinja2/lexer.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/third_party/jinja2/loaders.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/third_party/jinja2/meta.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/third_party/jinja2/nodes.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/third_party/jinja2/optimizer.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/third_party/jinja2/parser.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/third_party/jinja2/runtime.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/third_party/jinja2/sandbox.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/third_party/jinja2/tests.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/third_party/jinja2/utils.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/third_party/jinja2/visitor.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/third_party/markupsafe/AUTHORS (100%) rename {third_party/mojo/src/mojo => mojo}/public/third_party/markupsafe/LICENSE (100%) rename {third_party/mojo/src/mojo => mojo}/public/third_party/markupsafe/MarkupSafe-0.18.tar.gz.md5 (100%) rename {third_party/mojo/src/mojo => mojo}/public/third_party/markupsafe/MarkupSafe-0.18.tar.gz.sha512 (100%) rename {third_party/mojo/src/mojo => mojo}/public/third_party/markupsafe/OWNERS (100%) rename {third_party/mojo/src/mojo => mojo}/public/third_party/markupsafe/README.chromium (100%) rename {third_party/mojo/src/mojo => mojo}/public/third_party/markupsafe/__init__.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/third_party/markupsafe/_compat.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/third_party/markupsafe/_constants.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/third_party/markupsafe/_native.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/third_party/markupsafe/_speedups.c (100%) rename {third_party/mojo/src/mojo => mojo}/public/third_party/markupsafe/get_markupsafe.sh (100%) rename {third_party/mojo/src/mojo => mojo}/public/third_party/ply/LICENSE (100%) rename {third_party/mojo/src/mojo => mojo}/public/third_party/ply/README (100%) rename {third_party/mojo/src/mojo => mojo}/public/third_party/ply/README.chromium (100%) rename {third_party/mojo/src/mojo => mojo}/public/third_party/ply/__init__.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/third_party/ply/lex.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/third_party/ply/license.patch (100%) rename {third_party/mojo/src/mojo => mojo}/public/third_party/ply/yacc.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/generators/cpp_templates/enum_macros.tmpl (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/generators/cpp_templates/interface_declaration.tmpl (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/generators/cpp_templates/interface_definition.tmpl (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/generators/cpp_templates/interface_macros.tmpl (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/generators/cpp_templates/interface_proxy_declaration.tmpl (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/generators/cpp_templates/interface_request_validator_declaration.tmpl (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/generators/cpp_templates/interface_response_validator_declaration.tmpl (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/generators/cpp_templates/interface_stub_declaration.tmpl (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/generators/cpp_templates/module-internal.h.tmpl (79%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/generators/cpp_templates/module.cc.tmpl (75%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/generators/cpp_templates/module.h.tmpl (79%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/generators/cpp_templates/struct_declaration.tmpl (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/generators/cpp_templates/struct_definition.tmpl (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/generators/cpp_templates/struct_macros.tmpl (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/generators/cpp_templates/struct_serialization_declaration.tmpl (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/generators/cpp_templates/struct_serialization_definition.tmpl (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/generators/cpp_templates/union_declaration.tmpl (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/generators/cpp_templates/union_definition.tmpl (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/generators/cpp_templates/union_serialization_declaration.tmpl (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/generators/cpp_templates/union_serialization_definition.tmpl (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/generators/cpp_templates/validation_macros.tmpl (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/generators/cpp_templates/wrapper_class_declaration.tmpl (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/generators/cpp_templates/wrapper_class_definition.tmpl (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/generators/cpp_templates/wrapper_union_class_declaration.tmpl (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/generators/cpp_templates/wrapper_union_class_definition.tmpl (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/generators/java_templates/constant_definition.tmpl (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/generators/java_templates/constants.java.tmpl (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/generators/java_templates/data_types_definition.tmpl (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/generators/java_templates/enum.java.tmpl (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/generators/java_templates/enum_definition.tmpl (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/generators/java_templates/header.java.tmpl (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/generators/java_templates/interface.java.tmpl (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/generators/java_templates/interface_definition.tmpl (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/generators/java_templates/interface_internal.java.tmpl (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/generators/java_templates/struct.java.tmpl (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/generators/java_templates/union.java.tmpl (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/generators/js_templates/enum_definition.tmpl (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/generators/js_templates/interface_definition.tmpl (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/generators/js_templates/module.amd.tmpl (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/generators/js_templates/module_definition.tmpl (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/generators/js_templates/struct_definition.tmpl (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/generators/js_templates/union_definition.tmpl (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/generators/js_templates/validation_macros.tmpl (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/generators/mojom_cpp_generator.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/generators/mojom_java_generator.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/generators/mojom_js_generator.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/generators/run_cpp_generator.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/mojom.gni (93%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/mojom_bindings_generator.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/mojom_bindings_generator_unittest.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/mojom_list_outputs.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/pylib/mojom/__init__.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/pylib/mojom/error.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/pylib/mojom/fileutil.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/pylib/mojom/generate/__init__.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/pylib/mojom/generate/constant_resolver.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/pylib/mojom/generate/data.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/pylib/mojom/generate/data_tests.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/pylib/mojom/generate/generator.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/pylib/mojom/generate/generator_unittest.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/pylib/mojom/generate/module.py (99%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/pylib/mojom/generate/module_tests.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/pylib/mojom/generate/pack.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/pylib/mojom/generate/pack_tests.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/pylib/mojom/generate/run_tests.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/pylib/mojom/generate/template_expander.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/pylib/mojom/generate/test_support.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/pylib/mojom/parse/__init__.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/pylib/mojom/parse/ast.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/pylib/mojom/parse/lexer.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/pylib/mojom/parse/parser.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/pylib/mojom/parse/translate.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/pylib/mojom_tests/__init__.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/pylib/mojom_tests/fileutil_unittest.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/pylib/mojom_tests/generate/__init__.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/pylib/mojom_tests/generate/data_unittest.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/pylib/mojom_tests/generate/generator_unittest.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/pylib/mojom_tests/generate/module_unittest.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/pylib/mojom_tests/generate/pack_unittest.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/pylib/mojom_tests/parse/__init__.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/pylib/mojom_tests/parse/ast_unittest.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/pylib/mojom_tests/parse/lexer_unittest.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/pylib/mojom_tests/parse/parser_unittest.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/pylib/mojom_tests/parse/run_parser.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/pylib/mojom_tests/parse/run_translate.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/pylib/mojom_tests/parse/translate_unittest.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/pylib/mojom_tests/support/__init__.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/pylib/mojom_tests/support/find_files.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/bindings/pylib/mojom_tests/support/run_bindings_generator.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/gn/zip.py (100%) rename {third_party/mojo/src/mojo => mojo}/public/tools/prepend.py (100%) create mode 100644 mojo/runner/shell_apptest.cc create mode 100644 mojo/runner/test/BUILD.gn delete mode 100644 third_party/mojo/src/mojo/public/.gitignore delete mode 100644 third_party/mojo/src/mojo/public/c/gpu/GLES2/gl2.h delete mode 100644 third_party/mojo/src/mojo/public/c/gpu/GLES2/gl2ext.h delete mode 100644 third_party/mojo/src/mojo/public/c/gpu/GLES2/gl2extmojo.h delete mode 100644 third_party/mojo/src/mojo/public/c/gpu/GLES2/gl2mojo.h delete mode 100644 third_party/mojo/src/mojo/public/c/gpu/GLES2/gl2mojo_autogen.h delete mode 100644 third_party/mojo/src/mojo/public/c/gpu/GLES2/gl2platform.h delete mode 100644 third_party/mojo/src/mojo/public/c/gpu/KHR/khrplatform.h delete mode 100644 third_party/mojo/src/mojo/public/c/system/core.h delete mode 100644 third_party/mojo/src/mojo/public/cpp/system/core.h delete mode 100644 third_party/mojo/src/mojo/public/mojo_application.gni diff --git a/.gitignore b/.gitignore index 3c43406931708e..efe521358fac5c 100644 --- a/.gitignore +++ b/.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 diff --git a/chrome/DEPS b/chrome/DEPS index c9bf84e684239b..f1c8af72ced925 100644 --- a/chrome/DEPS +++ b/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", diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn index 2eac38e9a9b1ce..f008f5135642b5 100644 --- a/chrome/browser/BUILD.gn +++ b/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", diff --git a/chrome/browser/chromeos/BUILD.gn b/chrome/browser/chromeos/BUILD.gn index 77d2809cb7f7af..5c5d3b88627952 100644 --- a/chrome/browser/chromeos/BUILD.gn +++ b/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", ] } diff --git a/chrome/browser/chromeos/attestation/platform_verification_impl.h b/chrome/browser/chromeos/attestation/platform_verification_impl.h index d30f0a2ad887bd..a284db634a433a 100644 --- a/chrome/browser/chromeos/attestation/platform_verification_impl.h +++ b/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 { diff --git a/chrome/browser/media/router/BUILD.gn b/chrome/browser/media/router/BUILD.gn index fe9a524f624aad..5fb15b031043f0 100644 --- a/chrome/browser/media/router/BUILD.gn +++ b/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, ".", diff --git a/chrome/browser/media/router/media_router_mojo_impl.h b/chrome/browser/media/router/media_router_mojo_impl.h index f2ce7c5ae395d1..3e958f1284effc 100644 --- a/chrome/browser/media/router/media_router_mojo_impl.h +++ b/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; diff --git a/chrome/browser/media/router/media_router_mojo_test.h b/chrome/browser/media/router/media_router_mojo_test.h index a51a1668c7d1a5..dba0250ac4be15 100644 --- a/chrome/browser/media/router/media_router_mojo_test.h +++ b/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 { diff --git a/chrome/browser/ui/webui/engagement/BUILD.gn b/chrome/browser/ui/webui/engagement/BUILD.gn index e565ebdb779cbe..a5533d9ab3fb11 100644 --- a/chrome/browser/ui/webui/engagement/BUILD.gn +++ b/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") { diff --git a/chrome/browser/ui/webui/engagement/site_engagement_ui.cc b/chrome/browser/ui/webui/engagement/site_engagement_ui.cc index d757c5765c3368..0ae81f98dea8ca 100644 --- a/chrome/browser/ui/webui/engagement/site_engagement_ui.cc +++ b/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 { diff --git a/chrome/browser/ui/webui/mojo_web_ui_controller.cc b/chrome/browser/ui/webui/mojo_web_ui_controller.cc index 65e40ae9465de8..286fcc1c4d9d8d 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 "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) { diff --git a/chrome/browser/ui/webui/mojo_web_ui_controller.h b/chrome/browser/ui/webui/mojo_web_ui_controller.h index e202525955e4ce..d29705ea62bebc 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 "third_party/mojo/src/mojo/public/cpp/system/core.h" +#include "mojo/public/cpp/system/core.h" class MojoWebUIHandler; diff --git a/chrome/browser/ui/webui/omnibox/BUILD.gn b/chrome/browser/ui/webui/omnibox/BUILD.gn index 21613cbd2e893c..a2815802ef6805 100644 --- a/chrome/browser/ui/webui/omnibox/BUILD.gn +++ b/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") { diff --git a/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.h b/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.h index a8e4ed7522eb97..4f9b66ac0ecf4b 100644 --- a/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.h +++ b/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; diff --git a/chrome/browser/usb/usb_tab_helper.h b/chrome/browser/usb/usb_tab_helper.h index d4cc97da01ce2c..c2bb342e7dc12a 100644 --- a/chrome/browser/usb/usb_tab_helper.h +++ b/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 { diff --git a/chrome/browser/usb/web_usb_permission_provider.h b/chrome/browser/usb/web_usb_permission_provider.h index 5f3558c99fb4ba..7dd995275dd6ec 100644 --- a/chrome/browser/usb/web_usb_permission_provider.h +++ b/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; diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn index 50a8661803e6b1..01e134cbb98f01 100644 --- a/chrome/common/BUILD.gn +++ b/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", ] } diff --git a/chrome/common/resource_usage_reporter_type_converters.h b/chrome/common/resource_usage_reporter_type_converters.h index 571a2e177a5d87..d73f7cc8c5f25c 100644 --- a/chrome/common/resource_usage_reporter_type_converters.h +++ b/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 { diff --git a/chrome/renderer/chrome_render_process_observer.cc b/chrome/renderer/chrome_render_process_observer.cc index f6455ff9ebdec8..22c1852e0f16a4 100644 --- a/chrome/renderer/chrome_render_process_observer.cc +++ b/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" diff --git a/chrome/utility/chrome_content_utility_client.cc b/chrome/utility/chrome_content_utility_client.cc index ee6c03660c75fd..043d2eee6e891f 100644 --- a/chrome/utility/chrome_content_utility_client.cc +++ b/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) diff --git a/components/bitmap_uploader/BUILD.gn b/components/bitmap_uploader/BUILD.gn index 75198b517138ef..4f48ee20f37dd0 100644 --- a/components/bitmap_uploader/BUILD.gn +++ b/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", ] } diff --git a/components/bitmap_uploader/DEPS b/components/bitmap_uploader/DEPS index 44c96281638552..8a0ec231bdbdca 100644 --- a/components/bitmap_uploader/DEPS +++ b/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", ] diff --git a/components/bitmap_uploader/bitmap_uploader.cc b/components/bitmap_uploader/bitmap_uploader.cc index c2f35d1cd915d3..f6525dafa84156 100644 --- a/components/bitmap_uploader/bitmap_uploader.cc +++ b/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 { diff --git a/components/bitmap_uploader/bitmap_uploader.h b/components/bitmap_uploader/bitmap_uploader.h index c843996cbefe9f..ccb4d7a7b54674 100644 --- a/components/bitmap_uploader/bitmap_uploader.h +++ b/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; diff --git a/components/clipboard/BUILD.gn b/components/clipboard/BUILD.gn index ea8ddfd934a2eb..fab02911656483 100644 --- a/components/clipboard/BUILD.gn +++ b/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", ] } diff --git a/components/clipboard/DEPS b/components/clipboard/DEPS index 6e68eac5051232..0ade4ce821d34e 100644 --- a/components/clipboard/DEPS +++ b/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", ] diff --git a/components/clipboard/clipboard_standalone_impl.cc b/components/clipboard/clipboard_standalone_impl.cc index 2cf03c295a209d..9f49d2d6b17ddc 100644 --- a/components/clipboard/clipboard_standalone_impl.cc +++ b/components/clipboard/clipboard_standalone_impl.cc @@ -6,9 +6,9 @@ #include -#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; diff --git a/components/clipboard/clipboard_standalone_impl.h b/components/clipboard/clipboard_standalone_impl.h index 218c96cb899b1a..f08fcd984a7478 100644 --- a/components/clipboard/clipboard_standalone_impl.h +++ b/components/clipboard/clipboard_standalone_impl.h @@ -9,7 +9,7 @@ #include #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 { diff --git a/components/clipboard/main.cc b/components/clipboard/main.cc index 59344965607812..ceafe5cdf740f4 100644 --- a/components/clipboard/main.cc +++ b/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); diff --git a/components/clipboard/public/interfaces/BUILD.gn b/components/clipboard/public/interfaces/BUILD.gn index 7bca33bdf9a748..443f5bfc2d1e42 100644 --- a/components/clipboard/public/interfaces/BUILD.gn +++ b/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 = [ diff --git a/components/data_reduction_proxy/content/browser/BUILD.gn b/components/data_reduction_proxy/content/browser/BUILD.gn index c618dd1e9213d7..9a2650b7614579 100644 --- a/components/data_reduction_proxy/content/browser/BUILD.gn +++ b/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", ] } } diff --git a/components/devtools_service/BUILD.gn b/components/devtools_service/BUILD.gn index 67eccf52d118dc..9c78abb65dcbed 100644 --- a/components/devtools_service/BUILD.gn +++ b/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", ] } diff --git a/components/devtools_service/DEPS b/components/devtools_service/DEPS index 98969e399b181a..0ccf7fc9e6e46b 100644 --- a/components/devtools_service/DEPS +++ b/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", ] diff --git a/components/devtools_service/devtools_agent_host.h b/components/devtools_service/devtools_agent_host.h index 131307a9e7e525..e5b782db59a0d2 100644 --- a/components/devtools_service/devtools_agent_host.h +++ b/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 { diff --git a/components/devtools_service/devtools_http_server.cc b/components/devtools_service/devtools_http_server.cc index 0c7dcbbc075168..6ae3a340113f68 100644 --- a/components/devtools_service/devtools_http_server.cc +++ b/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 { diff --git a/components/devtools_service/devtools_http_server.h b/components/devtools_service/devtools_http_server.h index 6906db689ff86c..b993bb3966fe39 100644 --- a/components/devtools_service/devtools_http_server.h +++ b/components/devtools_service/devtools_http_server.h @@ -9,10 +9,10 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" +#include "mojo/public/cpp/bindings/binding.h" #include "mojo/services/network/public/interfaces/http_connection.mojom.h" #include "mojo/services/network/public/interfaces/http_message.mojom.h" #include "mojo/services/network/public/interfaces/http_server.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" namespace devtools_service { diff --git a/components/devtools_service/main.cc b/components/devtools_service/main.cc index c1198ed88a7005..b8f99f85f5176d 100644 --- a/components/devtools_service/main.cc +++ b/components/devtools_service/main.cc @@ -4,7 +4,7 @@ #include "components/devtools_service/devtools_service_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 devtools_service::DevToolsServiceDelegate); diff --git a/components/devtools_service/public/interfaces/BUILD.gn b/components/devtools_service/public/interfaces/BUILD.gn index 3b54773836124c..f3dd804ca4b44f 100644 --- a/components/devtools_service/public/interfaces/BUILD.gn +++ b/components/devtools_service/public/interfaces/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") +import("//mojo/public/tools/bindings/mojom.gni") mojom("interfaces") { sources = [ diff --git a/components/dom_distiller/content/BUILD.gn b/components/dom_distiller/content/BUILD.gn index d0131bf83ad9af..f9cce20f20bc41 100644 --- a/components/dom_distiller/content/BUILD.gn +++ b/components/dom_distiller/content/BUILD.gn @@ -4,7 +4,7 @@ assert(!is_ios) -import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") +import("//mojo/public/tools/bindings/mojom.gni") # GYP version: components/dom_distiller.gypi:dom_distiller_mojo_bindings mojom("mojo_bindings") { @@ -44,10 +44,10 @@ static_library("content_browser") { "//content/public/browser", "//content/public/common", "//mojo/environment:chromium", + "//mojo/public/cpp/bindings", "//net", "//skia", "//sync", - "//third_party/mojo/src/mojo/public/cpp/bindings", "//third_party/WebKit/public:blink_headers", "//ui/base", "//ui/gfx", @@ -81,7 +81,7 @@ static_library("content_renderer") { "//content/public/renderer", "//gin", "//mojo/environment:chromium", - "//third_party/mojo/src/mojo/public/cpp/bindings", + "//mojo/public/cpp/bindings", "//third_party/WebKit/public:blink_headers", "//v8", ] diff --git a/components/dom_distiller/content/browser/DEPS b/components/dom_distiller/content/browser/DEPS index 5f8633a1fb6ad1..ef8ad28d9d44b3 100644 --- a/components/dom_distiller/content/browser/DEPS +++ b/components/dom_distiller/content/browser/DEPS @@ -1,3 +1,3 @@ include_rules = [ - "+third_party/mojo/src/mojo/public", + "+mojo/public", ] diff --git a/components/dom_distiller/content/browser/distiller_javascript_service_impl.cc b/components/dom_distiller/content/browser/distiller_javascript_service_impl.cc index e60e3e299a4a2e..e923d2a70b0e0c 100644 --- a/components/dom_distiller/content/browser/distiller_javascript_service_impl.cc +++ b/components/dom_distiller/content/browser/distiller_javascript_service_impl.cc @@ -6,7 +6,7 @@ #include "components/dom_distiller/content/browser/distiller_ui_handle.h" #include "components/dom_distiller/core/feedback_reporter.h" #include "content/public/browser/user_metrics.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/string.h" +#include "mojo/public/cpp/bindings/string.h" namespace dom_distiller { diff --git a/components/dom_distiller/content/browser/distiller_javascript_service_impl.h b/components/dom_distiller/content/browser/distiller_javascript_service_impl.h index d1ffe1018b0991..9c940ecf0d38bd 100644 --- a/components/dom_distiller/content/browser/distiller_javascript_service_impl.h +++ b/components/dom_distiller/content/browser/distiller_javascript_service_impl.h @@ -7,8 +7,8 @@ #include "components/dom_distiller/content/browser/distiller_ui_handle.h" #include "components/dom_distiller/content/common/distiller_javascript_service.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/string.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" +#include "mojo/public/cpp/bindings/string.h" +#include "mojo/public/cpp/bindings/strong_binding.h" namespace dom_distiller { diff --git a/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc b/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc index 65a327dc8a3567..cc315e9bb95a4e 100644 --- a/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc +++ b/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc @@ -35,9 +35,9 @@ #include "content/public/browser/web_contents_observer.h" #include "content/public/common/service_registry.h" #include "grit/components_strings.h" +#include "mojo/public/cpp/bindings/strong_binding.h" #include "net/base/url_util.h" #include "net/url_request/url_request.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" #include "ui/base/l10n/l10n_util.h" namespace dom_distiller { diff --git a/components/dom_distiller/content/renderer/DEPS b/components/dom_distiller/content/renderer/DEPS index 4a955e41b72f3e..87b3be07741162 100644 --- a/components/dom_distiller/content/renderer/DEPS +++ b/components/dom_distiller/content/renderer/DEPS @@ -1,6 +1,6 @@ include_rules = [ "+gin", + "+mojo/public", "+third_party/WebKit/public", - "+third_party/mojo/src/mojo/public", "+v8/include", ] diff --git a/components/dom_distiller/content/renderer/distiller_page_notifier_service_impl.h b/components/dom_distiller/content/renderer/distiller_page_notifier_service_impl.h index be1cca157eb0e2..35eebb0e557d94 100644 --- a/components/dom_distiller/content/renderer/distiller_page_notifier_service_impl.h +++ b/components/dom_distiller/content/renderer/distiller_page_notifier_service_impl.h @@ -8,7 +8,7 @@ #include "components/dom_distiller/content/common/distiller_page_notifier_service.mojom.h" #include "components/dom_distiller/content/renderer/distiller_js_render_frame_observer.h" #include "components/dom_distiller/content/renderer/distiller_native_javascript.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" +#include "mojo/public/cpp/bindings/strong_binding.h" namespace dom_distiller { diff --git a/components/filesystem/BUILD.gn b/components/filesystem/BUILD.gn index 3159f2fd1f4d3c..47782a6f68a4ef 100644 --- a/components/filesystem/BUILD.gn +++ b/components/filesystem/BUILD.gn @@ -41,8 +41,8 @@ mojo_native_application("filesystem") { "//mojo/common", "//mojo/environment:chromium", "//mojo/platform_handle:for_shared_library", - "//third_party/mojo/src/mojo/public/cpp/bindings", - "//third_party/mojo/src/mojo/public/cpp/system", + "//mojo/public/cpp/bindings", + "//mojo/public/cpp/system", ] } @@ -63,7 +63,7 @@ mojo_native_application("apptests") { "//components/filesystem/public/interfaces", "//mojo/application/public/cpp:test_support", "//mojo/platform_handle:for_shared_library", - "//third_party/mojo/src/mojo/public/cpp/bindings", + "//mojo/public/cpp/bindings", ] data_deps = [ diff --git a/components/filesystem/DEPS b/components/filesystem/DEPS index 42df3f2fd629db..b3412d062246a7 100644 --- a/components/filesystem/DEPS +++ b/components/filesystem/DEPS @@ -3,5 +3,4 @@ include_rules = [ "+mojo/platform_handle", "+mojo/public", "+mojo/util", - "+third_party/mojo/src/mojo/public", ] diff --git a/components/filesystem/directory_impl.h b/components/filesystem/directory_impl.h index 0d1e008fc6d2a7..b016b8395815cf 100644 --- a/components/filesystem/directory_impl.h +++ b/components/filesystem/directory_impl.h @@ -10,8 +10,8 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "components/filesystem/public/interfaces/directory.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" +#include "mojo/public/cpp/bindings/interface_request.h" +#include "mojo/public/cpp/bindings/strong_binding.h" namespace base { class ScopedTempDir; diff --git a/components/filesystem/file_impl.h b/components/filesystem/file_impl.h index 78bc5213822784..0ca3501e6b2b30 100644 --- a/components/filesystem/file_impl.h +++ b/components/filesystem/file_impl.h @@ -9,8 +9,8 @@ #include "base/files/scoped_file.h" #include "base/macros.h" #include "components/filesystem/public/interfaces/directory.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" +#include "mojo/public/cpp/bindings/interface_request.h" +#include "mojo/public/cpp/bindings/strong_binding.h" namespace base { class FilePath; diff --git a/components/filesystem/file_impl_unittest.cc b/components/filesystem/file_impl_unittest.cc index 744befaab442a6..86ec3edac8afa4 100644 --- a/components/filesystem/file_impl_unittest.cc +++ b/components/filesystem/file_impl_unittest.cc @@ -7,9 +7,9 @@ #include "base/files/file.h" #include "components/filesystem/files_test_base.h" #include "mojo/platform_handle/platform_handle_functions.h" +#include "mojo/public/cpp/bindings/interface_request.h" +#include "mojo/public/cpp/bindings/type_converter.h" #include "mojo/util/capture_util.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/type_converter.h" using mojo::Capture; diff --git a/components/filesystem/file_system_impl.h b/components/filesystem/file_system_impl.h index 1ebbfed2f71a3c..2cda44d555830d 100644 --- a/components/filesystem/file_system_impl.h +++ b/components/filesystem/file_system_impl.h @@ -7,8 +7,8 @@ #include "base/macros.h" #include "components/filesystem/public/interfaces/file_system.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" +#include "mojo/public/cpp/bindings/interface_request.h" +#include "mojo/public/cpp/bindings/strong_binding.h" namespace base { class FilePath; diff --git a/components/filesystem/files_test_base.h b/components/filesystem/files_test_base.h index 6cf11f00d566de..43ffccfa1e3726 100644 --- a/components/filesystem/files_test_base.h +++ b/components/filesystem/files_test_base.h @@ -8,7 +8,7 @@ #include "base/macros.h" #include "components/filesystem/public/interfaces/file_system.mojom.h" #include "mojo/application/public/cpp/application_test_base.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" +#include "mojo/public/cpp/bindings/binding.h" namespace filesystem { diff --git a/components/filesystem/main.cc b/components/filesystem/main.cc index 764f3f3a276ef3..6e25653fbd8d13 100644 --- a/components/filesystem/main.cc +++ b/components/filesystem/main.cc @@ -5,7 +5,7 @@ #include "base/macros.h" #include "components/filesystem/file_system_app.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 application_request) { mojo::ApplicationRunner runner(new filesystem::FileSystemApp()); diff --git a/components/filesystem/public/interfaces/BUILD.gn b/components/filesystem/public/interfaces/BUILD.gn index 139ef495fab620..a1ef7b675749b0 100644 --- a/components/filesystem/public/interfaces/BUILD.gn +++ b/components/filesystem/public/interfaces/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") +import("//mojo/public/tools/bindings/mojom.gni") mojom("interfaces") { sources = [ diff --git a/components/filesystem/util.cc b/components/filesystem/util.cc index 199a1c194846a3..257d0083dd8502 100644 --- a/components/filesystem/util.cc +++ b/components/filesystem/util.cc @@ -13,7 +13,7 @@ #include "base/logging.h" #include "base/strings/string_util.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/string.h" +#include "mojo/public/cpp/bindings/string.h" #if defined(OS_WIN) #include "base/strings/utf_string_conversions.h" diff --git a/components/font_service/BUILD.gn b/components/font_service/BUILD.gn index 11a37a3e6c3aee..2ef51239ce6d55 100644 --- a/components/font_service/BUILD.gn +++ b/components/font_service/BUILD.gn @@ -16,7 +16,7 @@ source_set("lib") { "//mojo/application/public/cpp", "//mojo/common:common_base", "//mojo/platform_handle", - "//third_party/mojo/src/mojo/public/cpp/bindings", + "//mojo/public/cpp/bindings", ] public_deps = [ @@ -35,6 +35,6 @@ mojo_native_application("font_service") { "//mojo/application/public/cpp", "//mojo/common", "//mojo/common:common_base", - "//third_party/mojo/src/mojo/public/cpp/bindings:callback", + "//mojo/public/cpp/bindings:callback", ] } diff --git a/components/font_service/DEPS b/components/font_service/DEPS index 45a4deeb46406b..ef585a920a67b0 100644 --- a/components/font_service/DEPS +++ b/components/font_service/DEPS @@ -3,7 +3,7 @@ include_rules = [ "+mojo/common", "+mojo/message_pump", "+mojo/platform_handle", + "+mojo/public", "+skia", - "+third_party/mojo/src/mojo/public", "+third_party/skia/include", ] diff --git a/components/font_service/main.cc b/components/font_service/main.cc index 9b234e6a51b5cf..983c07d5c03f13 100644 --- a/components/font_service/main.cc +++ b/components/font_service/main.cc @@ -4,7 +4,7 @@ #include "components/font_service/font_service_app.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 font_service::FontServiceApp); diff --git a/components/font_service/public/cpp/BUILD.gn b/components/font_service/public/cpp/BUILD.gn index 52359b719921bb..0047d49459d4cb 100644 --- a/components/font_service/public/cpp/BUILD.gn +++ b/components/font_service/public/cpp/BUILD.gn @@ -20,8 +20,8 @@ source_set("cpp") { "//mojo/common", "//mojo/message_pump", "//mojo/platform_handle", + "//mojo/public/cpp/bindings", + "//mojo/public/cpp/system", "//skia", - "//third_party/mojo/src/mojo/public/cpp/bindings", - "//third_party/mojo/src/mojo/public/cpp/system", ] } diff --git a/components/font_service/public/interfaces/BUILD.gn b/components/font_service/public/interfaces/BUILD.gn index db1a2dd888bc9b..e60d556129cfb1 100644 --- a/components/font_service/public/interfaces/BUILD.gn +++ b/components/font_service/public/interfaces/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") +import("//mojo/public/tools/bindings/mojom.gni") mojom("interfaces") { sources = [ diff --git a/components/gpu/public/interfaces/BUILD.gn b/components/gpu/public/interfaces/BUILD.gn index e4cc3f92cf1afb..7fb2254a7a7165 100644 --- a/components/gpu/public/interfaces/BUILD.gn +++ b/components/gpu/public/interfaces/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") +import("//mojo/public/tools/bindings/mojom.gni") mojom("interfaces") { sources = [ diff --git a/components/html_viewer/BUILD.gn b/components/html_viewer/BUILD.gn index 876a79db544e2b..acbcbe9ef849d9 100644 --- a/components/html_viewer/BUILD.gn +++ b/components/html_viewer/BUILD.gn @@ -183,13 +183,13 @@ source_set("lib") { "//mojo/logging", "//mojo/message_pump", "//mojo/platform_handle", + "//mojo/public/cpp/environment:environment", "//mojo/services/network/public/cpp", "//mojo/services/network/public/interfaces", "//mojo/services/tracing/public/cpp", "//mojo/services/tracing/public/interfaces", "//net", "//skia", - "//third_party/mojo/src/mojo/public/cpp/environment:environment", "//third_party/mojo_services/src/accessibility/public/interfaces", "//third_party/WebKit/public:image_resources", "//third_party/WebKit/public:resources", @@ -210,8 +210,8 @@ source_set("lib") { public_deps = [ "//components/mus/public/cpp", + "//mojo/public/cpp/bindings", "//third_party/WebKit/public:blink", - "//third_party/mojo/src/mojo/public/cpp/bindings", ] if (is_win) { @@ -273,9 +273,9 @@ mojo_native_application("layout_test_html_viewer") { "//components/test_runner", "//components/web_view/test_runner/public/interfaces", "//mojo/application/public/cpp:sources", + "//mojo/public/c/system:for_shared_library", "//third_party/WebKit/public:blink", "//third_party/WebKit/public:test_support", - "//third_party/mojo/src/mojo/public/c/system:for_shared_library", "//ui/base", "//url", ] @@ -367,10 +367,10 @@ mojo_native_application("apptests") { "//components/web_view/public/interfaces", "//mojo/application/public/cpp:sources", "//mojo/application/public/cpp:test_support", + "//mojo/public/c/system:for_shared_library", "//net:test_support", "//testing/gtest", "//third_party/mojo_services/src/accessibility/public/interfaces", - "//third_party/mojo/src/mojo/public/c/system:for_shared_library", ] data_deps = [ diff --git a/components/html_viewer/DEPS b/components/html_viewer/DEPS index 3ba0df90ab4203..b41027c3ec7108 100644 --- a/components/html_viewer/DEPS +++ b/components/html_viewer/DEPS @@ -39,7 +39,6 @@ include_rules = [ "+net/test/spawned_test_server", "+skia", "+third_party/WebKit/public", - "+third_party/mojo/src/mojo/public", "+third_party/mojo_services/src", "+third_party/skia/include", "+ui/base", diff --git a/components/html_viewer/ax_provider_impl.h b/components/html_viewer/ax_provider_impl.h index 18634cc82ddfbe..742251747df723 100644 --- a/components/html_viewer/ax_provider_impl.h +++ b/components/html_viewer/ax_provider_impl.h @@ -6,7 +6,7 @@ #define COMPONENTS_HTML_VIEWER_AX_PROVIDER_IMPL_H_ #include "base/basictypes.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" +#include "mojo/public/cpp/bindings/binding.h" #include "third_party/mojo_services/src/accessibility/public/interfaces/accessibility.mojom.h" namespace blink { diff --git a/components/html_viewer/blink_basic_type_converters.cc b/components/html_viewer/blink_basic_type_converters.cc index 70a9b8a04bac21..bcdbd26375d2bd 100644 --- a/components/html_viewer/blink_basic_type_converters.cc +++ b/components/html_viewer/blink_basic_type_converters.cc @@ -4,9 +4,9 @@ #include "components/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/components/html_viewer/blink_basic_type_converters.h b/components/html_viewer/blink_basic_type_converters.h index 2ccf7f6f4eae42..226665e56d95c7 100644 --- a/components/html_viewer/blink_basic_type_converters.h +++ b/components/html_viewer/blink_basic_type_converters.h @@ -5,10 +5,10 @@ #ifndef COMPONENTS_HTML_VIEWER_BLINK_BASIC_TYPE_CONVERTERS_H_ #define COMPONENTS_HTML_VIEWER_BLINK_BASIC_TYPE_CONVERTERS_H_ -#include "third_party/mojo/src/mojo/public/cpp/bindings/type_converter.h" +#include "mojo/public/cpp/bindings/type_converter.h" +#include "mojo/public/cpp/bindings/array.h" #include "third_party/WebKit/public/platform/WebVector.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/array.h" #include "ui/mojo/geometry/geometry.mojom.h" namespace blink { diff --git a/components/html_viewer/blink_find_type_converters.h b/components/html_viewer/blink_find_type_converters.h index cd20e140868d8b..6dca2e1319c51b 100644 --- a/components/html_viewer/blink_find_type_converters.h +++ b/components/html_viewer/blink_find_type_converters.h @@ -6,8 +6,8 @@ #define COMPONENTS_HTML_VIEWER_BLINK_FIND_TYPE_CONVERTERS_H_ #include "components/web_view/public/interfaces/frame.mojom.h" +#include "mojo/public/cpp/bindings/type_converter.h" #include "third_party/WebKit/public/web/WebFindOptions.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/type_converter.h" namespace mojo { diff --git a/components/html_viewer/blink_text_input_type_converters.h b/components/html_viewer/blink_text_input_type_converters.h index b116970bbc769c..6bb35e97f97df5 100644 --- a/components/html_viewer/blink_text_input_type_converters.h +++ b/components/html_viewer/blink_text_input_type_converters.h @@ -5,7 +5,7 @@ #ifndef COMPONENTS_HTML_VIEWER_BLINK_TEXT_INPUT_TYPE_CONVERTERS_H_ #define COMPONENTS_HTML_VIEWER_BLINK_TEXT_INPUT_TYPE_CONVERTERS_H_ -#include "third_party/mojo/src/mojo/public/cpp/bindings/type_converter.h" +#include "mojo/public/cpp/bindings/type_converter.h" #include "third_party/WebKit/public/web/WebTextInputType.h" #include "ui/mojo/ime/text_input_state.mojom.h" diff --git a/components/html_viewer/blink_url_request_type_converters.cc b/components/html_viewer/blink_url_request_type_converters.cc index 339db95c79c6ce..6e4a521071e6af 100644 --- a/components/html_viewer/blink_url_request_type_converters.cc +++ b/components/html_viewer/blink_url_request_type_converters.cc @@ -5,9 +5,9 @@ #include "components/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/components/html_viewer/content_handler_impl.h b/components/html_viewer/content_handler_impl.h index 0f0d27b63e9d1c..50a48d793ef3b8 100644 --- a/components/html_viewer/content_handler_impl.h +++ b/components/html_viewer/content_handler_impl.h @@ -8,7 +8,7 @@ #include "base/macros.h" #include "mojo/application/public/cpp/application_impl.h" #include "mojo/application/public/interfaces/content_handler.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" +#include "mojo/public/cpp/bindings/strong_binding.h" namespace html_viewer { diff --git a/components/html_viewer/devtools_agent_impl.h b/components/html_viewer/devtools_agent_impl.h index f062b31de5e5ea..85da5fd476cae6 100644 --- a/components/html_viewer/devtools_agent_impl.h +++ b/components/html_viewer/devtools_agent_impl.h @@ -10,8 +10,8 @@ #include "base/macros.h" #include "components/devtools_service/public/interfaces/devtools_service.mojom.h" +#include "mojo/public/cpp/bindings/binding.h" #include "third_party/WebKit/public/web/WebDevToolsAgentClient.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" namespace blink { class WebLocalFrame; diff --git a/components/html_viewer/document_resource_waiter.h b/components/html_viewer/document_resource_waiter.h index af773af2809819..97304fe0400dd3 100644 --- a/components/html_viewer/document_resource_waiter.h +++ b/components/html_viewer/document_resource_waiter.h @@ -10,8 +10,8 @@ #include "components/html_viewer/html_frame_tree_manager_observer.h" #include "components/mus/public/cpp/window_observer.h" #include "components/web_view/public/interfaces/frame.mojom.h" +#include "mojo/public/cpp/bindings/binding.h" #include "mojo/services/network/public/interfaces/url_loader.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" namespace html_viewer { diff --git a/components/html_viewer/html_document.cc b/components/html_viewer/html_document.cc index 4ac66f9cd55306..8eba30517a7fe3 100644 --- a/components/html_viewer/html_document.cc +++ b/components/html_viewer/html_document.cc @@ -26,8 +26,8 @@ #include "mojo/application/public/cpp/connect.h" #include "mojo/application/public/interfaces/shell.mojom.h" #include "mojo/converters/geometry/geometry_type_converters.h" +#include "mojo/public/cpp/system/data_pipe.h" #include "third_party/WebKit/public/web/WebLocalFrame.h" -#include "third_party/mojo/src/mojo/public/cpp/system/data_pipe.h" #include "ui/gfx/geometry/dip_util.h" #include "ui/gfx/geometry/size.h" diff --git a/components/html_viewer/html_document_application_delegate.h b/components/html_viewer/html_document_application_delegate.h index 8347fb34f29d37..6a1676ee9c9f1f 100644 --- a/components/html_viewer/html_document_application_delegate.h +++ b/components/html_viewer/html_document_application_delegate.h @@ -13,8 +13,8 @@ #include "components/html_viewer/html_factory.h" #include "mojo/application/public/cpp/application_delegate.h" #include "mojo/application/public/cpp/application_impl.h" +#include "mojo/public/cpp/bindings/interface_request.h" #include "mojo/services/network/public/interfaces/url_loader_factory.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h" namespace html_viewer { diff --git a/components/html_viewer/html_frame.cc b/components/html_viewer/html_frame.cc index 1914585a62c0a7..7f7af61c4cbdae 100644 --- a/components/html_viewer/html_frame.cc +++ b/components/html_viewer/html_frame.cc @@ -43,6 +43,7 @@ #include "mojo/application/public/interfaces/shell.mojom.h" #include "mojo/common/common_type_converters.h" #include "mojo/converters/geometry/geometry_type_converters.h" +#include "mojo/public/cpp/system/data_pipe.h" #include "skia/ext/refptr.h" #include "third_party/WebKit/public/platform/Platform.h" #include "third_party/WebKit/public/platform/WebHTTPHeaderVisitor.h" @@ -61,7 +62,6 @@ #include "third_party/WebKit/public/web/WebRemoteFrameClient.h" #include "third_party/WebKit/public/web/WebScriptSource.h" #include "third_party/WebKit/public/web/WebView.h" -#include "third_party/mojo/src/mojo/public/cpp/system/data_pipe.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/components/html_viewer/html_frame.h b/components/html_viewer/html_frame.h index 16d9f557f52ccb..34e33e3d5bc655 100644 --- a/components/html_viewer/html_frame.h +++ b/components/html_viewer/html_frame.h @@ -15,13 +15,13 @@ #include "components/html_viewer/replicated_frame_state.h" #include "components/mus/public/cpp/window_observer.h" #include "components/web_view/public/interfaces/frame.mojom.h" +#include "mojo/public/cpp/bindings/binding.h" #include "mojo/services/tracing/public/interfaces/tracing.mojom.h" #include "third_party/WebKit/public/platform/WebURLRequest.h" #include "third_party/WebKit/public/web/WebFrameClient.h" #include "third_party/WebKit/public/web/WebRemoteFrameClient.h" #include "third_party/WebKit/public/web/WebSandboxFlags.h" #include "third_party/WebKit/public/web/WebTextInputInfo.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" namespace cc_blink { class WebLayerImpl; diff --git a/components/html_viewer/html_frame_properties.h b/components/html_viewer/html_frame_properties.h index 8944d463665466..7da4743bd66a61 100644 --- a/components/html_viewer/html_frame_properties.h +++ b/components/html_viewer/html_frame_properties.h @@ -5,9 +5,9 @@ #ifndef COMPONENTS_HTML_VIEWER_HTML_FRAME_PROPERTIES_H_ #define COMPONENTS_HTML_VIEWER_HTML_FRAME_PROPERTIES_H_ -#include "third_party/mojo/src/mojo/public/cpp/bindings/array.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/map.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/string.h" +#include "mojo/public/cpp/bindings/array.h" +#include "mojo/public/cpp/bindings/map.h" +#include "mojo/public/cpp/bindings/string.h" namespace blink { class WebFrame; diff --git a/components/html_viewer/html_viewer_main.cc b/components/html_viewer/html_viewer_main.cc index 9afd58da590cdf..c256530a902b31 100644 --- a/components/html_viewer/html_viewer_main.cc +++ b/components/html_viewer/html_viewer_main.cc @@ -4,7 +4,7 @@ #include "components/html_viewer/html_viewer.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 html_viewer::HTMLViewer); diff --git a/components/html_viewer/layout_test_html_viewer_main.cc b/components/html_viewer/layout_test_html_viewer_main.cc index 7a20ce6bb42e79..08186ce9cdf38f 100644 --- a/components/html_viewer/layout_test_html_viewer_main.cc +++ b/components/html_viewer/layout_test_html_viewer_main.cc @@ -4,7 +4,7 @@ #include "components/html_viewer/layout_test_html_viewer.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 html_viewer::LayoutTestHTMLViewer); diff --git a/components/html_viewer/public/interfaces/BUILD.gn b/components/html_viewer/public/interfaces/BUILD.gn index 504c1038fcd461..7dc12aa7825b95 100644 --- a/components/html_viewer/public/interfaces/BUILD.gn +++ b/components/html_viewer/public/interfaces/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") +import("//mojo/public/tools/bindings/mojom.gni") mojom("interfaces") { sources = [ diff --git a/components/html_viewer/replicated_frame_state.h b/components/html_viewer/replicated_frame_state.h index eedc59cc8a678b..bda862a23a0750 100644 --- a/components/html_viewer/replicated_frame_state.h +++ b/components/html_viewer/replicated_frame_state.h @@ -5,12 +5,12 @@ #ifndef COMPONENTS_HTML_VIEWER_REPLICATED_FRAME_STATE_H_ #define COMPONENTS_HTML_VIEWER_REPLICATED_FRAME_STATE_H_ +#include "mojo/public/cpp/bindings/array.h" +#include "mojo/public/cpp/bindings/map.h" +#include "mojo/public/cpp/bindings/string.h" #include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/public/web/WebSandboxFlags.h" #include "third_party/WebKit/public/web/WebTreeScopeType.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/array.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/map.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/string.h" #include "url/origin.h" namespace html_viewer { diff --git a/components/html_viewer/test_html_viewer_impl.h b/components/html_viewer/test_html_viewer_impl.h index 980101b6de7032..010b7991b9e9f8 100644 --- a/components/html_viewer/test_html_viewer_impl.h +++ b/components/html_viewer/test_html_viewer_impl.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "components/html_viewer/public/interfaces/test_html_viewer.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" +#include "mojo/public/cpp/bindings/binding.h" namespace blink { class WebLocalFrame; diff --git a/components/html_viewer/web_graphics_context_3d_command_buffer_impl.cc b/components/html_viewer/web_graphics_context_3d_command_buffer_impl.cc index f03ca43e32ae7c..a99b9c82913df8 100644 --- a/components/html_viewer/web_graphics_context_3d_command_buffer_impl.cc +++ b/components/html_viewer/web_graphics_context_3d_command_buffer_impl.cc @@ -12,8 +12,8 @@ #include "mojo/application/public/cpp/application_impl.h" #include "mojo/gles2/gles2_context.h" #include "mojo/gpu/mojo_gles2_impl_autogen.h" -#include "third_party/mojo/src/mojo/public/cpp/environment/environment.h" -#include "third_party/mojo/src/mojo/public/cpp/system/message_pipe.h" +#include "mojo/public/cpp/environment/environment.h" +#include "mojo/public/cpp/system/message_pipe.h" namespace html_viewer { diff --git a/components/html_viewer/web_graphics_context_3d_command_buffer_impl.h b/components/html_viewer/web_graphics_context_3d_command_buffer_impl.h index f1358fb600a3f0..37076df0b4d085 100644 --- a/components/html_viewer/web_graphics_context_3d_command_buffer_impl.h +++ b/components/html_viewer/web_graphics_context_3d_command_buffer_impl.h @@ -8,10 +8,10 @@ #include "base/macros.h" #include "components/mus/public/interfaces/command_buffer.mojom.h" #include "gpu/blink/webgraphicscontext3d_impl.h" +#include "mojo/public/c/gles2/gles2.h" +#include "mojo/public/cpp/system/core.h" #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h" #include "third_party/WebKit/public/platform/WebString.h" -#include "third_party/mojo/src/mojo/public/c/gles2/gles2.h" -#include "third_party/mojo/src/mojo/public/cpp/system/core.h" #include "url/gurl.h" namespace mojo { diff --git a/components/html_viewer/web_layer_tree_view_impl.cc b/components/html_viewer/web_layer_tree_view_impl.cc index 92e10b6e055f80..c379bc9bcea62a 100644 --- a/components/html_viewer/web_layer_tree_view_impl.cc +++ b/components/html_viewer/web_layer_tree_view_impl.cc @@ -14,8 +14,8 @@ #include "components/mus/public/cpp/output_surface.h" #include "components/mus/public/cpp/window.h" #include "mojo/converters/surfaces/surfaces_type_converters.h" +#include "mojo/public/c/gles2/gles2.h" #include "third_party/WebKit/public/web/WebWidget.h" -#include "third_party/mojo/src/mojo/public/c/gles2/gles2.h" #include "ui/gfx/buffer_types.h" namespace html_viewer { diff --git a/components/html_viewer/web_socket_handle_impl.cc b/components/html_viewer/web_socket_handle_impl.cc index ef08b04cce3b99..969b7f366ecd75 100644 --- a/components/html_viewer/web_socket_handle_impl.cc +++ b/components/html_viewer/web_socket_handle_impl.cc @@ -9,6 +9,7 @@ #include "base/bind.h" #include "base/macros.h" #include "components/html_viewer/blink_basic_type_converters.h" +#include "mojo/public/cpp/bindings/binding.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/web_socket_factory.mojom.h" @@ -17,7 +18,6 @@ #include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/public/platform/WebURL.h" #include "third_party/WebKit/public/platform/WebVector.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" using blink::WebSecurityOrigin; using blink::WebSocketHandle; diff --git a/components/message_port/BUILD.gn b/components/message_port/BUILD.gn index 63c7da170cb0ef..7cdcb5d2e4e4e8 100644 --- a/components/message_port/BUILD.gn +++ b/components/message_port/BUILD.gn @@ -11,7 +11,7 @@ source_set("message_port") { public_deps = [ "//base", "//mojo/message_pump", + "//mojo/public/cpp/system", "//third_party/WebKit/public:blink", - "//third_party/mojo/src/mojo/public/cpp/system", ] } diff --git a/components/message_port/DEPS b/components/message_port/DEPS index 3fdf5e6bf5c341..ab2f2735f10eaf 100644 --- a/components/message_port/DEPS +++ b/components/message_port/DEPS @@ -1,5 +1,5 @@ include_rules = [ "+mojo/message_pump", + "+mojo/public/cpp/system", "+third_party/WebKit/public", - "+third_party/mojo/src/mojo/public/cpp/system", ] diff --git a/components/message_port/web_message_port_channel_impl.cc b/components/message_port/web_message_port_channel_impl.cc index db30963b1e5aba..4b9594d5ce4543 100644 --- a/components/message_port/web_message_port_channel_impl.cc +++ b/components/message_port/web_message_port_channel_impl.cc @@ -7,9 +7,9 @@ #include "base/bind.h" #include "base/logging.h" #include "base/strings/string16.h" +#include "mojo/public/cpp/system/message_pipe.h" #include "third_party/WebKit/public/platform/WebMessagePortChannelClient.h" #include "third_party/WebKit/public/platform/WebString.h" -#include "third_party/mojo/src/mojo/public/cpp/system/message_pipe.h" using blink::WebMessagePortChannel; using blink::WebMessagePortChannelArray; diff --git a/components/message_port/web_message_port_channel_impl.h b/components/message_port/web_message_port_channel_impl.h index 493631f94e01bc..dd80fe086f8cda 100644 --- a/components/message_port/web_message_port_channel_impl.h +++ b/components/message_port/web_message_port_channel_impl.h @@ -7,8 +7,8 @@ #include "base/basictypes.h" #include "mojo/message_pump/handle_watcher.h" +#include "mojo/public/cpp/system/message_pipe.h" #include "third_party/WebKit/public/platform/WebMessagePortChannel.h" -#include "third_party/mojo/src/mojo/public/cpp/system/message_pipe.h" namespace message_port { diff --git a/components/mus/BUILD.gn b/components/mus/BUILD.gn index 7001e291662e65..cc3533338212fb 100644 --- a/components/mus/BUILD.gn +++ b/components/mus/BUILD.gn @@ -20,9 +20,9 @@ if (is_android) { ":lib", "public/interfaces", "//mojo/application/public/cpp:sources", + "//mojo/public/cpp/bindings", "//mojo/services/tracing/public/interfaces", "//mojo/shell", - "//third_party/mojo/src/mojo/public/cpp/bindings", ] } } else { diff --git a/components/mus/DEPS b/components/mus/DEPS index 07737d512f22f7..7d1f970cbb2b8c 100644 --- a/components/mus/DEPS +++ b/components/mus/DEPS @@ -4,10 +4,10 @@ include_rules = [ "+mojo/application", "+mojo/common", "+mojo/converters", + "+mojo/public", "+mojo/services/network/public", "+mojo/services/tracing/public", "+mojo/shell", - "+third_party/mojo/src/mojo/public", "+third_party/mojo_services", "+third_party/skia/include", "+ui", diff --git a/components/mus/example/main/BUILD.gn b/components/mus/example/main/BUILD.gn index 3e71b4fa1bd07d..abca70e6eaa2ad 100644 --- a/components/mus/example/main/BUILD.gn +++ b/components/mus/example/main/BUILD.gn @@ -4,7 +4,7 @@ import("//build/config/ui.gni") import("//mojo/public/mojo_application.gni") -import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") +import("//mojo/public/tools/bindings/mojom.gni") import("//tools/grit/repack.gni") mojo_native_application("main") { @@ -21,7 +21,7 @@ mojo_native_application("main") { "//base", "//mojo/application/public/cpp", "//mojo/application/public/cpp:sources", - "//third_party/mojo/src/mojo/public/cpp/bindings", + "//mojo/public/cpp/bindings", ] data_deps = [ diff --git a/components/mus/example/main/main.cc b/components/mus/example/main/main.cc index d71cfd4dbecf92..9815587ca057bc 100644 --- a/components/mus/example/main/main.cc +++ b/components/mus/example/main/main.cc @@ -4,7 +4,7 @@ #include "components/mus/example/main/main_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 MainApplicationDelegate); diff --git a/components/mus/example/mock_sysui/BUILD.gn b/components/mus/example/mock_sysui/BUILD.gn index 932520ce91cc9d..1cb05f2233bc8d 100644 --- a/components/mus/example/mock_sysui/BUILD.gn +++ b/components/mus/example/mock_sysui/BUILD.gn @@ -4,7 +4,7 @@ import("//build/config/ui.gni") import("//mojo/public/mojo_application.gni") -import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") +import("//mojo/public/tools/bindings/mojom.gni") mojo_native_application("mock_sysui") { sources = [ diff --git a/components/mus/example/mock_sysui/main.cc b/components/mus/example/mock_sysui/main.cc index 539f2732c7b314..d3aba2eb70e08d 100644 --- a/components/mus/example/mock_sysui/main.cc +++ b/components/mus/example/mock_sysui/main.cc @@ -4,7 +4,7 @@ #include "components/mus/example/mock_sysui/mock_sysui.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 MockSysUI); diff --git a/components/mus/example/views_examples/BUILD.gn b/components/mus/example/views_examples/BUILD.gn index 7c5b4aabe4aa38..0f8a3f78124c10 100644 --- a/components/mus/example/views_examples/BUILD.gn +++ b/components/mus/example/views_examples/BUILD.gn @@ -4,7 +4,7 @@ import("//build/config/ui.gni") import("//mojo/public/mojo_application.gni") -import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") +import("//mojo/public/tools/bindings/mojom.gni") import("//tools/grit/repack.gni") mojo_native_application("views_examples") { @@ -22,8 +22,8 @@ mojo_native_application("views_examples") { "//mojo/application/public/cpp:sources", "//mojo/converters/geometry", "//mojo/converters/network", + "//mojo/public/cpp/bindings", "//skia", - "//third_party/mojo/src/mojo/public/cpp/bindings", "//ui/gfx", "//ui/gfx/geometry", "//ui/views", diff --git a/components/mus/example/views_examples/main.cc b/components/mus/example/views_examples/main.cc index 03d579b2649a90..ee1a65067576a8 100644 --- a/components/mus/example/views_examples/main.cc +++ b/components/mus/example/views_examples/main.cc @@ -4,7 +4,7 @@ #include "components/mus/example/views_examples/views_examples_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 ViewsExamplesApplicationDelegate); diff --git a/components/mus/example/window_type_launcher/BUILD.gn b/components/mus/example/window_type_launcher/BUILD.gn index e1b2e2a308e577..7c345b48fb3efe 100644 --- a/components/mus/example/window_type_launcher/BUILD.gn +++ b/components/mus/example/window_type_launcher/BUILD.gn @@ -4,7 +4,7 @@ import("//build/config/ui.gni") import("//mojo/public/mojo_application.gni") -import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") +import("//mojo/public/tools/bindings/mojom.gni") import("//tools/grit/repack.gni") executable("window_type_launcher") { @@ -27,11 +27,11 @@ executable("window_type_launcher") { "//mojo/converters/geometry", "//mojo/converters/network", "//mojo/message_pump", + "//mojo/public/cpp/bindings", "//mojo/runner/child:lib", "//mojo/runner:init", "//skia", "//third_party/mojo/src/mojo/edk/system", - "//third_party/mojo/src/mojo/public/cpp/bindings", "//ui/aura", "//ui/gfx", "//ui/gfx/geometry", diff --git a/components/mus/example/wm/BUILD.gn b/components/mus/example/wm/BUILD.gn index 82df07e9e4d80e..af1dcd403010ef 100644 --- a/components/mus/example/wm/BUILD.gn +++ b/components/mus/example/wm/BUILD.gn @@ -4,7 +4,7 @@ import("//build/config/ui.gni") import("//mojo/public/mojo_application.gni") -import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") +import("//mojo/public/tools/bindings/mojom.gni") group("wm") { testonly = true @@ -115,9 +115,9 @@ source_set("unittests") { "//mojo/converters/input_events", "//mojo/gles2", "//mojo/platform_handle", + "//mojo/public/cpp/system", "//testing/gtest", "//third_party/mojo/src/mojo/edk/system", - "//third_party/mojo/src/mojo/public/cpp/system", "//ui/events", "//ui/gfx/geometry", "//ui/gfx:test_support", diff --git a/components/mus/example/wm/main.cc b/components/mus/example/wm/main.cc index c07ada7dd01e76..c9ed845370c37b 100644 --- a/components/mus/example/wm/main.cc +++ b/components/mus/example/wm/main.cc @@ -4,7 +4,7 @@ #include "components/mus/example/wm/window_manager_application.h" #include "mojo/application/public/cpp/application_runner.h" -#include "third_party/mojo/src/mojo/public/c/system/main.h" +#include "mojo/public/c/system/main.h" MojoResult MojoMain(MojoHandle shell_handle) { mojo::ApplicationRunner runner(new WindowManagerApplication); diff --git a/components/mus/example/wm/public/interfaces/BUILD.gn b/components/mus/example/wm/public/interfaces/BUILD.gn index d3c0ded0a20116..e778f378aacb8a 100644 --- a/components/mus/example/wm/public/interfaces/BUILD.gn +++ b/components/mus/example/wm/public/interfaces/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") +import("//mojo/public/tools/bindings/mojom.gni") mojom("interfaces") { sources = [ diff --git a/components/mus/gles2/BUILD.gn b/components/mus/gles2/BUILD.gn index e39037d23b0dab..39271d34d1023e 100644 --- a/components/mus/gles2/BUILD.gn +++ b/components/mus/gles2/BUILD.gn @@ -38,7 +38,7 @@ source_set("gles2") { "//gpu/command_buffer/service", "//gpu/config:config", "//mojo/converters/geometry", - "//third_party/mojo/src/mojo/public/cpp/bindings", + "//mojo/public/cpp/bindings", "//ui/mojo/geometry:interfaces", "//ui/gfx", "//ui/gfx/geometry", @@ -75,8 +75,8 @@ source_set("lib") { "//gpu/command_buffer/common", "//gpu/command_buffer/client", "//gpu/config:config", - "//third_party/mojo/src/mojo/public/cpp/bindings", - "//third_party/mojo/src/mojo/public/cpp/system", + "//mojo/public/cpp/bindings", + "//mojo/public/cpp/system", "//ui/gfx", "//ui/gfx/geometry", ] diff --git a/components/mus/gles2/DEPS b/components/mus/gles2/DEPS index 242c5d809869a8..ac1cf564066ad1 100644 --- a/components/mus/gles2/DEPS +++ b/components/mus/gles2/DEPS @@ -4,6 +4,6 @@ include_rules = [ "+gpu", "+mojo/converters", "+mojo/platform_handle", - "+third_party/mojo/src/mojo/public", + "+mojo/public", "+ui", ] diff --git a/components/mus/gles2/command_buffer_impl.h b/components/mus/gles2/command_buffer_impl.h index df410954a92737..cdf54e2a22e099 100644 --- a/components/mus/gles2/command_buffer_impl.h +++ b/components/mus/gles2/command_buffer_impl.h @@ -9,7 +9,7 @@ #include "base/memory/weak_ptr.h" #include "base/single_thread_task_runner.h" #include "components/mus/public/interfaces/command_buffer.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" +#include "mojo/public/cpp/bindings/binding.h" namespace mus { diff --git a/components/mus/gles2/command_buffer_type_conversions.h b/components/mus/gles2/command_buffer_type_conversions.h index e20a8fffa76445..082a37b35c8b88 100644 --- a/components/mus/gles2/command_buffer_type_conversions.h +++ b/components/mus/gles2/command_buffer_type_conversions.h @@ -10,7 +10,7 @@ #include "gpu/command_buffer/common/capabilities.h" #include "gpu/command_buffer/common/command_buffer.h" #include "gpu/config/gpu_info.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/type_converter.h" +#include "mojo/public/cpp/bindings/type_converter.h" namespace mojo { diff --git a/components/mus/gles2/gpu_impl.h b/components/mus/gles2/gpu_impl.h index 41b78d946e5fb8..c46b2a968d7ce9 100644 --- a/components/mus/gles2/gpu_impl.h +++ b/components/mus/gles2/gpu_impl.h @@ -11,8 +11,8 @@ #include "components/mus/gles2/gpu_state.h" #include "components/mus/public/interfaces/command_buffer.mojom.h" #include "components/mus/public/interfaces/gpu.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" +#include "mojo/public/cpp/bindings/interface_request.h" +#include "mojo/public/cpp/bindings/strong_binding.h" #include "ui/mojo/geometry/geometry.mojom.h" namespace mus { diff --git a/components/mus/gles2/mojo_buffer_backing.h b/components/mus/gles2/mojo_buffer_backing.h index 730dd33a345446..cb71ba44dad995 100644 --- a/components/mus/gles2/mojo_buffer_backing.h +++ b/components/mus/gles2/mojo_buffer_backing.h @@ -8,7 +8,7 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "gpu/command_buffer/common/buffer.h" -#include "third_party/mojo/src/mojo/public/cpp/system/core.h" +#include "mojo/public/cpp/system/core.h" namespace mus { diff --git a/components/mus/main.cc b/components/mus/main.cc index c1d4ac8961c4e6..4a0edb9663b29d 100644 --- a/components/mus/main.cc +++ b/components/mus/main.cc @@ -4,7 +4,7 @@ #include "components/mus/mus_app.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 mus::MandolineUIServicesApp); diff --git a/components/mus/mus_app.cc b/components/mus/mus_app.cc index a3e57d54e350db..de7815bd639292 100644 --- a/components/mus/mus_app.cc +++ b/components/mus/mus_app.cc @@ -16,8 +16,8 @@ #include "mojo/application/public/cpp/application_connection.h" #include "mojo/application/public/cpp/application_impl.h" #include "mojo/application/public/cpp/application_runner.h" +#include "mojo/public/c/system/main.h" #include "mojo/services/tracing/public/cpp/tracing_impl.h" -#include "third_party/mojo/src/mojo/public/c/system/main.h" #include "ui/events/event_switches.h" #include "ui/events/platform/platform_event_source.h" #include "ui/gl/gl_surface.h" diff --git a/components/mus/public/cpp/BUILD.gn b/components/mus/public/cpp/BUILD.gn index acbe3ce1d964f5..50266af26fc8f9 100644 --- a/components/mus/public/cpp/BUILD.gn +++ b/components/mus/public/cpp/BUILD.gn @@ -56,9 +56,9 @@ source_set("cpp") { "//mojo/converters/surfaces", "//mojo/gles2:headers", "//mojo/gpu:mojo_gles2_implementation", - "//third_party/mojo/src/mojo/public/cpp/bindings:bindings", - "//third_party/mojo/src/mojo/public/cpp/environment", - "//third_party/mojo/src/mojo/public/cpp/system", + "//mojo/public/cpp/bindings:bindings", + "//mojo/public/cpp/environment", + "//mojo/public/cpp/system", "//ui/gfx/geometry", "//ui/mojo/geometry:interfaces", ] diff --git a/components/mus/public/cpp/context_provider.h b/components/mus/public/cpp/context_provider.h index 18aa1375a5ab32..268f94aee68824 100644 --- a/components/mus/public/cpp/context_provider.h +++ b/components/mus/public/cpp/context_provider.h @@ -9,8 +9,8 @@ #include "base/memory/scoped_ptr.h" #include "base/synchronization/lock.h" #include "cc/output/context_provider.h" -#include "third_party/mojo/src/mojo/public/c/gles2/gles2_types.h" -#include "third_party/mojo/src/mojo/public/cpp/system/core.h" +#include "mojo/public/c/gles2/gles2_types.h" +#include "mojo/public/cpp/system/core.h" namespace mus { diff --git a/components/mus/public/cpp/lib/context_provider.cc b/components/mus/public/cpp/lib/context_provider.cc index 019512e6ccf9a5..256939e753df5a 100644 --- a/components/mus/public/cpp/lib/context_provider.cc +++ b/components/mus/public/cpp/lib/context_provider.cc @@ -7,7 +7,7 @@ #include "base/logging.h" #include "mojo/gles2/gles2_context.h" #include "mojo/gpu/mojo_gles2_impl_autogen.h" -#include "third_party/mojo/src/mojo/public/cpp/environment/environment.h" +#include "mojo/public/cpp/environment/environment.h" namespace mus { diff --git a/components/mus/public/cpp/lib/window_tree_client_impl.h b/components/mus/public/cpp/lib/window_tree_client_impl.h index abef50153fb102..34760dc5586c16 100644 --- a/components/mus/public/cpp/lib/window_tree_client_impl.h +++ b/components/mus/public/cpp/lib/window_tree_client_impl.h @@ -10,7 +10,7 @@ #include "components/mus/public/cpp/window.h" #include "components/mus/public/cpp/window_tree_connection.h" #include "components/mus/public/interfaces/window_tree.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" +#include "mojo/public/cpp/bindings/strong_binding.h" namespace gfx { class Insets; diff --git a/components/mus/public/cpp/output_surface.h b/components/mus/public/cpp/output_surface.h index a6c627acba8a4b..001050dd816cbf 100644 --- a/components/mus/public/cpp/output_surface.h +++ b/components/mus/public/cpp/output_surface.h @@ -10,7 +10,7 @@ #include "cc/surfaces/surface_id.h" #include "components/mus/public/cpp/window_surface.h" #include "components/mus/public/cpp/window_surface_client.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" +#include "mojo/public/cpp/bindings/binding.h" namespace mus { diff --git a/components/mus/public/cpp/property_type_converters.h b/components/mus/public/cpp/property_type_converters.h index cd1d2c5b5c6f0a..09943ca8b81576 100644 --- a/components/mus/public/cpp/property_type_converters.h +++ b/components/mus/public/cpp/property_type_converters.h @@ -8,7 +8,7 @@ #include #include -#include "third_party/mojo/src/mojo/public/cpp/bindings/type_converter.h" +#include "mojo/public/cpp/bindings/type_converter.h" namespace gfx { class Rect; diff --git a/components/mus/public/cpp/tests/BUILD.gn b/components/mus/public/cpp/tests/BUILD.gn index edb7809a2f75ee..6e69f132a28b5f 100644 --- a/components/mus/public/cpp/tests/BUILD.gn +++ b/components/mus/public/cpp/tests/BUILD.gn @@ -54,8 +54,8 @@ test("mojo_view_manager_lib_unittests") { "//mojo/converters/geometry", "//mojo/gles2", "//mojo/platform_handle:platform_handle_impl", + "//mojo/public/cpp/system", "//testing/gtest", - "//third_party/mojo/src/mojo/public/cpp/system", "//third_party/mojo/src/mojo/edk/system", "//ui/gfx:test_support", "//ui/gfx/geometry", diff --git a/components/mus/public/cpp/tests/window_server_test_suite.h b/components/mus/public/cpp/tests/window_server_test_suite.h index cbc2eb778c04ed..33063b2c269240 100644 --- a/components/mus/public/cpp/tests/window_server_test_suite.h +++ b/components/mus/public/cpp/tests/window_server_test_suite.h @@ -6,7 +6,7 @@ #define COMPONENTS_MUS_PUBLIC_CPP_TESTS_WINDOW_SERVER_TEST_SUITE_H_ #include "base/test/test_suite.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/cpp/system/macros.h" namespace mus { diff --git a/components/mus/public/cpp/window.h b/components/mus/public/cpp/window.h index a58e07ad8ac7c7..ded4fd36284806 100644 --- a/components/mus/public/cpp/window.h +++ b/components/mus/public/cpp/window.h @@ -15,8 +15,8 @@ #include "components/mus/public/interfaces/surface_id.mojom.h" #include "components/mus/public/interfaces/window_tree.mojom.h" #include "mojo/application/public/interfaces/service_provider.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/array.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/cpp/bindings/array.h" +#include "mojo/public/cpp/system/macros.h" #include "ui/gfx/geometry/insets.h" #include "ui/gfx/geometry/rect.h" diff --git a/components/mus/public/cpp/window_surface.h b/components/mus/public/cpp/window_surface.h index 2153891bbf6195..49ae2d313d2faf 100644 --- a/components/mus/public/cpp/window_surface.h +++ b/components/mus/public/cpp/window_surface.h @@ -8,8 +8,8 @@ #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" #include "components/mus/public/interfaces/compositor_frame.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_ptr_info.h" +#include "mojo/public/cpp/bindings/binding.h" +#include "mojo/public/cpp/bindings/interface_ptr_info.h" namespace mus { diff --git a/components/mus/public/cpp/window_tracker.h b/components/mus/public/cpp/window_tracker.h index f2f4963548f0b9..05c100e94a918a 100644 --- a/components/mus/public/cpp/window_tracker.h +++ b/components/mus/public/cpp/window_tracker.h @@ -9,7 +9,7 @@ #include #include "components/mus/public/cpp/window_observer.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/cpp/system/macros.h" namespace mus { diff --git a/components/mus/public/cpp/window_tree_connection.h b/components/mus/public/cpp/window_tree_connection.h index 821bdc311f1ff9..1f26737adab761 100644 --- a/components/mus/public/cpp/window_tree_connection.h +++ b/components/mus/public/cpp/window_tree_connection.h @@ -9,7 +9,7 @@ #include "components/mus/public/cpp/types.h" #include "components/mus/public/interfaces/window_tree.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h" +#include "mojo/public/cpp/bindings/interface_request.h" namespace mus { diff --git a/components/mus/public/cpp/window_tree_host_factory.h b/components/mus/public/cpp/window_tree_host_factory.h index af8d25bebde6ea..a6268a6d2d3daa 100644 --- a/components/mus/public/cpp/window_tree_host_factory.h +++ b/components/mus/public/cpp/window_tree_host_factory.h @@ -10,7 +10,7 @@ #include "components/mus/public/interfaces/window_manager.mojom.h" #include "components/mus/public/interfaces/window_tree.mojom.h" #include "components/mus/public/interfaces/window_tree_host.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" +#include "mojo/public/cpp/bindings/binding.h" namespace mojo { class ApplicationImpl; diff --git a/components/mus/public/interfaces/BUILD.gn b/components/mus/public/interfaces/BUILD.gn index f124870fa25d0a..02ef8b5f7231b5 100644 --- a/components/mus/public/interfaces/BUILD.gn +++ b/components/mus/public/interfaces/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") +import("//mojo/public/tools/bindings/mojom.gni") mojom("interfaces") { sources = [ diff --git a/components/mus/surfaces/DEPS b/components/mus/surfaces/DEPS index 7e211ceab945c4..143e2d1132b7cf 100644 --- a/components/mus/surfaces/DEPS +++ b/components/mus/surfaces/DEPS @@ -5,6 +5,6 @@ include_rules = [ "+mojo/application", "+mojo/common", "+mojo/converters", - "+third_party/mojo/src/mojo/public", + "+mojo/public", "+third_party/mojo_services", ] diff --git a/components/mus/surfaces/top_level_display_client.h b/components/mus/surfaces/top_level_display_client.h index f66999c71061a8..f72e8337a69830 100644 --- a/components/mus/surfaces/top_level_display_client.h +++ b/components/mus/surfaces/top_level_display_client.h @@ -13,7 +13,7 @@ #include "components/mus/surfaces/surfaces_context_provider.h" #include "components/mus/surfaces/surfaces_context_provider_delegate.h" #include "components/mus/surfaces/surfaces_state.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" +#include "mojo/public/cpp/bindings/strong_binding.h" #include "ui/gfx/native_widget_types.h" namespace cc { diff --git a/components/mus/ws/BUILD.gn b/components/mus/ws/BUILD.gn index 2757e75319b2a0..b830ff89d60575 100644 --- a/components/mus/ws/BUILD.gn +++ b/components/mus/ws/BUILD.gn @@ -71,8 +71,8 @@ source_set("lib") { "//mojo/converters/ime", "//mojo/converters/input_events", "//mojo/converters/surfaces", + "//mojo/public/cpp/bindings:callback", "//mojo/services/tracing/public/cpp", - "//third_party/mojo/src/mojo/public/cpp/bindings:callback", "//ui/events", "//ui/events/platform", "//ui/gfx", @@ -98,7 +98,7 @@ source_set("test_support") { "//components/mus/public/cpp:common", "//components/mus/public/interfaces", "//mojo/common", - "//third_party/mojo/src/mojo/public/cpp/bindings:bindings", + "//mojo/public/cpp/bindings:bindings", "//ui/mojo/geometry:interfaces", ] } @@ -140,8 +140,8 @@ test("window_manager_unittests") { "//mojo/environment:chromium", "//mojo/gles2", "//mojo/platform_handle", + "//mojo/public/cpp/bindings:bindings", "//third_party/mojo/src/mojo/edk/test:run_all_unittests", - "//third_party/mojo/src/mojo/public/cpp/bindings:bindings", "//ui/mojo/geometry:interfaces", "//testing/gtest", "//ui/events", diff --git a/components/mus/ws/client_connection.h b/components/mus/ws/client_connection.h index a685fc12fe9df4..8bfee606a7a1ff 100644 --- a/components/mus/ws/client_connection.h +++ b/components/mus/ws/client_connection.h @@ -7,7 +7,7 @@ #include "base/memory/scoped_ptr.h" #include "components/mus/public/interfaces/window_tree.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" +#include "mojo/public/cpp/bindings/binding.h" namespace mus { diff --git a/components/mus/ws/connection_manager.h b/components/mus/ws/connection_manager.h index 0b522e90a2ce6e..0c12feb4c41af9 100644 --- a/components/mus/ws/connection_manager.h +++ b/components/mus/ws/connection_manager.h @@ -21,8 +21,8 @@ #include "components/mus/ws/server_window_observer.h" #include "components/mus/ws/window_tree_host_impl.h" #include "mojo/converters/surfaces/custom_surface_converter.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/array.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" +#include "mojo/public/cpp/bindings/array.h" +#include "mojo/public/cpp/bindings/binding.h" namespace mus { diff --git a/components/mus/ws/connection_manager_delegate.h b/components/mus/ws/connection_manager_delegate.h index 5ec353b43273e0..e160944dab3952 100644 --- a/components/mus/ws/connection_manager_delegate.h +++ b/components/mus/ws/connection_manager_delegate.h @@ -9,7 +9,7 @@ #include "components/mus/public/cpp/types.h" #include "components/mus/public/interfaces/window_tree.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h" +#include "mojo/public/cpp/bindings/interface_request.h" namespace mus { diff --git a/components/mus/ws/display_manager.h b/components/mus/ws/display_manager.h index fd3217be1f40ab..c8596b106ec7a9 100644 --- a/components/mus/ws/display_manager.h +++ b/components/mus/ws/display_manager.h @@ -13,7 +13,7 @@ #include "base/timer/timer.h" #include "components/mus/public/interfaces/window_tree.mojom.h" #include "components/mus/ws/display_manager_delegate.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/callback.h" +#include "mojo/public/cpp/bindings/callback.h" #include "ui/gfx/geometry/rect.h" #include "ui/platform_window/platform_window_delegate.h" diff --git a/components/mus/ws/display_manager_factory.h b/components/mus/ws/display_manager_factory.h index 04488367905312..2067a272024519 100644 --- a/components/mus/ws/display_manager_factory.h +++ b/components/mus/ws/display_manager_factory.h @@ -6,7 +6,7 @@ #define COMPONENTS_MUS_WS_DISPLAY_MANAGER_FACTORY_H_ #include "components/mus/gles2/gpu_state.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/callback.h" +#include "mojo/public/cpp/bindings/callback.h" namespace mojo { class ApplicationImpl; diff --git a/components/mus/ws/server_window.h b/components/mus/ws/server_window.h index d99c7b8931f572..20ae2f890b3648 100644 --- a/components/mus/ws/server_window.h +++ b/components/mus/ws/server_window.h @@ -14,7 +14,7 @@ #include "components/mus/public/interfaces/window_tree.mojom.h" #include "components/mus/ws/ids.h" #include "components/mus/ws/server_window_surface.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" +#include "mojo/public/cpp/bindings/binding.h" #include "ui/gfx/geometry/insets.h" #include "ui/gfx/geometry/rect.h" #include "ui/gfx/transform.h" diff --git a/components/mus/ws/server_window_surface.h b/components/mus/ws/server_window_surface.h index 712dba06611f16..99e0e5225ee00b 100644 --- a/components/mus/ws/server_window_surface.h +++ b/components/mus/ws/server_window_surface.h @@ -16,7 +16,7 @@ #include "components/mus/public/interfaces/window_tree.mojom.h" #include "components/mus/ws/ids.h" #include "mojo/converters/surfaces/custom_surface_converter.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" +#include "mojo/public/cpp/bindings/binding.h" namespace mus { diff --git a/components/mus/ws/server_window_surface_manager.h b/components/mus/ws/server_window_surface_manager.h index 7bc52a8aefab97..5af5052a950a6f 100644 --- a/components/mus/ws/server_window_surface_manager.h +++ b/components/mus/ws/server_window_surface_manager.h @@ -12,7 +12,7 @@ #include "cc/surfaces/surface_id_allocator.h" #include "components/mus/public/interfaces/compositor_frame.mojom.h" #include "components/mus/public/interfaces/window_tree.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" +#include "mojo/public/cpp/bindings/binding.h" namespace mus { namespace ws { diff --git a/components/mus/ws/test_change_tracker.h b/components/mus/ws/test_change_tracker.h index ef833aee8ec2ae..faa5fe7434a7df 100644 --- a/components/mus/ws/test_change_tracker.h +++ b/components/mus/ws/test_change_tracker.h @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "components/mus/public/cpp/types.h" #include "components/mus/public/interfaces/window_tree.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/array.h" +#include "mojo/public/cpp/bindings/array.h" #include "ui/mojo/geometry/geometry.mojom.h" namespace mus { diff --git a/components/mus/ws/window_tree_host_connection.h b/components/mus/ws/window_tree_host_connection.h index 270de81c03b23f..24d0f004efc50e 100644 --- a/components/mus/ws/window_tree_host_connection.h +++ b/components/mus/ws/window_tree_host_connection.h @@ -10,7 +10,7 @@ #include "components/mus/public/interfaces/window_tree_host.mojom.h" #include "components/mus/ws/window_tree_host_delegate.h" #include "components/mus/ws/window_tree_host_impl.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" +#include "mojo/public/cpp/bindings/binding.h" namespace mus { diff --git a/components/pdf_viewer/BUILD.gn b/components/pdf_viewer/BUILD.gn index c5a635a8358658..984b212b37eccc 100644 --- a/components/pdf_viewer/BUILD.gn +++ b/components/pdf_viewer/BUILD.gn @@ -23,12 +23,12 @@ mojo_native_application("pdf_viewer") { "//mojo/common:common_base", "//mojo/converters/input_events", "//mojo/converters/surfaces", + "//mojo/public/c/gles2", + "//mojo/public/cpp/bindings", "//mojo/services/network/public/cpp", "//mojo/services/network/public/interfaces", "//mojo/services/tracing/public/cpp", "//mojo/services/tracing/public/interfaces", - "//third_party/mojo/src/mojo/public/c/gles2", - "//third_party/mojo/src/mojo/public/cpp/bindings", "//third_party/pdfium", "//ui/gfx/geometry", "//ui/mojo/geometry:interfaces", diff --git a/components/pdf_viewer/DEPS b/components/pdf_viewer/DEPS index e85458b03e4dda..d6857afccc9702 100644 --- a/components/pdf_viewer/DEPS +++ b/components/pdf_viewer/DEPS @@ -9,7 +9,6 @@ include_rules = [ "+mojo/converters/surfaces", "+mojo/public", "+mojo/services/tracing/public/cpp", - "+third_party/mojo/src/mojo/public", "+third_party/pdfium/public", "+ui/gfx/geometry", "+ui/mojo", diff --git a/components/pdf_viewer/pdf_viewer.cc b/components/pdf_viewer/pdf_viewer.cc index bb983b71c0a677..dcc5f93a14a44d 100644 --- a/components/pdf_viewer/pdf_viewer.cc +++ b/components/pdf_viewer/pdf_viewer.cc @@ -26,9 +26,9 @@ #include "mojo/application/public/interfaces/content_handler.mojom.h" #include "mojo/application/public/interfaces/shell.mojom.h" #include "mojo/common/data_pipe_utils.h" +#include "mojo/public/c/system/main.h" +#include "mojo/public/cpp/bindings/binding.h" #include "mojo/services/tracing/public/cpp/tracing_impl.h" -#include "third_party/mojo/src/mojo/public/c/system/main.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" #include "third_party/pdfium/public/fpdf_ext.h" #include "third_party/pdfium/public/fpdfview.h" #include "ui/gfx/geometry/rect.h" diff --git a/components/resource_provider/BUILD.gn b/components/resource_provider/BUILD.gn index 9a9ecb0bdd7d4b..5e4bc84ab48703 100644 --- a/components/resource_provider/BUILD.gn +++ b/components/resource_provider/BUILD.gn @@ -34,7 +34,7 @@ if (is_android) { "//components/resource_provider/public/interfaces", "//mojo/environment:chromium", "//mojo/platform_handle:for_shared_library", - "//third_party/mojo/src/mojo/public/c/system:for_shared_library", + "//mojo/public/c/system:for_shared_library", "//url", ] } diff --git a/components/resource_provider/DEPS b/components/resource_provider/DEPS index 9498e27fc61b17..41468523719094 100644 --- a/components/resource_provider/DEPS +++ b/components/resource_provider/DEPS @@ -3,5 +3,5 @@ include_rules = [ "+mojo/common", "+mojo/converters", "+mojo/platform_handle", - "+third_party/mojo/src/mojo/public", + "+mojo/public", ] diff --git a/components/resource_provider/main.cc b/components/resource_provider/main.cc index c295c5fcad99e1..60b78c14d47969 100644 --- a/components/resource_provider/main.cc +++ b/components/resource_provider/main.cc @@ -4,7 +4,7 @@ #include "components/resource_provider/resource_provider_app.h" #include "mojo/application/public/cpp/application_runner.h" -#include "third_party/mojo/src/mojo/public/c/system/main.h" +#include "mojo/public/c/system/main.h" MojoResult MojoMain(MojoHandle shell_handle) { mojo::ApplicationRunner runner( diff --git a/components/resource_provider/public/cpp/BUILD.gn b/components/resource_provider/public/cpp/BUILD.gn index ad13d1fe55aa7b..0842a71e899ce4 100644 --- a/components/resource_provider/public/cpp/BUILD.gn +++ b/components/resource_provider/public/cpp/BUILD.gn @@ -15,7 +15,7 @@ source_set("cpp") { "//mojo/application/public/interfaces", "//mojo/common", "//mojo/platform_handle", - "//third_party/mojo/src/mojo/public/cpp/bindings", - "//third_party/mojo/src/mojo/public/cpp/system", + "//mojo/public/cpp/bindings", + "//mojo/public/cpp/system", ] } diff --git a/components/resource_provider/public/cpp/resource_loader.h b/components/resource_provider/public/cpp/resource_loader.h index 69b50948e640a6..771d689d85c51b 100644 --- a/components/resource_provider/public/cpp/resource_loader.h +++ b/components/resource_provider/public/cpp/resource_loader.h @@ -14,8 +14,8 @@ #include "base/memory/scoped_ptr.h" #include "components/resource_provider/public/interfaces/resource_provider.mojom.h" #include "mojo/platform_handle/platform_handle.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/array.h" -#include "third_party/mojo/src/mojo/public/cpp/system/handle.h" +#include "mojo/public/cpp/bindings/array.h" +#include "mojo/public/cpp/system/handle.h" namespace base { class File; diff --git a/components/resource_provider/public/interfaces/BUILD.gn b/components/resource_provider/public/interfaces/BUILD.gn index d99f3c2a86064e..d7abe360466b87 100644 --- a/components/resource_provider/public/interfaces/BUILD.gn +++ b/components/resource_provider/public/interfaces/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") +import("//mojo/public/tools/bindings/mojom.gni") mojom("interfaces") { sources = [ diff --git a/components/resource_provider/resource_provider_app.h b/components/resource_provider/resource_provider_app.h index 752c7fe569fce3..b4c13dee1b8c82 100644 --- a/components/resource_provider/resource_provider_app.h +++ b/components/resource_provider/resource_provider_app.h @@ -11,7 +11,7 @@ #include "mojo/application/public/cpp/application_delegate.h" #include "mojo/application/public/cpp/interface_factory.h" #include "mojo/common/weak_binding_set.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" +#include "mojo/public/cpp/bindings/binding.h" namespace mojo { class ApplicationImpl; diff --git a/components/resource_provider/resource_provider_apptest.cc b/components/resource_provider/resource_provider_apptest.cc index c1f0d07f954f6e..a5fbcae0c4672c 100644 --- a/components/resource_provider/resource_provider_apptest.cc +++ b/components/resource_provider/resource_provider_apptest.cc @@ -15,8 +15,8 @@ #include "mojo/application/public/cpp/service_provider_impl.h" #include "mojo/common/common_type_converters.h" #include "mojo/platform_handle/platform_handle_functions.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/array.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/cpp/bindings/array.h" +#include "mojo/public/cpp/system/macros.h" namespace resource_provider { namespace { diff --git a/components/web_view/BUILD.gn b/components/web_view/BUILD.gn index 1a87baecadc077..f38758343dd974 100644 --- a/components/web_view/BUILD.gn +++ b/components/web_view/BUILD.gn @@ -63,9 +63,9 @@ source_set("lib") { "//mojo/common:common_base", "//mojo/common:url_type_converters", "//mojo/converters/geometry", + "//mojo/public/cpp/bindings", "//mojo/services/network/public/interfaces", "//mojo/services/tracing/public/interfaces", - "//third_party/mojo/src/mojo/public/cpp/bindings", "//url", ] diff --git a/components/web_view/DEPS b/components/web_view/DEPS index d748c9c264a476..466e8918f20667 100644 --- a/components/web_view/DEPS +++ b/components/web_view/DEPS @@ -8,8 +8,8 @@ include_rules = [ "+mojo/application/public", "+mojo/common", "+mojo/converters/geometry", + "+mojo/public", "+mojo/services/network/public/interfaces", "+mojo/services/tracing/public/interfaces", "+mojo/util", - "+third_party/mojo/src/mojo/public", ] diff --git a/components/web_view/frame.h b/components/web_view/frame.h index 508aad9920bb4f..ab61f71d05b534 100644 --- a/components/web_view/frame.h +++ b/components/web_view/frame.h @@ -14,7 +14,7 @@ #include "components/mus/public/cpp/types.h" #include "components/mus/public/cpp/window_observer.h" #include "components/web_view/public/interfaces/frame.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" +#include "mojo/public/cpp/bindings/binding.h" class GURL; diff --git a/components/web_view/frame_devtools_agent.h b/components/web_view/frame_devtools_agent.h index 53f8b6d7fcbb47..deaa2f1a8e8179 100644 --- a/components/web_view/frame_devtools_agent.h +++ b/components/web_view/frame_devtools_agent.h @@ -12,7 +12,7 @@ #include "base/memory/scoped_ptr.h" #include "components/devtools_service/public/interfaces/devtools_service.mojom.h" #include "components/web_view/frame.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" +#include "mojo/public/cpp/bindings/binding.h" namespace base { class DictionaryValue; diff --git a/components/web_view/frame_tree.h b/components/web_view/frame_tree.h index 58776cc7eb7921..ae7f1b8b228c96 100644 --- a/components/web_view/frame_tree.h +++ b/components/web_view/frame_tree.h @@ -8,7 +8,7 @@ #include "base/time/time.h" #include "components/mus/public/interfaces/window_tree.mojom.h" #include "components/web_view/frame.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/array.h" +#include "mojo/public/cpp/bindings/array.h" #include "url/gurl.h" namespace mojo { diff --git a/components/web_view/local_find_options.h b/components/web_view/local_find_options.h index fb8a0c5799d518..16cd216f391fa0 100644 --- a/components/web_view/local_find_options.h +++ b/components/web_view/local_find_options.h @@ -6,7 +6,7 @@ #define COMPONENTS_WEB_VIEW_LOCAL_FIND_OPTIONS_H_ #include "components/web_view/public/interfaces/frame.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/type_converter.h" +#include "mojo/public/cpp/bindings/type_converter.h" namespace web_view { diff --git a/components/web_view/main.cc b/components/web_view/main.cc index 3e9755dac6d093..6323f9b40d1a59 100644 --- a/components/web_view/main.cc +++ b/components/web_view/main.cc @@ -4,7 +4,7 @@ #include "components/web_view/web_view_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 web_view::WebViewApplicationDelegate); diff --git a/components/web_view/public/cpp/BUILD.gn b/components/web_view/public/cpp/BUILD.gn index d3c2f5430fae3d..789939a4ceac4c 100644 --- a/components/web_view/public/cpp/BUILD.gn +++ b/components/web_view/public/cpp/BUILD.gn @@ -14,7 +14,7 @@ source_set("cpp") { "//components/web_view/public/interfaces", "//mojo/application/public/cpp", "//mojo/converters/geometry", - "//third_party/mojo/src/mojo/public/cpp/bindings", - "//third_party/mojo/src/mojo/public/cpp/system", + "//mojo/public/cpp/bindings", + "//mojo/public/cpp/system", ] } diff --git a/components/web_view/public/cpp/web_view.h b/components/web_view/public/cpp/web_view.h index 0eae5ede2deb5d..bf5675a083dd2f 100644 --- a/components/web_view/public/cpp/web_view.h +++ b/components/web_view/public/cpp/web_view.h @@ -8,7 +8,7 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "components/web_view/public/interfaces/web_view.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" +#include "mojo/public/cpp/bindings/binding.h" namespace mojo { class ApplicationImpl; diff --git a/components/web_view/public/interfaces/BUILD.gn b/components/web_view/public/interfaces/BUILD.gn index 30b6320c4fe1d6..6ce73b514e48fc 100644 --- a/components/web_view/public/interfaces/BUILD.gn +++ b/components/web_view/public/interfaces/BUILD.gn @@ -2,8 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//mojo/public/mojo.gni") -import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") +import("//mojo/public/tools/bindings/mojom.gni") mojom("interfaces") { sources = [ @@ -11,7 +10,9 @@ mojom("interfaces") { "web_view.mojom", ] - import_dirs = [ mojo_network_service_root ] + import_dirs = [ + "//mojo/services" + ] deps = [ "//components/mus/public/interfaces", diff --git a/components/web_view/test_runner/BUILD.gn b/components/web_view/test_runner/BUILD.gn index d8f63abe3d63f8..4a528cb09dfdc7 100644 --- a/components/web_view/test_runner/BUILD.gn +++ b/components/web_view/test_runner/BUILD.gn @@ -3,7 +3,7 @@ # found in the LICENSE file. import("//mojo/public/mojo_application.gni") -import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") +import("//mojo/public/tools/bindings/mojom.gni") executable("test_runner") { output_name = "layout_test_runner" diff --git a/components/web_view/test_runner/DEPS b/components/web_view/test_runner/DEPS index 29bf415748a6d9..0792749d2d1fbf 100644 --- a/components/web_view/test_runner/DEPS +++ b/components/web_view/test_runner/DEPS @@ -4,7 +4,7 @@ include_rules = [ "+components/test_runner", "+components/web_view/public", "+mojo/application/public", + "+mojo/public", "+mojo/runner", - "+third_party/mojo/src/mojo/public", "+ui/gfx", ] diff --git a/components/web_view/test_runner/public/interfaces/BUILD.gn b/components/web_view/test_runner/public/interfaces/BUILD.gn index 8ad106f21901b7..7dd0c33ef98825 100644 --- a/components/web_view/test_runner/public/interfaces/BUILD.gn +++ b/components/web_view/test_runner/public/interfaces/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") +import("//mojo/public/tools/bindings/mojom.gni") mojom("interfaces") { sources = [ diff --git a/components/web_view/test_runner/test_runner_main.cc b/components/web_view/test_runner/test_runner_main.cc index 1893e8953d50c1..8925ace1707357 100644 --- a/components/web_view/test_runner/test_runner_main.cc +++ b/components/web_view/test_runner/test_runner_main.cc @@ -4,7 +4,7 @@ #include "components/web_view/test_runner/test_runner_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 web_view::TestRunnerApplicationDelegate); diff --git a/components/web_view/web_view_impl.h b/components/web_view/web_view_impl.h index 085b66d2bee0b9..7647adc611b173 100644 --- a/components/web_view/web_view_impl.h +++ b/components/web_view/web_view_impl.h @@ -20,7 +20,7 @@ #include "components/web_view/navigation_controller_delegate.h" #include "components/web_view/public/interfaces/frame.mojom.h" #include "components/web_view/public/interfaces/web_view.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" +#include "mojo/public/cpp/bindings/strong_binding.h" namespace mojo { class ApplicationImpl; diff --git a/components/webusb/public/interfaces/BUILD.gn b/components/webusb/public/interfaces/BUILD.gn index ee4ca58848df03..5c8eeb197f6869 100644 --- a/components/webusb/public/interfaces/BUILD.gn +++ b/components/webusb/public/interfaces/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") +import("//mojo/public/tools/bindings/mojom.gni") mojom("interfaces") { sources = [ diff --git a/content/DEPS b/content/DEPS index 647a2ce44d6e8c..e62959c7e43af6 100644 --- a/content/DEPS +++ b/content/DEPS @@ -35,6 +35,7 @@ include_rules = [ "+gpu", "+mojo/common", "+mojo/message_pump", + "+mojo/public", "+net", "+ppapi", "+printing", @@ -64,7 +65,6 @@ include_rules = [ "+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/ocmock", diff --git a/content/app/mojo/mojo_browsertest.cc b/content/app/mojo/mojo_browsertest.cc index c7f179cd173906..b516107333f4f3 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/browser/BUILD.gn b/content/browser/BUILD.gn index 64a9267a19d6d9..d97c5cb229dcd3 100644 --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn @@ -39,12 +39,12 @@ source_set("browser") { "//mojo/application/public/interfaces", "//mojo/common", "//mojo/package_manager", + "//mojo/public/cpp/bindings", "//mojo/shell", "//net", "//net:extras", "//skia", "//sql", - "//third_party/mojo/src/mojo/public/cpp/bindings", "//third_party/npapi", "//third_party/re2", "//third_party/WebKit/public:blink_headers", @@ -120,6 +120,8 @@ source_set("browser") { "//mojo/application/public/interfaces", "//mojo/common:url_type_converters", "//mojo/converters/geometry", + "//mojo/public/cpp/bindings", + "//mojo/public/js", "//skia/public", "//storage/browser", "//storage/common", @@ -129,8 +131,6 @@ source_set("browser") { "//third_party/icu", "//third_party/leveldatabase", "//third_party/libyuv", - "//third_party/mojo/src/mojo/public/cpp/bindings", - "//third_party/mojo/src/mojo/public/js", "//ui/events/blink", "//ui/resources", "//ui/surface", diff --git a/content/browser/background_sync/background_sync_registration.h b/content/browser/background_sync/background_sync_registration.h index df558ce3670618..3c1fc0dd135477 100644 --- a/content/browser/background_sync/background_sync_registration.h +++ b/content/browser/background_sync/background_sync_registration.h @@ -15,7 +15,7 @@ #include "content/browser/background_sync/background_sync_registration_options.h" #include "content/common/background_sync_service.mojom.h" #include "content/common/content_export.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/type_converter.h" +#include "mojo/public/cpp/bindings/type_converter.h" namespace content { diff --git a/content/browser/background_sync/background_sync_service_impl.h b/content/browser/background_sync/background_sync_service_impl.h index ad8e53394c200d..2557e9b5cec007 100644 --- a/content/browser/background_sync/background_sync_service_impl.h +++ b/content/browser/background_sync/background_sync_service_impl.h @@ -10,7 +10,7 @@ #include "base/memory/scoped_vector.h" #include "content/browser/background_sync/background_sync_manager.h" #include "content/common/background_sync_service.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" +#include "mojo/public/cpp/bindings/binding.h" namespace content { diff --git a/content/browser/background_sync/background_sync_service_impl_unittest.cc b/content/browser/background_sync/background_sync_service_impl_unittest.cc index f93c34861dab83..916c4cb4ad79b2 100644 --- a/content/browser/background_sync/background_sync_service_impl_unittest.cc +++ b/content/browser/background_sync/background_sync_service_impl_unittest.cc @@ -16,9 +16,9 @@ #include "content/browser/service_worker/service_worker_context_wrapper.h" #include "content/public/browser/browser_thread.h" #include "content/public/test/test_browser_thread_bundle.h" +#include "mojo/public/cpp/bindings/interface_ptr.h" #include "net/base/network_change_notifier.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_ptr.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 1f774a0c81bbad..d6e0bba7380b0d 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 "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" +#include "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/frame_host/frame_mojo_shell.h b/content/browser/frame_host/frame_mojo_shell.h index b2817a0a5054b9..d2cc6bb5819322 100644 --- a/content/browser/frame_host/frame_mojo_shell.h +++ b/content/browser/frame_host/frame_mojo_shell.h @@ -9,7 +9,7 @@ #include "base/memory/scoped_ptr.h" #include "mojo/application/public/interfaces/shell.mojom.h" #include "mojo/common/weak_binding_set.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h" +#include "mojo/public/cpp/bindings/interface_request.h" namespace content { diff --git a/content/browser/geolocation/geolocation_service_impl.h b/content/browser/geolocation/geolocation_service_impl.h index 45b37e7fd601c2..354547ee79a3d8 100644 --- a/content/browser/geolocation/geolocation_service_impl.h +++ b/content/browser/geolocation/geolocation_service_impl.h @@ -6,7 +6,7 @@ #include "content/browser/geolocation/geolocation_provider_impl.h" #include "content/common/geolocation_service.mojom.h" #include "content/public/common/mojo_geoposition.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" +#include "mojo/public/cpp/bindings/binding.h" #ifndef CONTENT_BROWSER_GEOLOCATION_GEOLOCATION_SERVICE_IMPL_H_ #define CONTENT_BROWSER_GEOLOCATION_GEOLOCATION_SERVICE_IMPL_H_ diff --git a/content/browser/mojo/mojo_shell_context.cc b/content/browser/mojo/mojo_shell_context.cc index e3596944c94add..57f14eabb85716 100644 --- a/content/browser/mojo/mojo_shell_context.cc +++ b/content/browser/mojo/mojo_shell_context.cc @@ -21,12 +21,12 @@ #include "mojo/application/public/cpp/application_delegate.h" #include "mojo/common/url_type_converters.h" #include "mojo/package_manager/package_manager_impl.h" +#include "mojo/public/cpp/bindings/interface_request.h" +#include "mojo/public/cpp/bindings/string.h" #include "mojo/shell/application_loader.h" #include "mojo/shell/connect_to_application_params.h" #include "mojo/shell/identity.h" #include "mojo/shell/static_application_loader.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/string.h" #if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) || \ defined(ENABLE_MOJO_MEDIA_IN_GPU_PROCESS) diff --git a/content/browser/navigator_connect/service_port_service_impl.h b/content/browser/navigator_connect/service_port_service_impl.h index 852ec6b232e4ce..3fec7b7bf67f3f 100644 --- a/content/browser/navigator_connect/service_port_service_impl.h +++ b/content/browser/navigator_connect/service_port_service_impl.h @@ -9,7 +9,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "content/common/service_port_service.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" +#include "mojo/public/cpp/bindings/strong_binding.h" namespace content { struct MessagePortMessage; diff --git a/content/browser/permissions/permission_service_context.h b/content/browser/permissions/permission_service_context.h index ac54efb73ff126..0534ae1b61dfb9 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 "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h" +#include "mojo/public/cpp/bindings/interface_request.h" namespace content { diff --git a/content/browser/permissions/permission_service_impl.h b/content/browser/permissions/permission_service_impl.h index 5d5351193fa5c7..13761daca2f2ed 100644 --- a/content/browser/permissions/permission_service_impl.h +++ b/content/browser/permissions/permission_service_impl.h @@ -10,7 +10,7 @@ #include "base/memory/weak_ptr.h" #include "content/browser/permissions/permission_service_context.h" #include "content/common/permission_service.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" +#include "mojo/public/cpp/bindings/binding.h" namespace content { diff --git a/content/browser/presentation/presentation_service_impl.h b/content/browser/presentation/presentation_service_impl.h index 54e1a4c14975d0..6d48b7a955761d 100644 --- a/content/browser/presentation/presentation_service_impl.h +++ b/content/browser/presentation/presentation_service_impl.h @@ -26,7 +26,7 @@ #include "content/public/browser/presentation_service_delegate.h" #include "content/public/browser/web_contents_observer.h" #include "content/public/common/frame_navigate_params.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" +#include "mojo/public/cpp/bindings/binding.h" namespace content { diff --git a/content/browser/presentation/presentation_service_impl_unittest.cc b/content/browser/presentation/presentation_service_impl_unittest.cc index c3904ddbc95bf1..f1b4d0ac74a314 100644 --- a/content/browser/presentation/presentation_service_impl_unittest.cc +++ b/content/browser/presentation/presentation_service_impl_unittest.cc @@ -18,9 +18,9 @@ #include "content/test/test_render_frame_host.h" #include "content/test/test_render_view_host.h" #include "content/test/test_web_contents.h" +#include "mojo/public/cpp/bindings/interface_ptr.h" +#include "mojo/public/cpp/bindings/string.h" #include "testing/gmock/include/gmock/gmock.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_ptr.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/string.h" using ::testing::_; using ::testing::Eq; diff --git a/content/browser/renderer_host/render_process_host_impl.h b/content/browser/renderer_host/render_process_host_impl.h index c9bf7f60e3d4ea..a731a6aa75a071 100644 --- a/content/browser/renderer_host/render_process_host_impl.h +++ b/content/browser/renderer_host/render_process_host_impl.h @@ -21,7 +21,7 @@ #include "content/public/browser/render_process_host.h" #include "ipc/ipc_channel_proxy.h" #include "ipc/ipc_platform_file.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_ptr.h" +#include "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/vibration_manager_integration_browsertest.cc b/content/browser/vibration_manager_integration_browsertest.cc index 194b00954b5230..2f8b212bb9bc0e 100644 --- a/content/browser/vibration_manager_integration_browsertest.cc +++ b/content/browser/vibration_manager_integration_browsertest.cc @@ -10,7 +10,7 @@ #include "content/shell/browser/shell.h" #include "content/shell/browser/shell_content_browser_client.h" #include "device/vibration/vibration_manager.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" +#include "mojo/public/cpp/bindings/strong_binding.h" // These tests run against a dummy implementation of the VibrationManager // service. That is, they verify that the service implementation is correctly diff --git a/content/browser/wake_lock/wake_lock_service_context.h b/content/browser/wake_lock/wake_lock_service_context.h index aeaa13028a9fba..f3114d73e9467b 100644 --- a/content/browser/wake_lock/wake_lock_service_context.h +++ b/content/browser/wake_lock/wake_lock_service_context.h @@ -14,7 +14,7 @@ #include "content/browser/wake_lock/wake_lock_service_impl.h" #include "content/common/content_export.h" #include "content/public/browser/web_contents_observer.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h" +#include "mojo/public/cpp/bindings/interface_request.h" namespace content { diff --git a/content/browser/wake_lock/wake_lock_service_impl.h b/content/browser/wake_lock/wake_lock_service_impl.h index 3d6a580287b6d9..903f5057fa345b 100644 --- a/content/browser/wake_lock/wake_lock_service_impl.h +++ b/content/browser/wake_lock/wake_lock_service_impl.h @@ -8,8 +8,8 @@ #include "base/macros.h" #include "base/memory/weak_ptr.h" #include "content/common/wake_lock_service.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" +#include "mojo/public/cpp/bindings/interface_request.h" +#include "mojo/public/cpp/bindings/strong_binding.h" namespace content { diff --git a/content/browser/webui/web_ui_data_source_impl.cc b/content/browser/webui/web_ui_data_source_impl.cc index 09c58966aa121b..f41f138be03986 100644 --- a/content/browser/webui/web_ui_data_source_impl.cc +++ b/content/browser/webui/web_ui_data_source_impl.cc @@ -12,7 +12,7 @@ #include "content/grit/content_resources.h" #include "content/public/browser/content_browser_client.h" #include "content/public/common/content_client.h" -#include "third_party/mojo/src/mojo/public/js/constants.h" +#include "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 70b6c067ecb88e..3f5a6de8118d98 100644 --- a/content/browser/webui/web_ui_mojo_browsertest.cc +++ b/content/browser/webui/web_ui_mojo_browsertest.cc @@ -26,11 +26,11 @@ #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/public/cpp/bindings/binding.h" +#include "mojo/public/cpp/bindings/interface_request.h" +#include "mojo/public/js/constants.h" #include "mojo/test/test_utils.h" #include "net/test/embedded_test_server/embedded_test_server.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.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/background_sync/background_sync_type_converters.h b/content/child/background_sync/background_sync_type_converters.h index d29d3408870f5e..0cf12a1eca0acb 100644 --- a/content/child/background_sync/background_sync_type_converters.h +++ b/content/child/background_sync/background_sync_type_converters.h @@ -8,10 +8,10 @@ #include "base/memory/scoped_ptr.h" #include "content/common/background_sync_service.mojom.h" #include "content/common/content_export.h" +#include "mojo/public/cpp/bindings/type_converter.h" #include "third_party/WebKit/public/platform/modules/background_sync/WebSyncError.h" #include "third_party/WebKit/public/platform/modules/background_sync/WebSyncRegistration.h" #include "third_party/WebKit/public/web/modules/serviceworker/WebServiceWorkerContextProxy.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/type_converter.h" namespace mojo { diff --git a/content/child/mojo/mojo_application.cc b/content/child/mojo/mojo_application.cc index fc2e989723aa77..aa85a478302885 100644 --- a/content/child/mojo/mojo_application.cc +++ b/content/child/mojo/mojo_application.cc @@ -9,7 +9,7 @@ #include "content/common/mojo/channel_init.h" #include "content/common/mojo/mojo_messages.h" #include "ipc/ipc_message.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_ptr.h" +#include "mojo/public/cpp/bindings/interface_ptr.h" namespace content { diff --git a/content/child/mojo/type_converters.h b/content/child/mojo/type_converters.h index 37a5e5a523a1b1..66b5fa0c34374d 100644 --- a/content/child/mojo/type_converters.h +++ b/content/child/mojo/type_converters.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "mojo/public/cpp/bindings/array.h" #include "third_party/WebKit/public/platform/WebVector.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/array.h" namespace mojo { diff --git a/content/child/navigator_connect/service_port_dispatcher_impl.h b/content/child/navigator_connect/service_port_dispatcher_impl.h index a03ae71812911a..ef0754077d0b9e 100644 --- a/content/child/navigator_connect/service_port_dispatcher_impl.h +++ b/content/child/navigator_connect/service_port_dispatcher_impl.h @@ -9,7 +9,7 @@ #include "base/memory/weak_ptr.h" #include "content/common/service_port_service.mojom.h" #include "content/public/child/worker_thread.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" +#include "mojo/public/cpp/bindings/strong_binding.h" namespace blink { class WebServiceWorkerContextProxy; diff --git a/content/child/navigator_connect/service_port_provider.h b/content/child/navigator_connect/service_port_provider.h index be2ce937bf9460..eb68b10d3f4f59 100644 --- a/content/child/navigator_connect/service_port_provider.h +++ b/content/child/navigator_connect/service_port_provider.h @@ -10,8 +10,8 @@ #include "base/memory/ref_counted.h" #include "content/child/worker_task_runner.h" #include "content/common/service_port_service.mojom.h" +#include "mojo/public/cpp/bindings/binding.h" #include "third_party/WebKit/public/platform/modules/navigator_services/WebServicePortProvider.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" class GURL; diff --git a/content/child/process_control_impl.h b/content/child/process_control_impl.h index 02e2ecb061519e..f3756ac2257b1b 100644 --- a/content/child/process_control_impl.h +++ b/content/child/process_control_impl.h @@ -10,7 +10,7 @@ #include "base/macros.h" #include "content/common/process_control.mojom.h" #include "mojo/application/public/interfaces/application.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h" +#include "mojo/public/cpp/bindings/interface_request.h" class GURL; diff --git a/content/child/web_data_consumer_handle_impl.cc b/content/child/web_data_consumer_handle_impl.cc index fff3110ce801b7..b61d7586813484 100644 --- a/content/child/web_data_consumer_handle_impl.cc +++ b/content/child/web_data_consumer_handle_impl.cc @@ -7,7 +7,7 @@ #include #include "base/bind.h" #include "base/logging.h" -#include "third_party/mojo/src/mojo/public/c/system/types.h" +#include "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 ca87864f61b9dc..4823f835f648eb 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/message_pump/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 53a0bc5cd1dde0..ee6680ca484eff 100644 --- a/content/child/web_data_consumer_handle_impl_unittest.cc +++ b/content/child/web_data_consumer_handle_impl_unittest.cc @@ -14,8 +14,8 @@ #include "base/synchronization/waitable_event.h" #include "base/thread_task_runner_handle.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/common/BUILD.gn b/content/common/BUILD.gn index 8444df448bb0d0..2b9778ba3f973c 100644 --- a/content/common/BUILD.gn +++ b/content/common/BUILD.gn @@ -5,7 +5,7 @@ import("//build/config/features.gni") import("//build/config/ui.gni") import("//content/common/common.gni") -import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") +import("//mojo/public/tools/bindings/mojom.gni") if (is_mac) { import("//build/config/mac/mac_sdk.gni") } diff --git a/content/common/mojo/channel_init.h b/content/common/mojo/channel_init.h index 6a9f5bfc19c821..5ce96dbe35a63b 100644 --- a/content/common/mojo/channel_init.h +++ b/content/common/mojo/channel_init.h @@ -10,8 +10,8 @@ #include "base/memory/weak_ptr.h" #include "content/common/content_export.h" #include "ipc/mojo/scoped_ipc_support.h" +#include "mojo/public/cpp/system/message_pipe.h" #include "third_party/mojo/src/mojo/edk/embedder/channel_info_forward.h" -#include "third_party/mojo/src/mojo/public/cpp/system/message_pipe.h" namespace base { class TaskRunner; diff --git a/content/common/mojo/service_registry_impl.h b/content/common/mojo/service_registry_impl.h index b25ade991907b4..80f4ef065af7e0 100644 --- a/content/common/mojo/service_registry_impl.h +++ b/content/common/mojo/service_registry_impl.h @@ -15,8 +15,8 @@ #include "base/memory/weak_ptr.h" #include "content/public/common/service_registry.h" #include "mojo/application/public/interfaces/service_provider.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" -#include "third_party/mojo/src/mojo/public/cpp/system/core.h" +#include "mojo/public/cpp/bindings/binding.h" +#include "mojo/public/cpp/system/core.h" namespace content { diff --git a/content/common/service_port_type_converters.h b/content/common/service_port_type_converters.h index 5a0d4c07b7c16d..70e01f9329c925 100644 --- a/content/common/service_port_type_converters.h +++ b/content/common/service_port_type_converters.h @@ -8,7 +8,7 @@ #include "content/common/content_export.h" #include "content/common/service_port_service.mojom.h" #include "content/public/common/message_port_types.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/type_converter.h" +#include "mojo/public/cpp/bindings/type_converter.h" namespace mojo { diff --git a/content/content_resources.grd b/content/content_resources.grd index 7e87003ad5d14a..becbdca1112c0e 100644 --- a/content/content_resources.grd +++ b/content/content_resources.grd @@ -40,14 +40,14 @@ - - - - - - - - + + + + + + + + diff --git a/content/gpu/gpu_child_thread.h b/content/gpu/gpu_child_thread.h index 1fd0a1973ac31a..daa30f49c1129c 100644 --- a/content/gpu/gpu_child_thread.h +++ b/content/gpu/gpu_child_thread.h @@ -21,7 +21,7 @@ #include "content/common/gpu/x_util.h" #include "gpu/config/gpu_info.h" #include "mojo/common/weak_binding_set.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h" +#include "mojo/public/cpp/bindings/interface_request.h" #include "ui/gfx/native_widget_types.h" namespace gpu { diff --git a/content/public/android/BUILD.gn b/content/public/android/BUILD.gn index 1c59ad76c6769e..ff958e69ab1929 100644 --- a/content/public/android/BUILD.gn +++ b/content/public/android/BUILD.gn @@ -40,10 +40,10 @@ android_library("content_java") { "//media/base/android:media_java", "//media/midi:midi_java", "//mojo/android:system_java", + "//mojo/public/java:bindings", + "//mojo/public/java:system", "//net/android:net_java", "//third_party/android_tools:android_support_v13_java", - "//third_party/mojo/src/mojo/public/java:bindings", - "//third_party/mojo/src/mojo/public/java:system", "//ui/accessibility:ui_accessibility_java", "//ui/android:ui_java", "//third_party/jsr-305:jsr_305_javalib", @@ -176,13 +176,13 @@ android_library("content_javatests") { "//device/vibration:mojo_bindings_java", "//media/base/android:media_java", "//mojo/android:system_java", + "//mojo/public/interfaces/bindings/tests:test_interfaces_java", + "//mojo/public/java:bindings", + "//mojo/public/java:system", "//net/android:net_java", "//net/android:net_java_test_support", "//third_party/android_tools:android_support_v13_java", "//third_party/android_tools:legacy_http_javalib", - "//third_party/mojo/src/mojo/public/interfaces/bindings/tests:test_interfaces_java", - "//third_party/mojo/src/mojo/public/java:bindings", - "//third_party/mojo/src/mojo/public/java:system", "//ui/android:ui_java", ":content_java", ] diff --git a/content/public/browser/BUILD.gn b/content/public/browser/BUILD.gn index 5319c05e1dd0f4..89fdec11fd4b02 100644 --- a/content/public/browser/BUILD.gn +++ b/content/public/browser/BUILD.gn @@ -50,11 +50,11 @@ source_set("browser_sources") { public_deps = [ "//content/public/common:mojo_bindings", + "//mojo/public/cpp/bindings", + "//mojo/public/cpp/system", # We expose skia headers in the public API. "//skia", - "//third_party/mojo/src/mojo/public/cpp/bindings", - "//third_party/mojo/src/mojo/public/cpp/system", ] deps = [ "//content/browser", diff --git a/content/public/browser/mojo_app_connection.h b/content/public/browser/mojo_app_connection.h index ae92b1014cd295..925f751dcbd963 100644 --- a/content/public/browser/mojo_app_connection.h +++ b/content/public/browser/mojo_app_connection.h @@ -9,9 +9,9 @@ #include "base/memory/scoped_ptr.h" #include "content/common/content_export.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/message_pipe.h" +#include "mojo/public/cpp/bindings/interface_ptr.h" +#include "mojo/public/cpp/bindings/interface_request.h" +#include "mojo/public/cpp/system/message_pipe.h" class GURL; diff --git a/content/public/browser/render_view_host.h b/content/public/browser/render_view_host.h index 3b5a16898f31aa..585ec51120bbe1 100644 --- a/content/public/browser/render_view_host.h +++ b/content/public/browser/render_view_host.h @@ -10,8 +10,8 @@ #include "content/public/common/file_chooser_params.h" #include "content/public/common/page_zoom.h" #include "ipc/ipc_sender.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/BUILD.gn b/content/public/common/BUILD.gn index 193520d14c05da..63f5fa9fff551b 100644 --- a/content/public/common/BUILD.gn +++ b/content/public/common/BUILD.gn @@ -4,7 +4,7 @@ import("//build/config/features.gni") import("//content/common/common.gni") -import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") +import("//mojo/public/tools/bindings/mojom.gni") # See //content/BUILD.gn for how this works. group("common") { @@ -75,7 +75,7 @@ source_set("common_sources") { public_deps = [ "//content/common", - "//third_party/mojo/src/mojo/public/cpp/bindings", + "//mojo/public/cpp/bindings", ] deps = [ "//net", diff --git a/content/public/common/service_registry.h b/content/public/common/service_registry.h index 5365629d2e2b17..5832131631a8cb 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 "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" +#include "mojo/public/cpp/bindings/interface_ptr.h" +#include "mojo/public/cpp/bindings/interface_request.h" +#include "mojo/public/cpp/system/core.h" namespace content { diff --git a/content/public/test/test_mojo_app.h b/content/public/test/test_mojo_app.h index 965c9491f7a4e7..c37d529fe41aee 100644 --- a/content/public/test/test_mojo_app.h +++ b/content/public/test/test_mojo_app.h @@ -9,7 +9,7 @@ #include "content/public/test/test_mojo_service.mojom.h" #include "mojo/application/public/cpp/application_delegate.h" #include "mojo/application/public/cpp/interface_factory.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" +#include "mojo/public/cpp/bindings/binding.h" #include "url/gurl.h" namespace content { diff --git a/content/renderer/BUILD.gn b/content/renderer/BUILD.gn index b3bd81950dd4ab..7f56efbaddea01 100644 --- a/content/renderer/BUILD.gn +++ b/content/renderer/BUILD.gn @@ -48,6 +48,8 @@ source_set("renderer") { "//mojo/environment:chromium", "//mojo/common:url_type_converters", "//mojo/converters/geometry", + "//mojo/public/cpp/bindings", + "//mojo/public/js", "//net", "//skia", "//skia/public", @@ -56,8 +58,6 @@ source_set("renderer") { "//third_party/libjingle", "//third_party/libyuv", "//third_party/mojo/src/mojo/edk/js", - "//third_party/mojo/src/mojo/public/cpp/bindings", - "//third_party/mojo/src/mojo/public/js", "//third_party/npapi", "//third_party/WebKit/public:blink", "//third_party/widevine/cdm:version_h", diff --git a/content/renderer/background_sync/background_sync_client_impl.h b/content/renderer/background_sync/background_sync_client_impl.h index e9e36f9da5914f..18a53eebd39044 100644 --- a/content/renderer/background_sync/background_sync_client_impl.h +++ b/content/renderer/background_sync/background_sync_client_impl.h @@ -11,7 +11,7 @@ #include "base/macros.h" #include "content/common/background_sync_service.mojom.h" #include "content/common/content_export.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" +#include "mojo/public/cpp/bindings/strong_binding.h" namespace content { diff --git a/content/renderer/image_downloader/image_downloader_impl.h b/content/renderer/image_downloader/image_downloader_impl.h index 1dba6d25e57938..828c72db556407 100644 --- a/content/renderer/image_downloader/image_downloader_impl.h +++ b/content/renderer/image_downloader/image_downloader_impl.h @@ -10,7 +10,7 @@ #include "base/memory/scoped_vector.h" #include "content/common/image_downloader/image_downloader.mojom.h" #include "content/public/renderer/render_frame_observer.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" +#include "mojo/public/cpp/bindings/strong_binding.h" #include "url/gurl.h" class SkBitmap; diff --git a/content/renderer/mojo/service_registry_js_wrapper.h b/content/renderer/mojo/service_registry_js_wrapper.h index fa0eee9704c0bd..2be7f9557b8a15 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 "third_party/mojo/src/mojo/public/cpp/system/core.h" +#include "mojo/public/cpp/system/core.h" namespace content { diff --git a/content/renderer/presentation/presentation_dispatcher.h b/content/renderer/presentation/presentation_dispatcher.h index 7311329a1fb14d..56c88f36ea6104 100644 --- a/content/renderer/presentation/presentation_dispatcher.h +++ b/content/renderer/presentation/presentation_dispatcher.h @@ -15,8 +15,8 @@ #include "content/common/content_export.h" #include "content/common/presentation/presentation_service.mojom.h" #include "content/public/renderer/render_frame_observer.h" +#include "mojo/public/cpp/bindings/binding.h" #include "third_party/WebKit/public/platform/modules/presentation/WebPresentationClient.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" namespace blink { class WebPresentationAvailabilityObserver; diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc index 9290b23071d5d9..d92ca9a1aadae2 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc @@ -200,7 +200,7 @@ #include "media/mojo/services/mojo_cdm_factory.h" #include "mojo/application/public/cpp/connect.h" #include "mojo/application/public/interfaces/shell.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h" +#include "mojo/public/cpp/bindings/interface_request.h" #endif #if defined(ENABLE_MOJO_MEDIA) && !defined(ENABLE_MEDIA_PIPELINE_ON_ANDROID) diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc index 45158366499e8e..407952e566f226 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc @@ -130,6 +130,7 @@ #include "media/base/media.h" #include "media/renderers/gpu_video_accelerator_factories.h" #include "mojo/common/common_type_converters.h" +#include "mojo/public/cpp/bindings/strong_binding.h" #include "net/base/net_errors.h" #include "net/base/net_util.h" #include "net/base/port_util.h" @@ -152,7 +153,6 @@ #include "third_party/WebKit/public/web/WebSecurityPolicy.h" #include "third_party/WebKit/public/web/WebView.h" #include "third_party/icu/source/i18n/unicode/timezone.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" #include "third_party/skia/include/core/SkGraphics.h" #include "ui/base/layout.h" #include "ui/base/ui_base_switches.h" diff --git a/content/renderer/usb/type_converters.h b/content/renderer/usb/type_converters.h index cb8890d97090dc..0ec030a95f7ca2 100644 --- a/content/renderer/usb/type_converters.h +++ b/content/renderer/usb/type_converters.h @@ -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 "third_party/mojo/src/mojo/public/cpp/bindings/type_converter.h" +#include "mojo/public/cpp/bindings/type_converter.h" #include "device/devices_app/usb/public/interfaces/device.mojom.h" #include "device/devices_app/usb/public/interfaces/device_manager.mojom.h" diff --git a/content/renderer/usb/web_usb_client_impl.cc b/content/renderer/usb/web_usb_client_impl.cc index 5ece47176831e8..33d7f37fde8eff 100644 --- a/content/renderer/usb/web_usb_client_impl.cc +++ b/content/renderer/usb/web_usb_client_impl.cc @@ -14,14 +14,14 @@ #include "content/public/common/service_registry.h" #include "content/renderer/usb/type_converters.h" #include "content/renderer/usb/web_usb_device_impl.h" +#include "mojo/public/cpp/bindings/array.h" +#include "mojo/public/cpp/bindings/interface_request.h" #include "third_party/WebKit/public/platform/WebCallbacks.h" #include "third_party/WebKit/public/platform/WebPassOwnPtr.h" #include "third_party/WebKit/public/platform/modules/webusb/WebUSBDeviceFilter.h" #include "third_party/WebKit/public/platform/modules/webusb/WebUSBDeviceInfo.h" #include "third_party/WebKit/public/platform/modules/webusb/WebUSBDeviceRequestOptions.h" #include "third_party/WebKit/public/platform/modules/webusb/WebUSBError.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/array.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h" namespace content { diff --git a/content/renderer/web_ui_mojo.h b/content/renderer/web_ui_mojo.h index 769722ece0170b..5688ec97e9b1f5 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 "third_party/mojo/src/mojo/public/cpp/system/core.h" +#include "mojo/public/cpp/system/core.h" namespace gin { class PerContextData; diff --git a/content/shell/android/BUILD.gn b/content/shell/android/BUILD.gn index e51f9eb087cbdb..d3cc62415fab00 100644 --- a/content/shell/android/BUILD.gn +++ b/content/shell/android/BUILD.gn @@ -45,8 +45,8 @@ android_library("content_shell_java") { "//base:base_java", "//content/public/android:content_java", "//media/base/android:media_java", + "//mojo/public/java:system", "//net/android:net_java", - "//third_party/mojo/src/mojo/public/java:system", "//ui/android:ui_java", ":content_shell_java_resources", ] diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn index 66c6539f41a599..503aee2d7ba6ff 100644 --- a/content/test/BUILD.gn +++ b/content/test/BUILD.gn @@ -8,8 +8,8 @@ import("//build/config/features.gni") import("//build/config/ui.gni") import("//build_overrides/v8.gni") import("//media/media_options.gni") +import("//mojo/public/tools/bindings/mojom.gni") import("//testing/test.gni") -import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") content_tests_gypi_values = exec_script("//build/gypi_to_gn.py", @@ -378,6 +378,8 @@ test("content_browsertests") { "//media:shared_memory_support", "//mojo/application/public/cpp:cpp_for_chromium", "//mojo/environment:chromium", + "//mojo/public/cpp/bindings", + "//mojo/public/js", "//mojo/test:test_support", "//net:test_support", "//ppapi/host", @@ -386,8 +388,6 @@ test("content_browsertests") { "//ppapi/shared_impl", "//third_party/mojo/src/mojo/edk/system", "//third_party/mojo/src/mojo/edk/test:test_support", - "//third_party/mojo/src/mojo/public/cpp/bindings", - "//third_party/mojo/src/mojo/public/js", "//testing/gmock", "//testing/gtest", "//third_party/WebKit/public:blink", @@ -568,6 +568,7 @@ test("content_unittests") { "//device/battery", "//device/battery:mojo_bindings", "//mojo/environment:chromium", + "//mojo/public/cpp/bindings", "//net:extras", "//net:test_support", "//skia", @@ -576,7 +577,6 @@ test("content_unittests") { "//testing/gmock", "//testing/gtest", "//third_party/mojo/src/mojo/edk/test:test_support", - "//third_party/mojo/src/mojo/public/cpp/bindings", "//third_party/re2", "//ui/accessibility", "//ui/base", diff --git a/content/utility/BUILD.gn b/content/utility/BUILD.gn index 4c7f49d4d4ac12..65012ac1ca11ff 100644 --- a/content/utility/BUILD.gn +++ b/content/utility/BUILD.gn @@ -25,9 +25,9 @@ source_set("utility") { "//mojo/application/public/cpp:cpp_for_chromium", "//mojo/application/public/interfaces", "//mojo/common", + "//mojo/public/cpp/bindings", "//mojo/shell", "//third_party/WebKit/public:blink_headers", - "//third_party/mojo/src/mojo/public/cpp/bindings", "//url", ] diff --git a/device/BUILD.gn b/device/BUILD.gn index 0a61c72c8d7232..467f781b77f92b 100644 --- a/device/BUILD.gn +++ b/device/BUILD.gn @@ -63,11 +63,11 @@ test("device_unittests") { "//device/bluetooth:mocks", "//device/nfc", "//mojo/environment:chromium", + "//mojo/public/cpp/bindings", "//net", "//testing/gmock", "//testing/gtest", "//third_party/mojo/src/mojo/edk/system", - "//third_party/mojo/src/mojo/public/cpp/bindings", "//url", ] diff --git a/device/DEPS b/device/DEPS index f398914b5c4c56..428c8df8c5fea6 100644 --- a/device/DEPS +++ b/device/DEPS @@ -1,6 +1,6 @@ include_rules = [ "+chromeos", "+components/device_event_log", - "+third_party/mojo/src/mojo/public", + "+mojo/public", "+third_party/ocmock", ] diff --git a/device/battery/BUILD.gn b/device/battery/BUILD.gn index 6eab81342c5bb1..17cd64d8ce4364 100644 --- a/device/battery/BUILD.gn +++ b/device/battery/BUILD.gn @@ -3,7 +3,7 @@ # found in the LICENSE file. import("//build/config/features.gni") -import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") +import("//mojo/public/tools/bindings/mojom.gni") # On android, BatteryManager mojo service is implemented directly in Java. if (!is_android) { @@ -32,7 +32,7 @@ if (!is_android) { "//base", "//base/third_party/dynamic_annotations", "//mojo/environment:chromium", - "//third_party/mojo/src/mojo/public/cpp/bindings", + "//mojo/public/cpp/bindings", "//third_party/mojo/src/mojo/edk/system", ] diff --git a/device/battery/android/BUILD.gn b/device/battery/android/BUILD.gn index 503a10c5f32db9..997c9b4d0df1a9 100644 --- a/device/battery/android/BUILD.gn +++ b/device/battery/android/BUILD.gn @@ -15,8 +15,8 @@ android_library("battery_monitor_android") { deps = [ "//base:base_java", "//device/battery:mojo_bindings_java", + "//mojo/public/java:bindings", + "//mojo/public/java:system", "//third_party/jsr-305:jsr_305_javalib", - "//third_party/mojo/src/mojo/public/java:bindings", - "//third_party/mojo/src/mojo/public/java:system", ] } diff --git a/device/battery/battery_monitor_impl.h b/device/battery/battery_monitor_impl.h index 6bf65f73f27f2a..8d7a67feb6b4cb 100644 --- a/device/battery/battery_monitor_impl.h +++ b/device/battery/battery_monitor_impl.h @@ -9,7 +9,7 @@ #include "device/battery/battery_export.h" #include "device/battery/battery_monitor.mojom.h" #include "device/battery/battery_status_service.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" +#include "mojo/public/cpp/bindings/strong_binding.h" namespace device { diff --git a/device/devices_app/BUILD.gn b/device/devices_app/BUILD.gn index cccad127f98cea..3b13142c4af97d 100644 --- a/device/devices_app/BUILD.gn +++ b/device/devices_app/BUILD.gn @@ -20,9 +20,9 @@ source_set("lib") { "//device/core", "//device/devices_app/usb/public/interfaces", "//device/usb", + "//mojo/public/cpp/bindings", + "//mojo/public/cpp/bindings:callback", "//net", - "//third_party/mojo/src/mojo/public/cpp/bindings", - "//third_party/mojo/src/mojo/public/cpp/bindings:callback", "//url", ] diff --git a/device/devices_app/devices_app.cc b/device/devices_app/devices_app.cc index 134948d9c9229b..6e9cc9f18c0e4d 100644 --- a/device/devices_app/devices_app.cc +++ b/device/devices_app/devices_app.cc @@ -16,7 +16,7 @@ #include "device/usb/usb_service.h" #include "mojo/application/public/cpp/application_connection.h" #include "mojo/application/public/cpp/application_impl.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h" +#include "mojo/public/cpp/bindings/interface_request.h" #include "url/gurl.h" namespace device { diff --git a/device/devices_app/main.cc b/device/devices_app/main.cc index b828750c15d6b5..3541552359a2e2 100644 --- a/device/devices_app/main.cc +++ b/device/devices_app/main.cc @@ -6,7 +6,7 @@ #include "device/devices_app/public/cpp/devices_app_factory.h" #include "mojo/application/public/cpp/application_delegate.h" #include "mojo/application/public/cpp/application_runner.h" -#include "third_party/mojo/src/mojo/public/c/system/main.h" +#include "mojo/public/c/system/main.h" MojoResult MojoMain(MojoHandle shell_handle) { mojo::ApplicationRunner runner( diff --git a/device/devices_app/usb/device_impl.h b/device/devices_app/usb/device_impl.h index c552e82dc29fb9..ffaf5c8ea201e9 100644 --- a/device/devices_app/usb/device_impl.h +++ b/device/devices_app/usb/device_impl.h @@ -12,9 +12,9 @@ #include "device/devices_app/usb/public/interfaces/device.mojom.h" #include "device/devices_app/usb/public/interfaces/permission_provider.mojom.h" #include "device/usb/usb_device_handle.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/callback.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h" +#include "mojo/public/cpp/bindings/binding.h" +#include "mojo/public/cpp/bindings/callback.h" +#include "mojo/public/cpp/bindings/interface_request.h" namespace net { class IOBuffer; diff --git a/device/devices_app/usb/device_impl_unittest.cc b/device/devices_app/usb/device_impl_unittest.cc index 2b4191253d8820..a7147bc51e4e0f 100644 --- a/device/devices_app/usb/device_impl_unittest.cc +++ b/device/devices_app/usb/device_impl_unittest.cc @@ -16,8 +16,8 @@ #include "device/devices_app/usb/fake_permission_provider.h" #include "device/usb/mock_usb_device.h" #include "device/usb/mock_usb_device_handle.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/interface_request.h" using ::testing::Invoke; using ::testing::_; diff --git a/device/devices_app/usb/device_manager_impl.cc b/device/devices_app/usb/device_manager_impl.cc index 25fcd751fba13d..423ce296ec08ec 100644 --- a/device/devices_app/usb/device_manager_impl.cc +++ b/device/devices_app/usb/device_manager_impl.cc @@ -15,8 +15,8 @@ #include "device/usb/usb_device.h" #include "device/usb/usb_device_filter.h" #include "device/usb/usb_service.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 device { namespace usb { diff --git a/device/devices_app/usb/device_manager_impl.h b/device/devices_app/usb/device_manager_impl.h index 24013036b7c4bc..a09799999104c9 100644 --- a/device/devices_app/usb/device_manager_impl.h +++ b/device/devices_app/usb/device_manager_impl.h @@ -17,9 +17,9 @@ #include "device/devices_app/usb/public/interfaces/device_manager.mojom.h" #include "device/devices_app/usb/public/interfaces/permission_provider.mojom.h" #include "device/usb/usb_service.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/array.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.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/binding.h" +#include "mojo/public/cpp/bindings/interface_request.h" namespace base { class SequencedTaskRunner; diff --git a/device/devices_app/usb/fake_permission_provider.h b/device/devices_app/usb/fake_permission_provider.h index 738ecbc377ace2..078c26767067b7 100644 --- a/device/devices_app/usb/fake_permission_provider.h +++ b/device/devices_app/usb/fake_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 device { namespace usb { diff --git a/device/devices_app/usb/public/interfaces/BUILD.gn b/device/devices_app/usb/public/interfaces/BUILD.gn index 0b3ad9aefa7c88..f9d6e0c904fb53 100644 --- a/device/devices_app/usb/public/interfaces/BUILD.gn +++ b/device/devices_app/usb/public/interfaces/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") +import("//mojo/public/tools/bindings/mojom.gni") mojom("interfaces") { sources = [ diff --git a/device/devices_app/usb/type_converters.cc b/device/devices_app/usb/type_converters.cc index 2dc2edabfdb7c6..2e14e4f229e5ea 100644 --- a/device/devices_app/usb/type_converters.cc +++ b/device/devices_app/usb/type_converters.cc @@ -11,7 +11,7 @@ #include "base/strings/utf_string_conversions.h" #include "device/usb/usb_device.h" #include "mojo/common/url_type_converters.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/array.h" +#include "mojo/public/cpp/bindings/array.h" namespace mojo { diff --git a/device/devices_app/usb/type_converters.h b/device/devices_app/usb/type_converters.h index a721c675c3b7d2..c220178103e833 100644 --- a/device/devices_app/usb/type_converters.h +++ b/device/devices_app/usb/type_converters.h @@ -13,8 +13,8 @@ #include "device/usb/usb_device_filter.h" #include "device/usb/usb_device_handle.h" #include "device/usb/webusb_descriptors.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/array.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/type_converter.h" +#include "mojo/public/cpp/bindings/array.h" +#include "mojo/public/cpp/bindings/type_converter.h" // Type converters to convert objects between internal device/usb data types and // public Mojo interface data types. diff --git a/device/serial/BUILD.gn b/device/serial/BUILD.gn index fab490e29bc3b1..1ee6c5fe5b72af 100644 --- a/device/serial/BUILD.gn +++ b/device/serial/BUILD.gn @@ -3,7 +3,7 @@ # found in the LICENSE file. import("//build/config/features.gni") -import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") +import("//mojo/public/tools/bindings/mojom.gni") # GYP version: device/serial/serial.gyp:device_serial static_library("serial") { @@ -47,7 +47,7 @@ static_library("serial") { "//base", ] deps = [ - "//third_party/mojo/src/mojo/public/cpp/system", + "//mojo/public/cpp/system", "//third_party/re2", ] diff --git a/device/serial/data_receiver.h b/device/serial/data_receiver.h index 0eba0a2ebb8a57..622e366079d220 100644 --- a/device/serial/data_receiver.h +++ b/device/serial/data_receiver.h @@ -13,8 +13,8 @@ #include "base/memory/weak_ptr.h" #include "device/serial/buffer.h" #include "device/serial/data_stream.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" -#include "third_party/mojo/src/mojo/public/cpp/system/data_pipe.h" +#include "mojo/public/cpp/bindings/binding.h" +#include "mojo/public/cpp/system/data_pipe.h" namespace device { diff --git a/device/serial/data_sender.h b/device/serial/data_sender.h index 5c46c35ebdaa4a..435f69984648d9 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 "third_party/mojo/src/mojo/public/cpp/system/data_pipe.h" +#include "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 733b0a1b56b528..dfba84855d8cd2 100644 --- a/device/serial/data_sink_receiver.h +++ b/device/serial/data_sink_receiver.h @@ -13,8 +13,8 @@ #include "base/memory/weak_ptr.h" #include "device/serial/buffer.h" #include "device/serial/data_stream.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" -#include "third_party/mojo/src/mojo/public/cpp/system/data_pipe.h" +#include "mojo/public/cpp/bindings/binding.h" +#include "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 539cb6d427648c..6661fefb7a26cc 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 160dec91d1d20b..6c9748a60ee9fe 100644 --- a/device/serial/data_source_sender.h +++ b/device/serial/data_source_sender.h @@ -12,8 +12,8 @@ #include "base/memory/weak_ptr.h" #include "device/serial/buffer.h" #include "device/serial/data_stream.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" -#include "third_party/mojo/src/mojo/public/cpp/system/data_pipe.h" +#include "mojo/public/cpp/bindings/binding.h" +#include "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 b725f35e8d0876..4a87a77ca405a8 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 22f48bfeedb474..47fb52d9866e3c 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 "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" +#include "mojo/public/cpp/bindings/strong_binding.h" namespace device { diff --git a/device/serial/serial_connection_factory.h b/device/serial/serial_connection_factory.h index 6d22fffb682b18..a7c1b77d6f7eba 100644 --- a/device/serial/serial_connection_factory.h +++ b/device/serial/serial_connection_factory.h @@ -13,7 +13,7 @@ #include "base/thread_task_runner_handle.h" #include "device/serial/data_stream.mojom.h" #include "device/serial/serial.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h" +#include "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 552bb3afda2681..929d39e9d0cb86 100644 --- a/device/serial/serial_connection_unittest.cc +++ b/device/serial/serial_connection_unittest.cc @@ -15,9 +15,9 @@ #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/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/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 eeae615d951793..77e2ae5d6c85dd 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 "third_party/mojo/src/mojo/public/cpp/bindings/array.h" +#include "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 09f2fd08c0683d..53d04f1589d964 100644 --- a/device/serial/serial_service_impl.h +++ b/device/serial/serial_service_impl.h @@ -12,7 +12,7 @@ #include "device/serial/serial.mojom.h" #include "device/serial/serial_connection_factory.h" #include "device/serial/serial_device_enumerator.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" +#include "mojo/public/cpp/bindings/strong_binding.h" namespace device { diff --git a/device/serial/serial_service_unittest.cc b/device/serial/serial_service_unittest.cc index 5c3a8845924125..80cf9cc6786242 100644 --- a/device/serial/serial_service_unittest.cc +++ b/device/serial/serial_service_unittest.cc @@ -8,9 +8,9 @@ #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/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/interface_ptr.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h" namespace device { namespace { diff --git a/device/vibration/BUILD.gn b/device/vibration/BUILD.gn index ed046c24a2f354..0f54123424a220 100644 --- a/device/vibration/BUILD.gn +++ b/device/vibration/BUILD.gn @@ -3,7 +3,7 @@ # found in the LICENSE file. import("//build/config/features.gni") -import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") +import("//mojo/public/tools/bindings/mojom.gni") component("vibration") { output_name = "device_vibration" @@ -21,7 +21,7 @@ component("vibration") { "//base", "//base/third_party/dynamic_annotations", "//mojo/environment:chromium", - "//third_party/mojo/src/mojo/public/cpp/bindings", + "//mojo/public/cpp/bindings", "//third_party/mojo/src/mojo/edk/system", ] diff --git a/device/vibration/android/BUILD.gn b/device/vibration/android/BUILD.gn index f7640af353284e..4853ead7700cbe 100644 --- a/device/vibration/android/BUILD.gn +++ b/device/vibration/android/BUILD.gn @@ -12,7 +12,7 @@ android_library("vibration_manager_android") { deps = [ "//base:base_java", "//device/vibration:mojo_bindings_java", - "//third_party/mojo/src/mojo/public/java:bindings", - "//third_party/mojo/src/mojo/public/java:system", + "//mojo/public/java:bindings", + "//mojo/public/java:system", ] } diff --git a/device/vibration/vibration_manager_impl_default.cc b/device/vibration/vibration_manager_impl_default.cc index 12917226c425f0..7661827162da7e 100644 --- a/device/vibration/vibration_manager_impl_default.cc +++ b/device/vibration/vibration_manager_impl_default.cc @@ -5,7 +5,7 @@ #include "device/vibration/vibration_manager_impl.h" #include "base/basictypes.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" +#include "mojo/public/cpp/bindings/strong_binding.h" namespace device { diff --git a/extensions/BUILD.gn b/extensions/BUILD.gn index f84121f82ecfed..9aa1ca3ebbce90 100644 --- a/extensions/BUILD.gn +++ b/extensions/BUILD.gn @@ -193,12 +193,12 @@ test("extensions_unittests") { "//extensions/utility", "//mojo/application/public/interfaces", "//mojo/environment:chromium", + "//mojo/public/cpp/bindings", "//testing/gmock", "//testing/gtest", "//third_party/leveldatabase", "//third_party/mojo/src/mojo/edk/js", "//third_party/mojo/src/mojo/edk/system", - "//third_party/mojo/src/mojo/public/cpp/bindings", ] data_deps = [ @@ -262,11 +262,11 @@ test("extensions_browsertests") { "//device/bluetooth:mocks", "//device/usb:mocks", "//mojo/environment:chromium", + "//mojo/public/cpp/bindings", "//testing/gmock", "//testing/gtest", "//third_party/mojo/src/mojo/edk/js", "//third_party/mojo/src/mojo/edk/system", - "//third_party/mojo/src/mojo/public/cpp/bindings", ] data_deps = [ diff --git a/extensions/DEPS b/extensions/DEPS index cbab94891c7ee8..ebf4915b7c0179 100644 --- a/extensions/DEPS +++ b/extensions/DEPS @@ -13,8 +13,8 @@ include_rules = [ "+extensions/test", "+grit/extensions_renderer_resources.h", "+grit/extensions_resources.h", + "+mojo/public", "+testing", - "+third_party/mojo/src/mojo/public", "+third_party/skia/include", # Minimal UI dependencies. There are two good rules for UI dependencies here: 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 2f4c1967dc7b6a..5a855d231dc77a 100644 --- a/extensions/browser/api/mime_handler_private/mime_handler_private.cc +++ b/extensions/browser/api/mime_handler_private/mime_handler_private.cc @@ -10,8 +10,8 @@ #include "content/public/common/content_constants.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/api/mime_handler_private/mime_handler_private.h b/extensions/browser/api/mime_handler_private/mime_handler_private.h index 62c462868ce44b..15e34e8117af6e 100644 --- a/extensions/browser/api/mime_handler_private/mime_handler_private.h +++ b/extensions/browser/api/mime_handler_private/mime_handler_private.h @@ -7,7 +7,7 @@ #include "base/memory/weak_ptr.h" #include "extensions/common/api/mime_handler.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" +#include "mojo/public/cpp/bindings/strong_binding.h" namespace extensions { class StreamContainer; diff --git a/extensions/browser/mojo/keep_alive_impl.h b/extensions/browser/mojo/keep_alive_impl.h index df365f33da2611..66127944725330 100644 --- a/extensions/browser/mojo/keep_alive_impl.h +++ b/extensions/browser/mojo/keep_alive_impl.h @@ -9,8 +9,8 @@ #include "base/scoped_observer.h" #include "extensions/browser/extension_registry_observer.h" #include "extensions/common/mojo/keep_alive.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" +#include "mojo/public/cpp/bindings/interface_request.h" +#include "mojo/public/cpp/bindings/strong_binding.h" namespace content { class BrowserContext; diff --git a/extensions/browser/mojo/stash_backend.cc b/extensions/browser/mojo/stash_backend.cc index 5bab69c3ef832e..74f4bfc684bf17 100644 --- a/extensions/browser/mojo/stash_backend.cc +++ b/extensions/browser/mojo/stash_backend.cc @@ -5,8 +5,8 @@ #include "extensions/browser/mojo/stash_backend.h" #include "base/bind.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" -#include "third_party/mojo/src/mojo/public/cpp/environment/async_waiter.h" +#include "mojo/public/cpp/bindings/strong_binding.h" +#include "mojo/public/cpp/environment/async_waiter.h" namespace extensions { namespace { diff --git a/extensions/browser/mojo/stash_backend.h b/extensions/browser/mojo/stash_backend.h index abd0e269fc69b8..27f17a612aa7ae 100644 --- a/extensions/browser/mojo/stash_backend.h +++ b/extensions/browser/mojo/stash_backend.h @@ -9,7 +9,7 @@ #include "base/memory/scoped_vector.h" #include "base/memory/weak_ptr.h" #include "extensions/common/mojo/stash.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h" +#include "mojo/public/cpp/bindings/interface_request.h" namespace extensions { diff --git a/extensions/common/BUILD.gn b/extensions/common/BUILD.gn index 0d311f62a92a26..a62d1d0c98301f 100644 --- a/extensions/common/BUILD.gn +++ b/extensions/common/BUILD.gn @@ -4,7 +4,7 @@ import("//build/config/features.gni") import("//extensions/extensions.gni") -import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") +import("//mojo/public/tools/bindings/mojom.gni") # GYP version: extensions/extensions.gyp:extensions_common_constants source_set("common_constants") { diff --git a/extensions/common/api/BUILD.gn b/extensions/common/api/BUILD.gn index b589fd23ee1378..0cbce18b836e46 100644 --- a/extensions/common/api/BUILD.gn +++ b/extensions/common/api/BUILD.gn @@ -4,7 +4,7 @@ import("//build/config/features.gni") import("//build/json_schema_api.gni") -import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") +import("//mojo/public/tools/bindings/mojom.gni") import("schemas.gni") assert(enable_extensions) diff --git a/extensions/renderer/BUILD.gn b/extensions/renderer/BUILD.gn index ee300caeff7932..7ed31fea64b70b 100644 --- a/extensions/renderer/BUILD.gn +++ b/extensions/renderer/BUILD.gn @@ -26,9 +26,9 @@ source_set("renderer") { "//content:resources", "//extensions:extensions_resources", "//gin", + "//mojo/public/js", "//skia", "//third_party/WebKit/public:blink", "//third_party/mojo/src/mojo/edk/js", - "//third_party/mojo/src/mojo/public/js", ] } diff --git a/extensions/renderer/api_test_base.cc b/extensions/renderer/api_test_base.cc index 03158926eb457c..75c6d5df339c8b 100644 --- a/extensions/renderer/api_test_base.cc +++ b/extensions/renderer/api_test_base.cc @@ -12,11 +12,11 @@ #include "extensions/renderer/process_info_native_handler.h" #include "gin/converter.h" #include "gin/dictionary.h" +#include "mojo/public/cpp/bindings/interface_request.h" +#include "mojo/public/cpp/system/core.h" #include "third_party/mojo/src/mojo/edk/js/core.h" #include "third_party/mojo/src/mojo/edk/js/handle.h" #include "third_party/mojo/src/mojo/edk/js/support.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h" -#include "third_party/mojo/src/mojo/public/cpp/system/core.h" namespace extensions { namespace { diff --git a/extensions/renderer/api_test_base.h b/extensions/renderer/api_test_base.h index 9e6feab4474e43..ed53280115c1c0 100644 --- a/extensions/renderer/api_test_base.h +++ b/extensions/renderer/api_test_base.h @@ -17,9 +17,9 @@ #include "gin/modules/module_registry.h" #include "gin/object_template_builder.h" #include "gin/wrappable.h" +#include "mojo/public/cpp/bindings/interface_request.h" +#include "mojo/public/cpp/system/core.h" #include "third_party/mojo/src/mojo/edk/js/handle.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h" -#include "third_party/mojo/src/mojo/public/cpp/system/core.h" namespace extensions { diff --git a/extensions/renderer/dispatcher.cc b/extensions/renderer/dispatcher.cc index 7f3a28f9c9eb59..aa6019626da768 100644 --- a/extensions/renderer/dispatcher.cc +++ b/extensions/renderer/dispatcher.cc @@ -93,6 +93,7 @@ #include "extensions/renderer/wake_event_page.h" #include "extensions/renderer/worker_script_context_set.h" #include "grit/extensions_renderer_resources.h" +#include "mojo/public/js/constants.h" #include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/public/platform/WebURLRequest.h" #include "third_party/WebKit/public/web/WebCustomElement.h" @@ -104,7 +105,6 @@ #include "third_party/WebKit/public/web/WebScopedUserGesture.h" #include "third_party/WebKit/public/web/WebSecurityPolicy.h" #include "third_party/WebKit/public/web/WebView.h" -#include "third_party/mojo/src/mojo/public/js/constants.h" #include "ui/base/layout.h" #include "ui/base/resource/resource_bundle.h" #include "v8/include/v8.h" diff --git a/extensions/renderer/mojo/keep_alive_client_unittest.cc b/extensions/renderer/mojo/keep_alive_client_unittest.cc index ae170b6c70df7a..391d03b4808d49 100644 --- a/extensions/renderer/mojo/keep_alive_client_unittest.cc +++ b/extensions/renderer/mojo/keep_alive_client_unittest.cc @@ -5,7 +5,7 @@ #include "extensions/common/mojo/keep_alive.mojom.h" #include "extensions/renderer/api_test_base.h" #include "grit/extensions_renderer_resources.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" +#include "mojo/public/cpp/bindings/strong_binding.h" // A test launcher for tests for the stash client defined in // extensions/test/data/keep_alive_client_unittest.js. diff --git a/extensions/renderer/mojo/stash_client_unittest.cc b/extensions/renderer/mojo/stash_client_unittest.cc index f8076cd7db1614..e92abe9abc3fac 100644 --- a/extensions/renderer/mojo/stash_client_unittest.cc +++ b/extensions/renderer/mojo/stash_client_unittest.cc @@ -9,7 +9,7 @@ #include "extensions/renderer/api_test_base.h" #include "gin/dictionary.h" #include "grit/extensions_renderer_resources.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/message_builder.h" +#include "mojo/public/cpp/bindings/lib/message_builder.h" // A test launcher for tests for the stash client defined in // extensions/test/data/stash_client_unittest.js. diff --git a/gpu/command_buffer/build_gles2_cmd_buffer.py b/gpu/command_buffer/build_gles2_cmd_buffer.py index 64cde4d7e02036..ecd79bc5226a1c 100755 --- a/gpu/command_buffer/build_gles2_cmd_buffer.py +++ b/gpu/command_buffer/build_gles2_cmd_buffer.py @@ -10540,7 +10540,7 @@ def WriteMojoGLES2ImplHeader(self, filename): "// GL api functions.\n") code = """ #include "gpu/command_buffer/client/gles2_interface.h" -#include "third_party/mojo/src/mojo/public/c/gles2/gles2.h" +#include "mojo/public/c/gles2/gles2.h" namespace mojo { @@ -10571,8 +10571,8 @@ def WriteMojoGLES2Impl(self, filename): #include "mojo/gpu/mojo_gles2_impl_autogen.h" #include "base/logging.h" -#include "third_party/mojo/src/mojo/public/c/gles2/chromium_extension.h" -#include "third_party/mojo/src/mojo/public/c/gles2/gles2.h" +#include "mojo/public/c/gles2/chromium_extension.h" +#include "mojo/public/c/gles2/gles2.h" namespace mojo { @@ -11114,8 +11114,7 @@ def main(argv): gen.WriteCommonUtilsImpl( "gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h") gen.WriteGLES2Header("gpu/GLES2/gl2chromium_autogen.h") - mojo_gles2_prefix = ("third_party/mojo/src/mojo/public/c/gles2/" - "gles2_call_visitor") + mojo_gles2_prefix = ("mojo/public/c/gles2/gles2_call_visitor") gen.WriteMojoGLCallVisitor(mojo_gles2_prefix + "_autogen.h") gen.WriteMojoGLCallVisitorForExtension( mojo_gles2_prefix + "_chromium_extension_autogen.h") diff --git a/ipc/mojo/BUILD.gn b/ipc/mojo/BUILD.gn index d801a7b9c19ca1..ead44ce547df2a 100644 --- a/ipc/mojo/BUILD.gn +++ b/ipc/mojo/BUILD.gn @@ -2,8 +2,8 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +import("//mojo/public/tools/bindings/mojom.gni") import("//testing/test.gni") -import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") mojom("client_channel") { sources = [ @@ -39,9 +39,9 @@ component("mojo") { "//base/third_party/dynamic_annotations", "//ipc", "//mojo/environment:chromium", + "//mojo/public/c/environment:environment", + "//mojo/public/cpp/bindings", "//third_party/mojo/src/mojo/edk/system", - "//third_party/mojo/src/mojo/public/c/environment:environment", - "//third_party/mojo/src/mojo/public/cpp/bindings", ":client_channel", ] } diff --git a/ipc/mojo/DEPS b/ipc/mojo/DEPS index 40dca36e2dfab8..59e80a9bf820a1 100644 --- a/ipc/mojo/DEPS +++ b/ipc/mojo/DEPS @@ -1,5 +1,5 @@ include_rules = [ "+mojo/edk/embedder", - "+third_party/mojo/src/mojo/public", + "+mojo/public", "+third_party/mojo/src/mojo/edk/embedder", ] diff --git a/ipc/mojo/async_handle_waiter.h b/ipc/mojo/async_handle_waiter.h index d6cc74510b28eb..083060e9614260 100644 --- a/ipc/mojo/async_handle_waiter.h +++ b/ipc/mojo/async_handle_waiter.h @@ -10,7 +10,7 @@ #include "base/memory/weak_ptr.h" #include "base/message_loop/message_loop.h" #include "ipc/ipc_export.h" -#include "third_party/mojo/src/mojo/public/c/system/types.h" +#include "mojo/public/c/system/types.h" namespace IPC { namespace internal { diff --git a/ipc/mojo/async_handle_waiter_unittest.cc b/ipc/mojo/async_handle_waiter_unittest.cc index 46d4c7ef73937b..494b01b5a80a99 100644 --- a/ipc/mojo/async_handle_waiter_unittest.cc +++ b/ipc/mojo/async_handle_waiter_unittest.cc @@ -9,8 +9,8 @@ #include "base/run_loop.h" #include "base/single_thread_task_runner.h" #include "base/threading/thread.h" +#include "mojo/public/cpp/system/message_pipe.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/cpp/system/message_pipe.h" namespace IPC { namespace internal { diff --git a/ipc/mojo/ipc_channel_mojo.cc b/ipc/mojo/ipc_channel_mojo.cc index 22f1ca5bc5d96f..05ce4190e97686 100644 --- a/ipc/mojo/ipc_channel_mojo.cc +++ b/ipc/mojo/ipc_channel_mojo.cc @@ -17,8 +17,8 @@ #include "ipc/mojo/ipc_mojo_bootstrap.h" #include "ipc/mojo/ipc_mojo_handle_attachment.h" #include "mojo/edk/embedder/embedder.h" +#include "mojo/public/cpp/bindings/binding.h" #include "third_party/mojo/src/mojo/edk/embedder/embedder.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" #if defined(OS_POSIX) && !defined(OS_NACL) #include "ipc/ipc_platform_file_attachment_posix.h" diff --git a/ipc/mojo/ipc_channel_mojo.h b/ipc/mojo/ipc_channel_mojo.h index 834fd420da27e6..ec583f2ce728af 100644 --- a/ipc/mojo/ipc_channel_mojo.h +++ b/ipc/mojo/ipc_channel_mojo.h @@ -17,8 +17,8 @@ #include "ipc/mojo/ipc_message_pipe_reader.h" #include "ipc/mojo/ipc_mojo_bootstrap.h" #include "ipc/mojo/scoped_ipc_support.h" +#include "mojo/public/cpp/system/core.h" #include "third_party/mojo/src/mojo/edk/embedder/channel_info_forward.h" -#include "third_party/mojo/src/mojo/public/cpp/system/core.h" namespace IPC { diff --git a/ipc/mojo/ipc_message_pipe_reader.h b/ipc/mojo/ipc_message_pipe_reader.h index b9c11c60372b04..01e4fff6d16944 100644 --- a/ipc/mojo/ipc_message_pipe_reader.h +++ b/ipc/mojo/ipc_message_pipe_reader.h @@ -12,8 +12,8 @@ #include "base/memory/scoped_ptr.h" #include "base/threading/thread_checker.h" #include "ipc/ipc_message.h" -#include "third_party/mojo/src/mojo/public/c/environment/async_waiter.h" -#include "third_party/mojo/src/mojo/public/cpp/system/core.h" +#include "mojo/public/c/environment/async_waiter.h" +#include "mojo/public/cpp/system/core.h" namespace IPC { namespace internal { diff --git a/ipc/mojo/ipc_mojo_handle_attachment.h b/ipc/mojo/ipc_mojo_handle_attachment.h index ef5a318ec72c73..2b31bf3a3f153d 100644 --- a/ipc/mojo/ipc_mojo_handle_attachment.h +++ b/ipc/mojo/ipc_mojo_handle_attachment.h @@ -8,7 +8,7 @@ #include "base/files/file.h" #include "ipc/ipc_export.h" #include "ipc/ipc_message_attachment.h" -#include "third_party/mojo/src/mojo/public/cpp/system/handle.h" +#include "mojo/public/cpp/system/handle.h" namespace IPC { diff --git a/ipc/mojo/ipc_mojo_message_helper.h b/ipc/mojo/ipc_mojo_message_helper.h index 2efa1390aee9fa..3dc840e92e379a 100644 --- a/ipc/mojo/ipc_mojo_message_helper.h +++ b/ipc/mojo/ipc_mojo_message_helper.h @@ -7,7 +7,7 @@ #include "ipc/ipc_export.h" #include "ipc/ipc_message.h" -#include "third_party/mojo/src/mojo/public/cpp/system/message_pipe.h" +#include "mojo/public/cpp/system/message_pipe.h" namespace IPC { diff --git a/ipc/mojo/ipc_mojo_param_traits.h b/ipc/mojo/ipc_mojo_param_traits.h index c735fce370de1a..f0b8b515b6fbe8 100644 --- a/ipc/mojo/ipc_mojo_param_traits.h +++ b/ipc/mojo/ipc_mojo_param_traits.h @@ -9,7 +9,7 @@ #include "ipc/ipc_export.h" #include "ipc/ipc_param_traits.h" -#include "third_party/mojo/src/mojo/public/cpp/system/message_pipe.h" +#include "mojo/public/cpp/system/message_pipe.h" namespace base { class PickleIterator; diff --git a/mandoline/app/DEPS b/mandoline/app/DEPS index 44f4e6633e4463..277a818b63fd8d 100644 --- a/mandoline/app/DEPS +++ b/mandoline/app/DEPS @@ -3,5 +3,4 @@ include_rules = [ "+mojo", "+third_party/mojo/src/mojo/edk", "-third_party/mojo/src/mojo/edk/system", - "+third_party/mojo/src/mojo/public", ] diff --git a/mandoline/services/core_services/BUILD.gn b/mandoline/services/core_services/BUILD.gn index 8e093f88998f4a..642fe6d111d8b2 100644 --- a/mandoline/services/core_services/BUILD.gn +++ b/mandoline/services/core_services/BUILD.gn @@ -45,10 +45,10 @@ source_set("sources") { "//mojo/application/public/cpp", "//mojo/logging", "//mojo/message_pump", + "//mojo/public/cpp/bindings", "//mojo/services/tracing:lib", "//mojo/services/tracing/public/cpp", "//third_party/icu", - "//third_party/mojo/src/mojo/public/cpp/bindings", "//url", ] diff --git a/mandoline/services/core_services/DEPS b/mandoline/services/core_services/DEPS index 955fdb9c8dcc7f..8e48dac24a93b3 100644 --- a/mandoline/services/core_services/DEPS +++ b/mandoline/services/core_services/DEPS @@ -9,10 +9,10 @@ include_rules = [ "+mojo/common", "+mojo/logging", "+mojo/message_pump", + "+mojo/public", "+mojo/services/network", "+mojo/services/tracing", "+net", - "+third_party/mojo/src/mojo/public", "+third_party/mojo_services/src/clipboard", "+third_party/mojo_services/src/content_handler/public", ] diff --git a/mandoline/services/core_services/main.cc b/mandoline/services/core_services/main.cc index ef8c8477a0e3a8..727ed41ec34d6a 100644 --- a/mandoline/services/core_services/main.cc +++ b/mandoline/services/core_services/main.cc @@ -4,7 +4,7 @@ #include "mandoline/services/core_services/core_services_application_delegate.h" #include "mojo/application/public/cpp/application_runner.h" -#include "third_party/mojo/src/mojo/public/c/system/main.h" +#include "mojo/public/c/system/main.h" MojoResult MojoMain(MojoHandle shell_handle) { mojo::ApplicationRunner runner( diff --git a/mandoline/services/updater/BUILD.gn b/mandoline/services/updater/BUILD.gn index 31edf861e337cf..441ec833089891 100644 --- a/mandoline/services/updater/BUILD.gn +++ b/mandoline/services/updater/BUILD.gn @@ -3,7 +3,7 @@ # found in the LICENSE file. import("//mojo/public/mojo_application.gni") -import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") +import("//mojo/public/tools/bindings/mojom.gni") mojo_native_application("updater") { sources = [ @@ -17,8 +17,8 @@ mojo_native_application("updater") { "//base", "//components/update_client", "//mojo/application/public/cpp", + "//mojo/public/cpp/system", "//mojo/services/updater", - "//third_party/mojo/src/mojo/public/cpp/system", "//url", ] } diff --git a/mandoline/services/updater/DEPS b/mandoline/services/updater/DEPS index 244d48cd7b899f..07502be4ce48c0 100644 --- a/mandoline/services/updater/DEPS +++ b/mandoline/services/updater/DEPS @@ -6,6 +6,4 @@ include_rules = [ "+mojo/public/cpp/bindings", "+mojo/services/network", "+mojo/services/updater", - "+third_party/mojo/src/mojo/public/c/system", - "+third_party/mojo/src/mojo/public/cpp/bindings", ] diff --git a/mandoline/services/updater/updater_app.cc b/mandoline/services/updater/updater_app.cc index 211b64832908c8..0a1675cde61cf4 100644 --- a/mandoline/services/updater/updater_app.cc +++ b/mandoline/services/updater/updater_app.cc @@ -9,7 +9,7 @@ #include "mojo/application/public/cpp/application_connection.h" #include "mojo/application/public/cpp/application_impl.h" #include "mojo/application/public/cpp/application_runner.h" -#include "third_party/mojo/src/mojo/public/c/system/main.h" +#include "mojo/public/c/system/main.h" namespace updater { diff --git a/mandoline/services/updater/updater_impl.h b/mandoline/services/updater/updater_impl.h index e0b3e940a30371..b8b7dbcd70aa1e 100644 --- a/mandoline/services/updater/updater_impl.h +++ b/mandoline/services/updater/updater_impl.h @@ -7,8 +7,8 @@ #include "base/macros.h" #include "mojo/application/public/cpp/application_impl.h" +#include "mojo/public/cpp/bindings/strong_binding.h" #include "mojo/services/updater/updater.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" namespace updater { diff --git a/mandoline/ui/desktop_ui/BUILD.gn b/mandoline/ui/desktop_ui/BUILD.gn index 255419a6b7f3d6..663e40b3123147 100644 --- a/mandoline/ui/desktop_ui/BUILD.gn +++ b/mandoline/ui/desktop_ui/BUILD.gn @@ -4,7 +4,7 @@ import("//build/config/ui.gni") import("//mojo/public/mojo_application.gni") -import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") +import("//mojo/public/tools/bindings/mojom.gni") mojo_native_application("desktop_ui") { sources = [ @@ -42,10 +42,10 @@ source_set("lib") { "//mojo/application/public/cpp:sources", "//mojo/common:common_base", "//mojo/converters/geometry", + "//mojo/public/cpp/bindings", "//mojo/services/tracing/public/cpp", "//mojo/services/tracing/public/interfaces", "//skia", - "//third_party/mojo/src/mojo/public/cpp/bindings", "//ui/gfx", "//ui/gfx/geometry", "//ui/mojo/init", diff --git a/mandoline/ui/desktop_ui/DEPS b/mandoline/ui/desktop_ui/DEPS index 2821345a5db01b..c5207e78159ef1 100644 --- a/mandoline/ui/desktop_ui/DEPS +++ b/mandoline/ui/desktop_ui/DEPS @@ -5,10 +5,10 @@ include_rules = [ "+mojo/application", "+mojo/common", "+mojo/converters", + "+mojo/public", "+mojo/runner", "+mojo/services/network/public", "+mojo/services/tracing/public", - "+third_party/mojo/src/mojo/public", "+third_party/mojo_services", "+ui", ] diff --git a/mandoline/ui/desktop_ui/main.cc b/mandoline/ui/desktop_ui/main.cc index 65df60192a0729..558d3af88ebcad 100644 --- a/mandoline/ui/desktop_ui/main.cc +++ b/mandoline/ui/desktop_ui/main.cc @@ -4,7 +4,7 @@ #include "mandoline/ui/desktop_ui/browser_manager.h" #include "mojo/application/public/cpp/application_runner.h" -#include "third_party/mojo/src/mojo/public/c/system/main.h" +#include "mojo/public/c/system/main.h" MojoResult MojoMain(MojoHandle shell_handle) { mojo::ApplicationRunner runner(new mandoline::BrowserManager); diff --git a/mandoline/ui/desktop_ui/public/interfaces/BUILD.gn b/mandoline/ui/desktop_ui/public/interfaces/BUILD.gn index 4bb47d8eb56d82..335f170cd2506c 100644 --- a/mandoline/ui/desktop_ui/public/interfaces/BUILD.gn +++ b/mandoline/ui/desktop_ui/public/interfaces/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") +import("//mojo/public/tools/bindings/mojom.gni") mojom("interfaces") { sources = [ diff --git a/mandoline/ui/omnibox/BUILD.gn b/mandoline/ui/omnibox/BUILD.gn index 76530b96f5e31e..d28d98975b3a69 100644 --- a/mandoline/ui/omnibox/BUILD.gn +++ b/mandoline/ui/omnibox/BUILD.gn @@ -32,8 +32,8 @@ source_set("lib") { "//mojo/application/public/cpp:sources", "//mojo/common", "//mojo/converters/geometry", + "//mojo/public/cpp/bindings", "//skia", - "//third_party/mojo/src/mojo/public/cpp/bindings", "//ui/gfx/geometry", "//ui/mojo/init", "//ui/views", diff --git a/mandoline/ui/omnibox/DEPS b/mandoline/ui/omnibox/DEPS index b98f9043d6e51f..39647649fdbad7 100644 --- a/mandoline/ui/omnibox/DEPS +++ b/mandoline/ui/omnibox/DEPS @@ -4,6 +4,6 @@ include_rules = [ "+mojo/application", "+mojo/common", "+mojo/converters", - "+third_party/mojo/src/mojo/public", + "+mojo/public", "+ui", ] diff --git a/mandoline/ui/omnibox/main.cc b/mandoline/ui/omnibox/main.cc index 8c9007cd983592..35049c3fd1ddf9 100644 --- a/mandoline/ui/omnibox/main.cc +++ b/mandoline/ui/omnibox/main.cc @@ -4,7 +4,7 @@ #include "mandoline/ui/omnibox/omnibox_application.h" #include "mojo/application/public/cpp/application_runner.h" -#include "third_party/mojo/src/mojo/public/c/system/main.h" +#include "mojo/public/c/system/main.h" MojoResult MojoMain(MojoHandle shell_handle) { mojo::ApplicationRunner runner(new mandoline::OmniboxApplication); diff --git a/mandoline/ui/phone_ui/BUILD.gn b/mandoline/ui/phone_ui/BUILD.gn index 3a6ee3bfd04863..0f3ddf734f3d6a 100644 --- a/mandoline/ui/phone_ui/BUILD.gn +++ b/mandoline/ui/phone_ui/BUILD.gn @@ -3,7 +3,7 @@ # found in the LICENSE file. import("//mojo/public/mojo_application.gni") -import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") +import("//mojo/public/tools/bindings/mojom.gni") mojo_native_application("phone_ui") { sources = [ @@ -33,7 +33,7 @@ source_set("lib") { "//mojo/application/public/cpp", "//mojo/common", "//mojo/converters/geometry", - "//third_party/mojo/src/mojo/public/cpp/bindings", + "//mojo/public/cpp/bindings", "//ui/gfx/geometry", "//url", ] diff --git a/mandoline/ui/phone_ui/DEPS b/mandoline/ui/phone_ui/DEPS index ffc6361a02833f..9286b4459212fc 100644 --- a/mandoline/ui/phone_ui/DEPS +++ b/mandoline/ui/phone_ui/DEPS @@ -4,7 +4,7 @@ include_rules = [ "+mojo/application", "+mojo/common", "+mojo/converters", + "+mojo/public", "+mojo/services/network/public", - "+third_party/mojo/src/mojo/public", "+ui", ] diff --git a/mandoline/ui/phone_ui/main.cc b/mandoline/ui/phone_ui/main.cc index fa3feceb4ed791..7744a4d6b83116 100644 --- a/mandoline/ui/phone_ui/main.cc +++ b/mandoline/ui/phone_ui/main.cc @@ -4,7 +4,7 @@ #include "mandoline/ui/phone_ui/phone_browser_application_delegate.h" #include "mojo/application/public/cpp/application_runner.h" -#include "third_party/mojo/src/mojo/public/c/system/main.h" +#include "mojo/public/c/system/main.h" MojoResult MojoMain(MojoHandle shell_handle) { mojo::ApplicationRunner runner( diff --git a/media/mojo/DEPS b/media/mojo/DEPS index 0f87ee7648084c..cc40af5c55c061 100644 --- a/media/mojo/DEPS +++ b/media/mojo/DEPS @@ -3,5 +3,4 @@ include_rules = [ "+mojo/common", "+mojo/converters", "+mojo/public", - "+third_party/mojo/src/mojo/public", ] diff --git a/media/mojo/interfaces/BUILD.gn b/media/mojo/interfaces/BUILD.gn index 1f9b19b13fc8ab..cce30d2953d273 100644 --- a/media/mojo/interfaces/BUILD.gn +++ b/media/mojo/interfaces/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") +import("//mojo/public/tools/bindings/mojom.gni") mojom("interfaces") { sources = [ diff --git a/media/mojo/services/BUILD.gn b/media/mojo/services/BUILD.gn index ee178a7cc4bf78..32228fc880ed05 100644 --- a/media/mojo/services/BUILD.gn +++ b/media/mojo/services/BUILD.gn @@ -43,7 +43,7 @@ source_set("converters") { "//mojo/common", "//mojo/converters/geometry", "//mojo/environment:chromium", - "//third_party/mojo/src/mojo/public/c/system:for_component", + "//mojo/public/c/system:for_component", "//ui/mojo/geometry:interfaces", ] } @@ -74,7 +74,7 @@ source_set("proxy") { "//mojo/application/public/interfaces", "//mojo/common", "//mojo/environment:chromium", - "//third_party/mojo/src/mojo/public/c/system:for_component", + "//mojo/public/c/system:for_component", ] } @@ -108,7 +108,7 @@ source_set("cdm_service") { "//mojo/application/public/interfaces", "//mojo/common", "//mojo/environment:chromium", - "//third_party/mojo/src/mojo/public/c/system:for_component", + "//mojo/public/c/system:for_component", ] sources = [ @@ -162,7 +162,7 @@ source_set("application") { ":renderer_service", "//base", "//mojo/application/public/cpp", - "//third_party/mojo/src/mojo/public/c/system:for_component", + "//mojo/public/c/system:for_component", ] } @@ -191,7 +191,7 @@ mojo_native_application("media") { deps = [ ":application", - "//third_party/mojo/src/mojo/public/c/system:for_shared_library", + "//mojo/public/c/system:for_shared_library", ] } diff --git a/media/mojo/services/main.cc b/media/mojo/services/main.cc index b8d627ed832487..5ee05895aa249b 100644 --- a/media/mojo/services/main.cc +++ b/media/mojo/services/main.cc @@ -4,7 +4,7 @@ #include "media/mojo/services/mojo_media_application.h" #include "mojo/application/public/cpp/application_runner.h" -#include "third_party/mojo/src/mojo/public/c/system/main.h" +#include "mojo/public/c/system/main.h" MojoResult MojoMain(MojoHandle mojo_handle) { // Create MojoMediaApplication and enable logging. diff --git a/media/mojo/services/media_type_converters.h b/media/mojo/services/media_type_converters.h index 5d5f27816b1192..0133a9986310b4 100644 --- a/media/mojo/services/media_type_converters.h +++ b/media/mojo/services/media_type_converters.h @@ -9,7 +9,7 @@ #include "base/memory/scoped_ptr.h" #include "media/mojo/interfaces/content_decryption_module.mojom.h" #include "media/mojo/interfaces/media_types.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/type_converter.h" +#include "mojo/public/cpp/bindings/type_converter.h" namespace media { class AudioDecoderConfig; diff --git a/media/mojo/services/mojo_cdm.h b/media/mojo/services/mojo_cdm.h index 57369ebee0e8de..c84c06b2362c64 100644 --- a/media/mojo/services/mojo_cdm.h +++ b/media/mojo/services/mojo_cdm.h @@ -14,7 +14,7 @@ #include "media/base/media_keys.h" #include "media/mojo/interfaces/content_decryption_module.mojom.h" #include "media/mojo/services/mojo_type_trait.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" +#include "mojo/public/cpp/bindings/binding.h" namespace mojo { class ServiceProvider; diff --git a/media/mojo/services/mojo_cdm_factory.cc b/media/mojo/services/mojo_cdm_factory.cc index 072b2ddd28a732..887759c8aa02f9 100644 --- a/media/mojo/services/mojo_cdm_factory.cc +++ b/media/mojo/services/mojo_cdm_factory.cc @@ -7,7 +7,7 @@ #include "media/mojo/interfaces/service_factory.mojom.h" #include "media/mojo/services/mojo_cdm.h" #include "mojo/application/public/cpp/connect.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h" +#include "mojo/public/cpp/bindings/interface_request.h" namespace media { diff --git a/media/mojo/services/mojo_cdm_promise.h b/media/mojo/services/mojo_cdm_promise.h index 8492f22fee7745..5f0d80d5363b68 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 "third_party/mojo/src/mojo/public/cpp/bindings/callback.h" +#include "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 f042dded6cacfd..c669a74b73b9fd 100644 --- a/media/mojo/services/mojo_cdm_service.h +++ b/media/mojo/services/mojo_cdm_service.h @@ -15,7 +15,7 @@ #include "media/mojo/services/mojo_cdm_promise.h" #include "media/mojo/services/mojo_cdm_service_context.h" #include "mojo/application/public/interfaces/service_provider.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" +#include "mojo/public/cpp/bindings/strong_binding.h" namespace media { diff --git a/media/mojo/services/mojo_demuxer_stream_adapter.cc b/media/mojo/services/mojo_demuxer_stream_adapter.cc index eeaa6343cb073a..a3cd0fea15a49e 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 "third_party/mojo/src/mojo/public/cpp/system/data_pipe.h" +#include "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 ffe92714fa1c08..c390e8d047838d 100644 --- a/media/mojo/services/mojo_demuxer_stream_impl.cc +++ b/media/mojo/services/mojo_demuxer_stream_impl.cc @@ -9,7 +9,7 @@ #include "media/base/decoder_buffer.h" #include "media/base/video_decoder_config.h" #include "media/mojo/services/media_type_converters.h" -#include "third_party/mojo/src/mojo/public/cpp/system/data_pipe.h" +#include "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 09021140c4437a..5049eed45e5f2c 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 "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" +#include "mojo/public/cpp/bindings/strong_binding.h" namespace media { class DemuxerStream; diff --git a/media/mojo/services/mojo_renderer_factory.cc b/media/mojo/services/mojo_renderer_factory.cc index aa0b30895d4518..8112c7c66fa5a3 100644 --- a/media/mojo/services/mojo_renderer_factory.cc +++ b/media/mojo/services/mojo_renderer_factory.cc @@ -7,7 +7,7 @@ #include "base/single_thread_task_runner.h" #include "media/mojo/interfaces/service_factory.mojom.h" #include "media/mojo/services/mojo_renderer_impl.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h" +#include "mojo/public/cpp/bindings/interface_request.h" namespace media { diff --git a/media/mojo/services/mojo_renderer_factory.h b/media/mojo/services/mojo_renderer_factory.h index 01a325aecba22e..8074ab394d990c 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/renderer.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_ptr.h" +#include "mojo/public/cpp/bindings/interface_ptr.h" namespace media { diff --git a/media/mojo/services/mojo_renderer_impl.h b/media/mojo/services/mojo_renderer_impl.h index e574b15059993c..650de591891a6c 100644 --- a/media/mojo/services/mojo_renderer_impl.h +++ b/media/mojo/services/mojo_renderer_impl.h @@ -9,7 +9,7 @@ #include "base/memory/weak_ptr.h" #include "media/base/renderer.h" #include "media/mojo/interfaces/renderer.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" +#include "mojo/public/cpp/bindings/binding.h" namespace base { class SingleThreadTaskRunner; diff --git a/media/mojo/services/mojo_renderer_service.h b/media/mojo/services/mojo_renderer_service.h index dad617041285dd..5fcaf44775b516 100644 --- a/media/mojo/services/mojo_renderer_service.h +++ b/media/mojo/services/mojo_renderer_service.h @@ -17,7 +17,7 @@ #include "media/base/pipeline_status.h" #include "media/mojo/interfaces/renderer.mojom.h" #include "media/mojo/services/mojo_cdm_service_context.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" +#include "mojo/public/cpp/bindings/strong_binding.h" namespace mojo { class ApplicationConnection; diff --git a/media/mojo/services/mojo_type_trait.h b/media/mojo/services/mojo_type_trait.h index 22ea38f4c9a4e0..5843cec24e02ba 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 "third_party/mojo/src/mojo/public/cpp/bindings/array.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/string.h" +#include "mojo/public/cpp/bindings/array.h" +#include "mojo/public/cpp/bindings/string.h" namespace media { diff --git a/media/mojo/services/service_factory_impl.h b/media/mojo/services/service_factory_impl.h index 508a7d15919fcb..8357f8ad4e5f1c 100644 --- a/media/mojo/services/service_factory_impl.h +++ b/media/mojo/services/service_factory_impl.h @@ -9,7 +9,7 @@ #include "base/memory/scoped_ptr.h" #include "media/mojo/interfaces/service_factory.mojom.h" #include "media/mojo/services/mojo_cdm_service_context.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" +#include "mojo/public/cpp/bindings/strong_binding.h" namespace mojo { class AppRefCount; diff --git a/mojo/BUILD.gn b/mojo/BUILD.gn index da4601d3e9269c..13970fa8b8e1ea 100644 --- a/mojo/BUILD.gn +++ b/mojo/BUILD.gn @@ -17,7 +17,7 @@ group("mojo") { # TODO(GYP): Figure out if this needs to be supported. Right now # it won't work on x86 official builds because it needs stuff in the # sysroot that doesn't exist. - deps += [ "//third_party/mojo/src/mojo/public" ] + deps += [ "//mojo/public" ] } if (is_android) { diff --git a/mojo/DEPS b/mojo/DEPS index ba34e936e15e2e..c5aab6e2740a4e 100644 --- a/mojo/DEPS +++ b/mojo/DEPS @@ -4,5 +4,4 @@ include_rules = [ "+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/BUILD.gn b/mojo/android/BUILD.gn index d25b7d5edd716b..d1dce6be341919 100644 --- a/mojo/android/BUILD.gn +++ b/mojo/android/BUILD.gn @@ -47,8 +47,8 @@ source_set("libsystem_java") { "//base", "//mojo/environment:chromium", "//mojo/message_pump", + "//mojo/public/cpp/environment", "//third_party/mojo/src/mojo/edk/system", - "//third_party/mojo/src/mojo/public/cpp/environment", ] } @@ -66,7 +66,7 @@ android_library("system_java") { deps = [ "//base:base_java", - "//third_party/mojo/src/mojo/public/java:system", + "//mojo/public/java:system", ] } @@ -102,9 +102,9 @@ android_library("mojo_javatests") { ":system_java", "//base:base_java", "//base:base_java_test_support", - "//third_party/mojo/src/mojo/public/interfaces/bindings/tests:test_interfaces_java", - "//third_party/mojo/src/mojo/public/java:bindings", - "//third_party/mojo/src/mojo/public/java:system", + "//mojo/public/interfaces/bindings/tests:test_interfaces_java", + "//mojo/public/java:bindings", + "//mojo/public/java:system", ] } @@ -127,10 +127,10 @@ shared_library("mojo_java_unittests") { "//base/test/:test_support", "//build/config/sanitizers:deps", "//mojo/message_pump", + "//mojo/public/cpp/bindings/tests:mojo_public_bindings_test_utils", + "//mojo/public/cpp/test_support:test_utils", + "//mojo/public/cpp/environment", "//third_party/mojo/src/mojo/edk/system", - "//third_party/mojo/src/mojo/public/cpp/bindings/tests:mojo_public_bindings_test_utils", - "//third_party/mojo/src/mojo/public/cpp/test_support:test_utils", - "//third_party/mojo/src/mojo/public/cpp/environment", ] defines = [ "UNIT_TEST" ] } @@ -142,8 +142,8 @@ android_apk("mojo_test_apk") { ":mojo_java_unittests", ":system_java", "//base:base_java", - "//third_party/mojo/src/mojo/public/java:bindings", - "//third_party/mojo/src/mojo/public/interfaces/bindings/tests:test_interfaces", + "//mojo/public/java:bindings", + "//mojo/public/interfaces/bindings/tests:test_interfaces", ] native_libs = [ "libmojo_java_unittests.so" ] apk_name = "MojoTest" diff --git a/mojo/android/javatests/mojo_test_case.cc b/mojo/android/javatests/mojo_test_case.cc index 9170fd0e70a958..22a08ff674fcd2 100644 --- a/mojo/android/javatests/mojo_test_case.cc +++ b/mojo/android/javatests/mojo_test_case.cc @@ -14,7 +14,7 @@ #include "base/test/test_support_android.h" #include "jni/MojoTestCase_jni.h" #include "mojo/message_pump/message_pump_mojo.h" -#include "third_party/mojo/src/mojo/public/cpp/environment/environment.h" +#include "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 8179fd6d6c2a55..1fb0abf89f1bc8 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 "third_party/mojo/src/mojo/public/cpp/bindings/tests/validation_test_input_parser.h" +#include "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 b474cb6410f89b..21589876b4897a 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 "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" +#include "mojo/public/c/environment/async_waiter.h" +#include "mojo/public/c/system/core.h" +#include "mojo/public/cpp/environment/environment.h" namespace { diff --git a/mojo/application/public/cpp/BUILD.gn b/mojo/application/public/cpp/BUILD.gn index 578463ff25b590..fb34910ba68d09 100644 --- a/mojo/application/public/cpp/BUILD.gn +++ b/mojo/application/public/cpp/BUILD.gn @@ -50,8 +50,8 @@ source_set("sources") { "//mojo/common", "//mojo/environment:chromium", "//mojo/message_pump", - "//third_party/mojo/src/mojo/public/cpp/bindings", - "//third_party/mojo/src/mojo/public/cpp/system", + "//mojo/public/cpp/bindings", + "//mojo/public/cpp/system", ] } @@ -94,9 +94,9 @@ source_set("test_support") { "//base/test:test_support", "//mojo/application/public/interfaces:interfaces_cpp_sources", "//mojo/logging", - "//third_party/mojo/src/mojo/public/cpp/bindings", - "//third_party/mojo/src/mojo/public/cpp/environment", - "//third_party/mojo/src/mojo/public/cpp/system", + "//mojo/public/cpp/bindings", + "//mojo/public/cpp/environment", + "//mojo/public/cpp/system", "//testing/gtest", ] diff --git a/mojo/application/public/cpp/application_delegate.h b/mojo/application/public/cpp/application_delegate.h index 22deec75f236a2..a3784908739a9e 100644 --- a/mojo/application/public/cpp/application_delegate.h +++ b/mojo/application/public/cpp/application_delegate.h @@ -7,7 +7,7 @@ #include -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/cpp/system/macros.h" namespace mojo { diff --git a/mojo/application/public/cpp/application_impl.h b/mojo/application/public/cpp/application_impl.h index 53ab79129c92f8..90e795968cd177 100644 --- a/mojo/application/public/cpp/application_impl.h +++ b/mojo/application/public/cpp/application_impl.h @@ -15,9 +15,9 @@ #include "mojo/application/public/cpp/lib/service_registry.h" #include "mojo/application/public/interfaces/application.mojom.h" #include "mojo/application/public/interfaces/shell.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 "third_party/mojo/src/mojo/public/cpp/system/core.h" +#include "mojo/public/cpp/bindings/binding.h" +#include "mojo/public/cpp/bindings/callback.h" +#include "mojo/public/cpp/system/core.h" namespace mojo { diff --git a/mojo/application/public/cpp/application_runner.h b/mojo/application/public/cpp/application_runner.h index 90329a94f01791..09835cbe967904 100644 --- a/mojo/application/public/cpp/application_runner.h +++ b/mojo/application/public/cpp/application_runner.h @@ -7,7 +7,7 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" -#include "third_party/mojo/src/mojo/public/cpp/system/core.h" +#include "mojo/public/cpp/system/core.h" namespace mojo { diff --git a/mojo/application/public/cpp/application_test_base.h b/mojo/application/public/cpp/application_test_base.h index d10ee81e4eef70..5b0fab1074ac95 100644 --- a/mojo/application/public/cpp/application_test_base.h +++ b/mojo/application/public/cpp/application_test_base.h @@ -7,10 +7,10 @@ #include "mojo/application/public/cpp/application_delegate.h" #include "mojo/application/public/interfaces/application.mojom.h" +#include "mojo/public/cpp/bindings/array.h" +#include "mojo/public/cpp/bindings/string.h" +#include "mojo/public/cpp/system/macros.h" #include "testing/gtest/include/gtest/gtest.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/system/macros.h" namespace mojo { diff --git a/mojo/application/public/cpp/initialize_base_and_icu.cc b/mojo/application/public/cpp/initialize_base_and_icu.cc index 4635d49d78e9a3..dd65129aaf90ba 100644 --- a/mojo/application/public/cpp/initialize_base_and_icu.cc +++ b/mojo/application/public/cpp/initialize_base_and_icu.cc @@ -11,8 +11,8 @@ #include "base/i18n/icu_util.h" #include "base/rand_util.h" #include "base/sys_info.h" +#include "mojo/public/c/system/types.h" #include "third_party/icu/source/i18n/unicode/timezone.h" -#include "third_party/mojo/src/mojo/public/c/system/types.h" extern "C" { #if defined(WIN32) diff --git a/mojo/application/public/cpp/interface_factory.h b/mojo/application/public/cpp/interface_factory.h index 2dc0cbcdc1c707..c7dd8392360fa1 100644 --- a/mojo/application/public/cpp/interface_factory.h +++ b/mojo/application/public/cpp/interface_factory.h @@ -5,7 +5,7 @@ #ifndef MOJO_APPLICATION_PUBLIC_CPP_INTERFACE_FACTORY_H_ #define MOJO_APPLICATION_PUBLIC_CPP_INTERFACE_FACTORY_H_ -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h" +#include "mojo/public/cpp/bindings/interface_request.h" namespace mojo { diff --git a/mojo/application/public/cpp/lib/application_impl.cc b/mojo/application/public/cpp/lib/application_impl.cc index 7e9781c32803a0..6d2fb46b4c652a 100644 --- a/mojo/application/public/cpp/lib/application_impl.cc +++ b/mojo/application/public/cpp/lib/application_impl.cc @@ -10,8 +10,8 @@ #include "base/message_loop/message_loop.h" #include "mojo/application/public/cpp/application_delegate.h" #include "mojo/application/public/cpp/lib/service_registry.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_ptr.h" -#include "third_party/mojo/src/mojo/public/cpp/environment/logging.h" +#include "mojo/public/cpp/bindings/interface_ptr.h" +#include "mojo/public/cpp/environment/logging.h" namespace mojo { diff --git a/mojo/application/public/cpp/lib/application_test_base.cc b/mojo/application/public/cpp/lib/application_test_base.cc index 8f07f1fd04237b..9d6536ea6d9299 100644 --- a/mojo/application/public/cpp/lib/application_test_base.cc +++ b/mojo/application/public/cpp/lib/application_test_base.cc @@ -8,9 +8,9 @@ #include "base/strings/utf_string_conversions.h" #include "mojo/application/public/cpp/application_impl.h" #include "mojo/application/public/interfaces/application.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" -#include "third_party/mojo/src/mojo/public/cpp/environment/environment.h" -#include "third_party/mojo/src/mojo/public/cpp/system/message_pipe.h" +#include "mojo/public/cpp/bindings/binding.h" +#include "mojo/public/cpp/environment/environment.h" +#include "mojo/public/cpp/system/message_pipe.h" namespace mojo { namespace test { diff --git a/mojo/application/public/cpp/lib/application_test_main.cc b/mojo/application/public/cpp/lib/application_test_main.cc index 8b4c50b01f7a4c..5d208c3397fa24 100644 --- a/mojo/application/public/cpp/lib/application_test_main.cc +++ b/mojo/application/public/cpp/lib/application_test_main.cc @@ -8,7 +8,7 @@ #include "mojo/application/public/cpp/application_runner.h" #include "mojo/application/public/cpp/application_test_base.h" #include "mojo/logging/init_logging.h" -#include "third_party/mojo/src/mojo/public/c/system/main.h" +#include "mojo/public/c/system/main.h" MojoResult MojoMain(MojoHandle handle) { // An AtExitManager instance is needed to construct message loops. diff --git a/mojo/application/public/cpp/lib/content_handler_factory.cc b/mojo/application/public/cpp/lib/content_handler_factory.cc index ccd2333d1aa607..b01868cc2c8ef5 100644 --- a/mojo/application/public/cpp/lib/content_handler_factory.cc +++ b/mojo/application/public/cpp/lib/content_handler_factory.cc @@ -18,7 +18,7 @@ #include "mojo/application/public/cpp/application_runner.h" #include "mojo/application/public/cpp/interface_factory_impl.h" #include "mojo/message_pump/message_pump_mojo.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" +#include "mojo/public/cpp/bindings/strong_binding.h" namespace mojo { diff --git a/mojo/application/public/cpp/lib/interface_factory_connector.h b/mojo/application/public/cpp/lib/interface_factory_connector.h index 88834a0fb483c3..8d13bc241a4d20 100644 --- a/mojo/application/public/cpp/lib/interface_factory_connector.h +++ b/mojo/application/public/cpp/lib/interface_factory_connector.h @@ -7,7 +7,7 @@ #include "mojo/application/public/cpp/interface_factory.h" #include "mojo/application/public/cpp/service_connector.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h" +#include "mojo/public/cpp/bindings/interface_request.h" namespace mojo { namespace internal { diff --git a/mojo/application/public/cpp/lib/service_connector_registry.h b/mojo/application/public/cpp/lib/service_connector_registry.h index 20ad5ff8cd15b5..b19635363e5eb0 100644 --- a/mojo/application/public/cpp/lib/service_connector_registry.h +++ b/mojo/application/public/cpp/lib/service_connector_registry.h @@ -8,7 +8,7 @@ #include #include -#include "third_party/mojo/src/mojo/public/cpp/system/message_pipe.h" +#include "mojo/public/cpp/system/message_pipe.h" namespace mojo { diff --git a/mojo/application/public/cpp/lib/service_provider_impl.cc b/mojo/application/public/cpp/lib/service_provider_impl.cc index cdddad37016b61..6a9282c418eb57 100644 --- a/mojo/application/public/cpp/lib/service_provider_impl.cc +++ b/mojo/application/public/cpp/lib/service_provider_impl.cc @@ -5,7 +5,7 @@ #include "mojo/application/public/cpp/service_provider_impl.h" #include "mojo/application/public/cpp/service_connector.h" -#include "third_party/mojo/src/mojo/public/cpp/environment/logging.h" +#include "mojo/public/cpp/environment/logging.h" namespace mojo { diff --git a/mojo/application/public/cpp/lib/service_registry.h b/mojo/application/public/cpp/lib/service_registry.h index aa209dc9a42b05..c3610bf6de8515 100644 --- a/mojo/application/public/cpp/lib/service_registry.h +++ b/mojo/application/public/cpp/lib/service_registry.h @@ -12,7 +12,7 @@ #include "mojo/application/public/cpp/lib/service_connector_registry.h" #include "mojo/application/public/interfaces/service_provider.mojom.h" #include "mojo/application/public/interfaces/shell.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" +#include "mojo/public/cpp/bindings/binding.h" namespace mojo { namespace internal { diff --git a/mojo/application/public/cpp/service_connector.h b/mojo/application/public/cpp/service_connector.h index 498d458aebb0af..3a7d65681023ab 100644 --- a/mojo/application/public/cpp/service_connector.h +++ b/mojo/application/public/cpp/service_connector.h @@ -7,7 +7,7 @@ #include -#include "third_party/mojo/src/mojo/public/cpp/system/message_pipe.h" +#include "mojo/public/cpp/system/message_pipe.h" namespace mojo { diff --git a/mojo/application/public/cpp/service_provider_impl.h b/mojo/application/public/cpp/service_provider_impl.h index 2e19a86d81bc5b..0a9fb77204039e 100644 --- a/mojo/application/public/cpp/service_provider_impl.h +++ b/mojo/application/public/cpp/service_provider_impl.h @@ -10,7 +10,7 @@ #include "mojo/application/public/cpp/lib/interface_factory_connector.h" #include "mojo/application/public/cpp/lib/service_connector_registry.h" #include "mojo/application/public/interfaces/service_provider.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" +#include "mojo/public/cpp/bindings/strong_binding.h" namespace mojo { diff --git a/mojo/application/public/interfaces/BUILD.gn b/mojo/application/public/interfaces/BUILD.gn index fe107dbe6fc136..f3958b5aead914 100644 --- a/mojo/application/public/interfaces/BUILD.gn +++ b/mojo/application/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") # GYP version: mojo/mojo_base.gyp:mojo_application_bindings mojom("interfaces") { diff --git a/mojo/application/public/java/BUILD.gn b/mojo/application/public/java/BUILD.gn index ad256488b0f80a..7caa8e7659d9a6 100644 --- a/mojo/application/public/java/BUILD.gn +++ b/mojo/application/public/java/BUILD.gn @@ -15,7 +15,7 @@ android_library("application") { ] deps = [ "//mojo/application/public/interfaces:interfaces_java", - "//third_party/mojo/src/mojo/public/java:bindings", - "//third_party/mojo/src/mojo/public/java:system", + "//mojo/public/java:bindings", + "//mojo/public/java:system", ] } diff --git a/mojo/common/BUILD.gn b/mojo/common/BUILD.gn index eb12b6551fd631..7cbd5bf40c6358 100644 --- a/mojo/common/BUILD.gn +++ b/mojo/common/BUILD.gn @@ -32,7 +32,7 @@ component("common_base") { defines = [ "MOJO_COMMON_IMPLEMENTATION" ] public_deps = [ - "//third_party/mojo/src/mojo/public/cpp/system", + "//mojo/public/cpp/system", ] deps = [ @@ -40,9 +40,9 @@ component("common_base") { "//base/third_party/dynamic_annotations", "//mojo/environment:chromium", "//mojo/message_pump", - "//third_party/mojo/src/mojo/public/c/system:for_component", - "//third_party/mojo/src/mojo/public/cpp/bindings", - "//third_party/mojo/src/mojo/public/cpp/environment", + "//mojo/public/c/system:for_component", + "//mojo/public/cpp/bindings", + "//mojo/public/cpp/environment", ] } @@ -59,7 +59,7 @@ source_set("url_type_converters") { ":common_base", "//base", "//base/third_party/dynamic_annotations", - "//third_party/mojo/src/mojo/public/cpp/bindings", + "//mojo/public/cpp/bindings", "//url", ] } @@ -82,11 +82,11 @@ test("mojo_common_unittests") { "//base/test:test_support", "//mojo/environment:chromium", "//mojo/message_pump", + "//mojo/public/cpp/bindings", + "//mojo/public/cpp/test_support:test_utils", "//testing/gtest", "//third_party/mojo/src/mojo/edk/test:run_all_unittests", "//third_party/mojo/src/mojo/edk/test:test_support", - "//third_party/mojo/src/mojo/public/cpp/bindings", - "//third_party/mojo/src/mojo/public/cpp/test_support:test_utils", "//url", ] @@ -105,9 +105,9 @@ test("mojo_common_perftests") { "//base", "//mojo/environment:chromium", "//mojo/message_pump", + "//mojo/public/cpp/test_support:test_utils", "//testing/gtest", "//third_party/mojo/src/mojo/edk/test:run_all_perftests", - "//third_party/mojo/src/mojo/public/cpp/test_support:test_utils", ] sources = [ diff --git a/mojo/common/DEPS b/mojo/common/DEPS index 4ca2066ddcbe82..6dd6560b6141d8 100644 --- a/mojo/common/DEPS +++ b/mojo/common/DEPS @@ -4,7 +4,7 @@ include_rules = [ "+mojo/application/public/cpp", "+mojo/common", "+mojo/message_pump", - "+third_party/mojo/src/mojo/public", + "+mojo/public", ] specific_include_rules = { diff --git a/mojo/common/common_type_converters.h b/mojo/common/common_type_converters.h index a45f00b3ca4532..e4ac58e3fddfee 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 "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" +#include "mojo/public/cpp/bindings/array.h" +#include "mojo/public/cpp/bindings/string.h" +#include "mojo/public/cpp/bindings/type_converter.h" namespace mojo { diff --git a/mojo/common/data_pipe_drainer.h b/mojo/common/data_pipe_drainer.h index 19af32d1811c15..bf2b0312b16dbb 100644 --- a/mojo/common/data_pipe_drainer.h +++ b/mojo/common/data_pipe_drainer.h @@ -9,7 +9,7 @@ #include "base/memory/weak_ptr.h" #include "mojo/common/mojo_common_export.h" #include "mojo/message_pump/handle_watcher.h" -#include "third_party/mojo/src/mojo/public/cpp/system/core.h" +#include "mojo/public/cpp/system/core.h" namespace mojo { namespace common { diff --git a/mojo/common/data_pipe_utils.h b/mojo/common/data_pipe_utils.h index 5b32cfd8b92f6b..c8cfd8d07405db 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 "third_party/mojo/src/mojo/public/cpp/system/core.h" +#include "mojo/public/cpp/system/core.h" namespace base { class FilePath; diff --git a/mojo/common/url_type_converters.h b/mojo/common/url_type_converters.h index 04390830795ef7..1d334a07fe3733 100644 --- a/mojo/common/url_type_converters.h +++ b/mojo/common/url_type_converters.h @@ -5,8 +5,8 @@ #ifndef MOJO_COMMON_URL_TYPE_CONVERTERS_H_ #define MOJO_COMMON_URL_TYPE_CONVERTERS_H_ -#include "third_party/mojo/src/mojo/public/cpp/bindings/string.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/type_converter.h" +#include "mojo/public/cpp/bindings/string.h" +#include "mojo/public/cpp/bindings/type_converter.h" class GURL; diff --git a/mojo/common/weak_binding_set.h b/mojo/common/weak_binding_set.h index 7696c82c280487..85c8031464db6a 100644 --- a/mojo/common/weak_binding_set.h +++ b/mojo/common/weak_binding_set.h @@ -9,7 +9,7 @@ #include #include "base/memory/weak_ptr.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" +#include "mojo/public/cpp/bindings/binding.h" namespace mojo { diff --git a/mojo/common/weak_interface_ptr_set.h b/mojo/common/weak_interface_ptr_set.h index 4e64534463fd29..e423b932296bfc 100644 --- a/mojo/common/weak_interface_ptr_set.h +++ b/mojo/common/weak_interface_ptr_set.h @@ -8,7 +8,7 @@ #include #include "base/memory/weak_ptr.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_ptr.h" +#include "mojo/public/cpp/bindings/interface_ptr.h" namespace mojo { diff --git a/mojo/converters/geometry/BUILD.gn b/mojo/converters/geometry/BUILD.gn index 58b46e7ecd1334..efe39c19311aae 100644 --- a/mojo/converters/geometry/BUILD.gn +++ b/mojo/converters/geometry/BUILD.gn @@ -12,7 +12,7 @@ component("geometry") { ] deps = [ "//mojo/environment:chromium", - "//third_party/mojo/src/mojo/public/c/system:for_component", + "//mojo/public/c/system:for_component", "//ui/mojo/geometry:interfaces", ] diff --git a/mojo/converters/ime/BUILD.gn b/mojo/converters/ime/BUILD.gn index 5e9105f6ac1c4d..d3c1d86573f6dc 100644 --- a/mojo/converters/ime/BUILD.gn +++ b/mojo/converters/ime/BUILD.gn @@ -13,7 +13,7 @@ component("ime") { deps = [ "//base", "//mojo/environment:chromium", - "//third_party/mojo/src/mojo/public/c/system:for_component", + "//mojo/public/c/system:for_component", "//ui/mojo/ime:interfaces", "//ui/platform_window", ] diff --git a/mojo/converters/input_events/BUILD.gn b/mojo/converters/input_events/BUILD.gn index 66a52934dd90b7..fb59cb79501a50 100644 --- a/mojo/converters/input_events/BUILD.gn +++ b/mojo/converters/input_events/BUILD.gn @@ -18,7 +18,7 @@ component("input_events") { "//components/mus/public/interfaces", "//mojo/converters/geometry", "//mojo/environment:chromium", - "//third_party/mojo/src/mojo/public/c/system:for_component", + "//mojo/public/c/system:for_component", "//ui/events", "//ui/events:dom_keycode_converter", "//ui/gfx/geometry", diff --git a/mojo/converters/surfaces/BUILD.gn b/mojo/converters/surfaces/BUILD.gn index 94f93f69e7805e..08752a01d2aba7 100644 --- a/mojo/converters/surfaces/BUILD.gn +++ b/mojo/converters/surfaces/BUILD.gn @@ -32,7 +32,7 @@ component("surfaces") { "//gpu", "//ui/gfx/geometry", "//mojo/environment:chromium", + "//mojo/public/c/system:for_component", "//skia", - "//third_party/mojo/src/mojo/public/c/system:for_component", ] } diff --git a/mojo/converters/transform/BUILD.gn b/mojo/converters/transform/BUILD.gn index da04119fa8dccf..f97791d0c514a5 100644 --- a/mojo/converters/transform/BUILD.gn +++ b/mojo/converters/transform/BUILD.gn @@ -11,7 +11,7 @@ component("transform") { deps = [ "//skia", "//mojo/environment:chromium", - "//third_party/mojo/src/mojo/public/c/system:for_component", + "//mojo/public/c/system:for_component", "//ui/mojo/geometry:interfaces", ] diff --git a/mojo/edk/embedder/BUILD.gn b/mojo/edk/embedder/BUILD.gn index a90aeb76fc1178..feb1b631e60a4f 100644 --- a/mojo/edk/embedder/BUILD.gn +++ b/mojo/edk/embedder/BUILD.gn @@ -37,7 +37,7 @@ mojo_edk_source_set("embedder") { public_deps = [ ":delegates", ":platform", - "//third_party/mojo/src/mojo/public/cpp/system", + "//mojo/public/cpp/system", ] deps = [ @@ -83,7 +83,7 @@ mojo_edk_source_set("platform") { configs = [ "//mojo/edk/system:system_config" ] public_deps = [ - "//third_party/mojo/src/mojo/public/cpp/system", + "//mojo/public/cpp/system", ] deps = [ @@ -112,7 +112,7 @@ mojo_edk_source_set("delegates") { configs = [ "//mojo/edk/system:system_config" ] public_deps = [ - "//third_party/mojo/src/mojo/public/cpp/system", + "//mojo/public/cpp/system", ] } diff --git a/mojo/edk/embedder/embedder.h b/mojo/edk/embedder/embedder.h index 3c0dddfe741a35..2bf9e15d0622a7 100644 --- a/mojo/edk/embedder/embedder.h +++ b/mojo/edk/embedder/embedder.h @@ -13,7 +13,7 @@ #include "base/task_runner.h" #include "mojo/edk/embedder/scoped_platform_handle.h" #include "mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/cpp/system/message_pipe.h" +#include "mojo/public/cpp/system/message_pipe.h" namespace mojo { namespace edk { diff --git a/mojo/edk/embedder/embedder_unittest.cc b/mojo/edk/embedder/embedder_unittest.cc index 659f0eec4d785b..f53e440c2890b4 100644 --- a/mojo/edk/embedder/embedder_unittest.cc +++ b/mojo/edk/embedder/embedder_unittest.cc @@ -17,11 +17,11 @@ #include "mojo/edk/system/test_utils.h" #include "mojo/edk/test/multiprocess_test_helper.h" #include "mojo/message_pump/message_pump_mojo.h" +#include "mojo/public/c/system/core.h" +#include "mojo/public/cpp/system/handle.h" +#include "mojo/public/cpp/system/macros.h" +#include "mojo/public/cpp/system/message_pipe.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/c/system/core.h" -#include "third_party/mojo/src/mojo/public/cpp/system/handle.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" -#include "third_party/mojo/src/mojo/public/cpp/system/message_pipe.h" namespace mojo { namespace edk { diff --git a/mojo/edk/embedder/entrypoints.cc b/mojo/edk/embedder/entrypoints.cc index b49126552fb336..6247c5f0c847f8 100644 --- a/mojo/edk/embedder/entrypoints.cc +++ b/mojo/edk/embedder/entrypoints.cc @@ -4,10 +4,10 @@ #include "mojo/edk/embedder/embedder_internal.h" #include "mojo/edk/system/core.h" -#include "third_party/mojo/src/mojo/public/c/system/buffer.h" -#include "third_party/mojo/src/mojo/public/c/system/data_pipe.h" -#include "third_party/mojo/src/mojo/public/c/system/functions.h" -#include "third_party/mojo/src/mojo/public/c/system/message_pipe.h" +#include "mojo/public/c/system/buffer.h" +#include "mojo/public/c/system/data_pipe.h" +#include "mojo/public/c/system/functions.h" +#include "mojo/public/c/system/message_pipe.h" using mojo::edk::internal::g_core; diff --git a/mojo/edk/embedder/platform_channel_pair.h b/mojo/edk/embedder/platform_channel_pair.h index 491c602e4b9f2b..74878370fa9942 100644 --- a/mojo/edk/embedder/platform_channel_pair.h +++ b/mojo/edk/embedder/platform_channel_pair.h @@ -10,7 +10,7 @@ #include "build/build_config.h" #include "mojo/edk/embedder/scoped_platform_handle.h" #include "mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/cpp/system/macros.h" namespace base { class CommandLine; diff --git a/mojo/edk/embedder/platform_channel_pair_posix_unittest.cc b/mojo/edk/embedder/platform_channel_pair_posix_unittest.cc index cd9d5fe848908e..a0bb7fd4b9168a 100644 --- a/mojo/edk/embedder/platform_channel_pair_posix_unittest.cc +++ b/mojo/edk/embedder/platform_channel_pair_posix_unittest.cc @@ -25,8 +25,8 @@ #include "mojo/edk/embedder/platform_handle_vector.h" #include "mojo/edk/embedder/scoped_platform_handle.h" #include "mojo/edk/test/test_utils.h" +#include "mojo/public/cpp/system/macros.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace edk { diff --git a/mojo/edk/embedder/platform_shared_buffer.h b/mojo/edk/embedder/platform_shared_buffer.h index 909cd76a717375..c7256afc71b908 100644 --- a/mojo/edk/embedder/platform_shared_buffer.h +++ b/mojo/edk/embedder/platform_shared_buffer.h @@ -11,7 +11,7 @@ #include "base/memory/scoped_ptr.h" #include "mojo/edk/embedder/scoped_platform_handle.h" #include "mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/cpp/system/macros.h" namespace mojo { namespace edk { diff --git a/mojo/edk/embedder/platform_support.h b/mojo/edk/embedder/platform_support.h index 15a300c65f199f..160ba79b320425 100644 --- a/mojo/edk/embedder/platform_support.h +++ b/mojo/edk/embedder/platform_support.h @@ -9,7 +9,7 @@ #include "mojo/edk/embedder/scoped_platform_handle.h" #include "mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/cpp/system/macros.h" namespace mojo { namespace edk { diff --git a/mojo/edk/embedder/process_delegate.h b/mojo/edk/embedder/process_delegate.h index d8cebc3462f270..e5f90af0196833 100644 --- a/mojo/edk/embedder/process_delegate.h +++ b/mojo/edk/embedder/process_delegate.h @@ -6,7 +6,7 @@ #define MOJO_EDK_EMBEDDER_PROCESS_DELEGATE_H_ #include "mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/cpp/system/macros.h" namespace mojo { namespace edk { diff --git a/mojo/edk/embedder/scoped_platform_handle.h b/mojo/edk/embedder/scoped_platform_handle.h index ce8e28aa288502..ae75202d61961b 100644 --- a/mojo/edk/embedder/scoped_platform_handle.h +++ b/mojo/edk/embedder/scoped_platform_handle.h @@ -8,7 +8,7 @@ #include "base/move.h" #include "mojo/edk/embedder/platform_handle.h" #include "mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/c/system/macros.h" +#include "mojo/public/c/system/macros.h" namespace mojo { namespace edk { diff --git a/mojo/edk/embedder/simple_platform_shared_buffer.h b/mojo/edk/embedder/simple_platform_shared_buffer.h index 3235b0b0943851..798bc3a1b4110f 100644 --- a/mojo/edk/embedder/simple_platform_shared_buffer.h +++ b/mojo/edk/embedder/simple_platform_shared_buffer.h @@ -9,7 +9,7 @@ #include "mojo/edk/embedder/platform_shared_buffer.h" #include "mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/cpp/system/macros.h" namespace mojo { namespace edk { diff --git a/mojo/edk/embedder/simple_platform_shared_buffer_unittest.cc b/mojo/edk/embedder/simple_platform_shared_buffer_unittest.cc index 9f174eaed672b7..a0e915e6361090 100644 --- a/mojo/edk/embedder/simple_platform_shared_buffer_unittest.cc +++ b/mojo/edk/embedder/simple_platform_shared_buffer_unittest.cc @@ -8,8 +8,8 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" +#include "mojo/public/cpp/system/macros.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace edk { diff --git a/mojo/edk/embedder/simple_platform_support.h b/mojo/edk/embedder/simple_platform_support.h index 91bdce06b32f9b..ef97d91dd4983a 100644 --- a/mojo/edk/embedder/simple_platform_support.h +++ b/mojo/edk/embedder/simple_platform_support.h @@ -7,7 +7,7 @@ #include "mojo/edk/embedder/platform_support.h" #include "mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/cpp/system/macros.h" namespace mojo { namespace edk { diff --git a/mojo/edk/js/BUILD.gn b/mojo/edk/js/BUILD.gn index dc61068ec37bd1..0c3f6ad970a44b 100644 --- a/mojo/edk/js/BUILD.gn +++ b/mojo/edk/js/BUILD.gn @@ -45,8 +45,8 @@ mojo_edk_source_set("js") { ] deps = [ - "//third_party/mojo/src/mojo/public/cpp/environment", - "//third_party/mojo/src/mojo/public/cpp/system", + "//mojo/public/cpp/environment", + "//mojo/public/cpp/system", ] } @@ -59,7 +59,7 @@ mojo_edk_source_set("js_unittests") { deps = [ "//mojo/edk/js", "//mojo/edk/test:test_support", + "//mojo/public/cpp/system", "//testing/gtest", - "//third_party/mojo/src/mojo/public/cpp/system", ] } diff --git a/mojo/edk/js/drain_data.cc b/mojo/edk/js/drain_data.cc index f5e6f89de62b86..d8fa0917cf304e 100644 --- a/mojo/edk/js/drain_data.cc +++ b/mojo/edk/js/drain_data.cc @@ -9,8 +9,8 @@ #include "gin/dictionary.h" #include "gin/per_context_data.h" #include "gin/per_isolate_data.h" -#include "third_party/mojo/src/mojo/public/cpp/environment/environment.h" -#include "third_party/mojo/src/mojo/public/cpp/system/core.h" +#include "mojo/public/cpp/environment/environment.h" +#include "mojo/public/cpp/system/core.h" namespace mojo { namespace edk { diff --git a/mojo/edk/js/drain_data.h b/mojo/edk/js/drain_data.h index 839241f817735c..63c9e4992dd7c1 100644 --- a/mojo/edk/js/drain_data.h +++ b/mojo/edk/js/drain_data.h @@ -7,8 +7,8 @@ #include "base/memory/scoped_vector.h" #include "gin/runner.h" -#include "third_party/mojo/src/mojo/public/c/environment/async_waiter.h" -#include "third_party/mojo/src/mojo/public/cpp/system/core.h" +#include "mojo/public/c/environment/async_waiter.h" +#include "mojo/public/cpp/system/core.h" #include "v8/include/v8.h" namespace mojo { diff --git a/mojo/edk/js/handle.h b/mojo/edk/js/handle.h index 4257816abb06ac..9fa92b0a29aa46 100644 --- a/mojo/edk/js/handle.h +++ b/mojo/edk/js/handle.h @@ -9,7 +9,7 @@ #include "gin/converter.h" #include "gin/handle.h" #include "gin/wrappable.h" -#include "third_party/mojo/src/mojo/public/cpp/system/core.h" +#include "mojo/public/cpp/system/core.h" namespace mojo { namespace edk { diff --git a/mojo/edk/js/handle_unittest.cc b/mojo/edk/js/handle_unittest.cc index ff15154573c6a4..6ee44445d3a3c7 100644 --- a/mojo/edk/js/handle_unittest.cc +++ b/mojo/edk/js/handle_unittest.cc @@ -5,8 +5,8 @@ #include "base/macros.h" #include "mojo/edk/js/handle.h" #include "mojo/edk/js/handle_close_observer.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 edk { diff --git a/mojo/edk/js/mojo_runner_delegate.h b/mojo/edk/js/mojo_runner_delegate.h index 9a66d88f599066..7b50b30a690991 100644 --- a/mojo/edk/js/mojo_runner_delegate.h +++ b/mojo/edk/js/mojo_runner_delegate.h @@ -7,7 +7,7 @@ #include "base/macros.h" #include "gin/modules/module_runner_delegate.h" -#include "third_party/mojo/src/mojo/public/c/system/core.h" +#include "mojo/public/c/system/core.h" namespace mojo { namespace edk { diff --git a/mojo/edk/js/support.cc b/mojo/edk/js/support.cc index 0e9708f72ad4eb..3e4391cafa6572 100644 --- a/mojo/edk/js/support.cc +++ b/mojo/edk/js/support.cc @@ -14,7 +14,7 @@ #include "gin/wrappable.h" #include "mojo/edk/js/handle.h" #include "mojo/edk/js/waiting_callback.h" -#include "third_party/mojo/src/mojo/public/cpp/system/core.h" +#include "mojo/public/cpp/system/core.h" namespace mojo { namespace edk { diff --git a/mojo/edk/js/test/BUILD.gn b/mojo/edk/js/test/BUILD.gn index 86390ba5122917..e41e889a6fa7ff 100644 --- a/mojo/edk/js/test/BUILD.gn +++ b/mojo/edk/js/test/BUILD.gn @@ -14,11 +14,11 @@ test("js_unittests2") { "//base", "//gin:gin_test", "//mojo/environment:chromium", - "//third_party/mojo/src/mojo/public/cpp/environment", - "//third_party/mojo/src/mojo/public/cpp/system", - "//third_party/mojo/src/mojo/public/cpp/utility", - "//third_party/mojo/src/mojo/public/interfaces/bindings/tests:test_interfaces", - "//third_party/mojo/src/mojo/public/interfaces/bindings/tests:test_interfaces_experimental", + "//mojo/public/cpp/environment", + "//mojo/public/cpp/system", + "//mojo/public/cpp/utility", + "//mojo/public/interfaces/bindings/tests:test_interfaces", + "//mojo/public/interfaces/bindings/tests:test_interfaces_experimental", ] sources = [ @@ -33,11 +33,11 @@ test("js_integration_tests2") { "../../js/tests:js_to_cpp_tests", "../../test:run_all_unittests", "../../test:test_support", - "//third_party/mojo/src/mojo/public/cpp/bindings", - "//third_party/mojo/src/mojo/public/interfaces/bindings/tests:test_interfaces", "//base", "//gin:gin_test", "//mojo/environment:chromium", + "//mojo/public/cpp/bindings", + "//mojo/public/interfaces/bindings/tests:test_interfaces", ] sources = [ diff --git a/mojo/edk/js/test/run_js_tests.cc b/mojo/edk/js/test/run_js_tests.cc index 1505527c55b24b..76de3e6a369bae 100644 --- a/mojo/edk/js/test/run_js_tests.cc +++ b/mojo/edk/js/test/run_js_tests.cc @@ -10,8 +10,8 @@ #include "gin/test/gtest.h" #include "mojo/edk/js/core.h" #include "mojo/edk/js/support.h" +#include "mojo/public/cpp/environment/environment.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/cpp/environment/environment.h" namespace mojo { namespace edk { diff --git a/mojo/edk/js/tests/BUILD.gn b/mojo/edk/js/tests/BUILD.gn index ee2af69e934fb7..8d4a959b545229 100644 --- a/mojo/edk/js/tests/BUILD.gn +++ b/mojo/edk/js/tests/BUILD.gn @@ -3,7 +3,7 @@ # found in the LICENSE file. import("../../mojo_edk.gni") -import("../../../../third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") +import("../../../../mojo/public/tools/bindings/mojom.gni") mojo_edk_source_set("js_to_cpp_tests") { testonly = true @@ -13,10 +13,10 @@ mojo_edk_source_set("js_to_cpp_tests") { "//gin:gin_test", "//mojo/edk/js", "//mojo/edk/test:test_support", - "//third_party/mojo/src/mojo/public/cpp/bindings", - "//third_party/mojo/src/mojo/public/cpp/system", - "//third_party/mojo/src/mojo/public/interfaces/bindings/tests:test_interfaces", - "//third_party/mojo/src/mojo/public/interfaces/bindings/tests:test_interfaces_experimental", + "//mojo/public/cpp/bindings", + "//mojo/public/cpp/system", + "//mojo/public/interfaces/bindings/tests:test_interfaces", + "//mojo/public/interfaces/bindings/tests:test_interfaces_experimental", ] sources = [ diff --git a/mojo/edk/js/tests/js_to_cpp_tests.cc b/mojo/edk/js/tests/js_to_cpp_tests.cc index 97002f1e604c23..f9a9b92ed342ee 100644 --- a/mojo/edk/js/tests/js_to_cpp_tests.cc +++ b/mojo/edk/js/tests/js_to_cpp_tests.cc @@ -14,10 +14,10 @@ #include "mojo/edk/js/mojo_runner_delegate.h" #include "mojo/edk/js/tests/js_to_cpp.mojom.h" #include "mojo/edk/test/test_utils.h" +#include "mojo/public/cpp/bindings/binding.h" +#include "mojo/public/cpp/system/core.h" +#include "mojo/public/cpp/system/macros.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" -#include "third_party/mojo/src/mojo/public/cpp/system/core.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace edk { diff --git a/mojo/edk/js/waiting_callback.cc b/mojo/edk/js/waiting_callback.cc index 53345ac1cc2878..4d017fe59cfbff 100644 --- a/mojo/edk/js/waiting_callback.cc +++ b/mojo/edk/js/waiting_callback.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/message_loop/message_loop.h" #include "gin/per_context_data.h" -#include "third_party/mojo/src/mojo/public/cpp/environment/environment.h" +#include "mojo/public/cpp/environment/environment.h" namespace mojo { namespace edk { diff --git a/mojo/edk/js/waiting_callback.h b/mojo/edk/js/waiting_callback.h index 2deedfc1525bb7..c1b76aaf47e6af 100644 --- a/mojo/edk/js/waiting_callback.h +++ b/mojo/edk/js/waiting_callback.h @@ -11,8 +11,8 @@ #include "gin/wrappable.h" #include "mojo/edk/js/handle.h" #include "mojo/edk/js/handle_close_observer.h" -#include "third_party/mojo/src/mojo/public/c/environment/async_waiter.h" -#include "third_party/mojo/src/mojo/public/cpp/system/core.h" +#include "mojo/public/c/environment/async_waiter.h" +#include "mojo/public/cpp/system/core.h" namespace mojo { namespace edk { diff --git a/mojo/edk/mojo_edk.gni b/mojo/edk/mojo_edk.gni index efb2a5f46def6a..60d6e9f6bc1a6b 100644 --- a/mojo/edk/mojo_edk.gni +++ b/mojo/edk/mojo_edk.gni @@ -2,13 +2,12 @@ # 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/mojo_sdk.gni") +import("../../mojo/public/mojo_sdk.gni") # A mojo_edk_source_set is a mojo_sdk_source_set that does not restrict # external dependencies and understands the following additional variables, all # of which admit a list of the relevant elements specified relative to the # location of the Mojo EDK: -# allow_circular_mojo_edk_includes_from template("mojo_edk_source_set") { mojo_sdk_source_set(target_name) { if (defined(invoker.public_deps) || defined(invoker.deps)) { @@ -40,15 +39,6 @@ template("mojo_edk_source_set") { if (defined(invoker.allow_circular_includes_from)) { allow_circular_includes_from += invoker.allow_circular_includes_from } - if (defined(invoker.allow_circular_mojo_edk_includes_from)) { - foreach(edk_target, invoker.allow_circular_mojo_edk_includes_from) { - # Check that the EDK target was not mistakenly given as an absolute - # path. - assert(get_path_info(edk_target, "abspath") != edk_target) - allow_circular_includes_from += - [ rebase_path(edk_target, ".", mojo_root) ] - } - } if (defined(invoker.public_deps)) { public_deps = invoker.public_deps diff --git a/mojo/edk/system/BUILD.gn b/mojo/edk/system/BUILD.gn index 577a0720044c96..358a9fa8ca1103 100644 --- a/mojo/edk/system/BUILD.gn +++ b/mojo/edk/system/BUILD.gn @@ -4,7 +4,7 @@ import("../mojo_edk.gni") import("//testing/test.gni") -import("../../../third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") +import("../../../mojo/public/tools/bindings/mojom.gni") if (is_android) { import("//build/config/android/config.gni") @@ -94,8 +94,8 @@ static_library("system") { "../embedder", "../embedder:delegates", "../embedder:platform", - "../../../third_party/mojo/src/mojo/public/c/system", - "../../../third_party/mojo/src/mojo/public/cpp/system", + "../../../mojo/public/c/system", + "../../../mojo/public/cpp/system", ] deps = [ @@ -131,8 +131,8 @@ mojo_edk_source_set("test_utils") { ] public_deps = [ - "//third_party/mojo/src/mojo/public/c/system", - "//third_party/mojo/src/mojo/public/cpp/system", + "//mojo/public/c/system", + "//mojo/public/cpp/system", ] deps = [ @@ -179,7 +179,7 @@ test("mojo_system_unittests2") { # TODO(use_chrome_edk): remove "2" "../embedder:embedder_unittests2", - "../../../third_party/mojo/src/mojo/public/cpp/environment:standalone", + "../../../mojo/public/cpp/environment:standalone", "../test:test_support", "//base", "//base/test:test_support", @@ -206,7 +206,7 @@ test("mojo_message_pipe_perftests2") { ":test_utils", "../test:test_support", "../test:run_all_perftests", - "../../../third_party/mojo/src/mojo/public/cpp/environment:standalone", + "../../../mojo/public/cpp/environment:standalone", "//base", "//base/test:test_support", "//testing/gtest", diff --git a/mojo/edk/system/async_waiter.h b/mojo/edk/system/async_waiter.h index b8eefa00906206..19ef5d6fee43cc 100644 --- a/mojo/edk/system/async_waiter.h +++ b/mojo/edk/system/async_waiter.h @@ -8,8 +8,8 @@ #include "base/callback.h" #include "mojo/edk/system/awakable.h" #include "mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/c/system/types.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/c/system/types.h" +#include "mojo/public/cpp/system/macros.h" namespace mojo { namespace edk { diff --git a/mojo/edk/system/awakable.h b/mojo/edk/system/awakable.h index a99038fcd085df..2cb10f5835c5a7 100644 --- a/mojo/edk/system/awakable.h +++ b/mojo/edk/system/awakable.h @@ -8,7 +8,7 @@ #include #include "mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/c/system/types.h" +#include "mojo/public/c/system/types.h" namespace mojo { namespace edk { diff --git a/mojo/edk/system/awakable_list.h b/mojo/edk/system/awakable_list.h index 40ce9ada52e06c..4e788eeb34178b 100644 --- a/mojo/edk/system/awakable_list.h +++ b/mojo/edk/system/awakable_list.h @@ -10,8 +10,8 @@ #include #include "mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/c/system/types.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/c/system/types.h" +#include "mojo/public/cpp/system/macros.h" namespace mojo { namespace edk { diff --git a/mojo/edk/system/core.cc b/mojo/edk/system/core.cc index fe9d09f4458a20..ac513da7335452 100644 --- a/mojo/edk/system/core.cc +++ b/mojo/edk/system/core.cc @@ -21,8 +21,8 @@ #include "mojo/edk/system/message_pipe_dispatcher.h" #include "mojo/edk/system/shared_buffer_dispatcher.h" #include "mojo/edk/system/waiter.h" -#include "third_party/mojo/src/mojo/public/c/system/macros.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/c/system/macros.h" +#include "mojo/public/cpp/system/macros.h" namespace mojo { namespace edk { diff --git a/mojo/edk/system/core.h b/mojo/edk/system/core.h index 1e2cd3f1bf2d74..3c2154a798f0c4 100644 --- a/mojo/edk/system/core.h +++ b/mojo/edk/system/core.h @@ -14,11 +14,11 @@ #include "mojo/edk/system/handle_table.h" #include "mojo/edk/system/mapping_table.h" #include "mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/c/system/buffer.h" -#include "third_party/mojo/src/mojo/public/c/system/data_pipe.h" -#include "third_party/mojo/src/mojo/public/c/system/message_pipe.h" -#include "third_party/mojo/src/mojo/public/c/system/types.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/c/system/buffer.h" +#include "mojo/public/c/system/data_pipe.h" +#include "mojo/public/c/system/message_pipe.h" +#include "mojo/public/c/system/types.h" +#include "mojo/public/cpp/system/macros.h" namespace mojo { @@ -69,7 +69,7 @@ class MOJO_SYSTEM_IMPL_EXPORT Core { // API functions, referenced below. // These methods correspond to the API functions defined in - // "third_party/mojo/src/mojo/public/c/system/functions.h": + // "mojo/public/c/system/functions.h": MojoTimeTicks GetTimeTicksNow(); MojoResult Close(MojoHandle handle); MojoResult Wait(MojoHandle handle, @@ -84,7 +84,7 @@ class MOJO_SYSTEM_IMPL_EXPORT Core { MojoHandleSignalsState* signals_states); // These methods correspond to the API functions defined in - // "third_party/mojo/src/mojo/public/c/system/message_pipe.h": + // "mojo/public/c/system/message_pipe.h": MojoResult CreateMessagePipe( const MojoCreateMessagePipeOptions* options, MojoHandle* message_pipe_handle0, @@ -103,7 +103,7 @@ class MOJO_SYSTEM_IMPL_EXPORT Core { MojoReadMessageFlags flags); // These methods correspond to the API functions defined in - // "third_party/mojo/src/mojo/public/c/system/data_pipe.h": + // "mojo/public/c/system/data_pipe.h": MojoResult CreateDataPipe( const MojoCreateDataPipeOptions* options, MojoHandle* data_pipe_producer_handle, @@ -130,7 +130,7 @@ class MOJO_SYSTEM_IMPL_EXPORT Core { uint32_t num_bytes_read); // These methods correspond to the API functions defined in - // "third_party/mojo/src/mojo/public/c/system/buffer.h": + // "mojo/public/c/system/buffer.h": MojoResult CreateSharedBuffer( const MojoCreateSharedBufferOptions* options, uint64_t num_bytes, diff --git a/mojo/edk/system/core_test_base.cc b/mojo/edk/system/core_test_base.cc index e9b5589eddffb9..2a2851b601a383 100644 --- a/mojo/edk/system/core_test_base.cc +++ b/mojo/edk/system/core_test_base.cc @@ -11,7 +11,7 @@ #include "mojo/edk/system/configuration.h" #include "mojo/edk/system/core.h" #include "mojo/edk/system/dispatcher.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/cpp/system/macros.h" namespace mojo { namespace edk { diff --git a/mojo/edk/system/core_test_base.h b/mojo/edk/system/core_test_base.h index 84bc2e62a2136f..774dc957ffb4ef 100644 --- a/mojo/edk/system/core_test_base.h +++ b/mojo/edk/system/core_test_base.h @@ -8,9 +8,9 @@ #include "base/synchronization/lock.h" #include "mojo/edk/embedder/embedder_internal.h" #include "mojo/edk/system/test_utils.h" +#include "mojo/public/c/system/types.h" +#include "mojo/public/cpp/system/macros.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/c/system/types.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace edk { diff --git a/mojo/edk/system/core_unittest.cc b/mojo/edk/system/core_unittest.cc index 6dfadee4bb918c..28a038c128fdf9 100644 --- a/mojo/edk/system/core_unittest.cc +++ b/mojo/edk/system/core_unittest.cc @@ -13,7 +13,7 @@ #include "mojo/edk/system/awakable.h" #include "mojo/edk/system/core_test_base.h" #include "mojo/edk/system/test_utils.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/cpp/system/macros.h" namespace mojo { namespace edk { diff --git a/mojo/edk/system/data_pipe.h b/mojo/edk/system/data_pipe.h index 46a895de77bc41..f17416bfdc220b 100644 --- a/mojo/edk/system/data_pipe.h +++ b/mojo/edk/system/data_pipe.h @@ -9,9 +9,9 @@ #include "mojo/edk/embedder/platform_handle_vector.h" #include "mojo/edk/embedder/scoped_platform_handle.h" #include "mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/c/system/data_pipe.h" -#include "third_party/mojo/src/mojo/public/c/system/types.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/c/system/data_pipe.h" +#include "mojo/public/c/system/types.h" +#include "mojo/public/cpp/system/macros.h" namespace mojo { namespace edk { diff --git a/mojo/edk/system/data_pipe_consumer_dispatcher.h b/mojo/edk/system/data_pipe_consumer_dispatcher.h index c172c5ba2627de..0b385bae9a6138 100644 --- a/mojo/edk/system/data_pipe_consumer_dispatcher.h +++ b/mojo/edk/system/data_pipe_consumer_dispatcher.h @@ -10,7 +10,7 @@ #include "mojo/edk/system/dispatcher.h" #include "mojo/edk/system/raw_channel.h" #include "mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/cpp/system/macros.h" namespace mojo { namespace edk { diff --git a/mojo/edk/system/data_pipe_producer_dispatcher.h b/mojo/edk/system/data_pipe_producer_dispatcher.h index f07c828881acf1..e387d2fcb089d4 100644 --- a/mojo/edk/system/data_pipe_producer_dispatcher.h +++ b/mojo/edk/system/data_pipe_producer_dispatcher.h @@ -10,7 +10,7 @@ #include "mojo/edk/system/dispatcher.h" #include "mojo/edk/system/raw_channel.h" #include "mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/cpp/system/macros.h" namespace mojo { namespace edk { diff --git a/mojo/edk/system/data_pipe_unittest.cc b/mojo/edk/system/data_pipe_unittest.cc index 6c6593e63fd3f5..5c8f0f84eb74e9 100644 --- a/mojo/edk/system/data_pipe_unittest.cc +++ b/mojo/edk/system/data_pipe_unittest.cc @@ -13,11 +13,11 @@ #include "mojo/edk/embedder/simple_platform_support.h" #include "mojo/edk/system/test_utils.h" #include "mojo/edk/system/waiter.h" +#include "mojo/public/c/system/data_pipe.h" +#include "mojo/public/c/system/functions.h" +#include "mojo/public/c/system/message_pipe.h" +#include "mojo/public/cpp/system/macros.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/c/system/data_pipe.h" -#include "third_party/mojo/src/mojo/public/c/system/functions.h" -#include "third_party/mojo/src/mojo/public/c/system/message_pipe.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace edk { diff --git a/mojo/edk/system/dispatcher.h b/mojo/edk/system/dispatcher.h index df1e9759388fb0..fb757c7c95d066 100644 --- a/mojo/edk/system/dispatcher.h +++ b/mojo/edk/system/dispatcher.h @@ -17,11 +17,11 @@ #include "mojo/edk/embedder/platform_handle_vector.h" #include "mojo/edk/system/handle_signals_state.h" #include "mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/c/system/buffer.h" -#include "third_party/mojo/src/mojo/public/c/system/data_pipe.h" -#include "third_party/mojo/src/mojo/public/c/system/message_pipe.h" -#include "third_party/mojo/src/mojo/public/c/system/types.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/c/system/buffer.h" +#include "mojo/public/c/system/data_pipe.h" +#include "mojo/public/c/system/message_pipe.h" +#include "mojo/public/c/system/types.h" +#include "mojo/public/cpp/system/macros.h" namespace mojo { namespace edk { diff --git a/mojo/edk/system/dispatcher_unittest.cc b/mojo/edk/system/dispatcher_unittest.cc index 7145eb39dc174a..8b3017e4613ce1 100644 --- a/mojo/edk/system/dispatcher_unittest.cc +++ b/mojo/edk/system/dispatcher_unittest.cc @@ -10,8 +10,8 @@ #include "base/threading/simple_thread.h" #include "mojo/edk/embedder/platform_shared_buffer.h" #include "mojo/edk/system/waiter.h" +#include "mojo/public/cpp/system/macros.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace edk { diff --git a/mojo/edk/system/handle_signals_state.h b/mojo/edk/system/handle_signals_state.h index 2209ffa24274e7..1c47a288c1e279 100644 --- a/mojo/edk/system/handle_signals_state.h +++ b/mojo/edk/system/handle_signals_state.h @@ -6,7 +6,7 @@ #define MOJO_EDK_SYSTEM_HANDLE_SIGNALS_STATE_H_ #include "mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/c/system/types.h" +#include "mojo/public/c/system/types.h" namespace mojo { namespace edk { diff --git a/mojo/edk/system/handle_table.h b/mojo/edk/system/handle_table.h index 57d1aed26435ee..de5ac05174be0f 100644 --- a/mojo/edk/system/handle_table.h +++ b/mojo/edk/system/handle_table.h @@ -11,8 +11,8 @@ #include "base/containers/hash_tables.h" #include "base/memory/ref_counted.h" #include "mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/c/system/types.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/c/system/types.h" +#include "mojo/public/cpp/system/macros.h" namespace mojo { namespace edk { diff --git a/mojo/edk/system/mapping_table.h b/mojo/edk/system/mapping_table.h index fd822989f170ff..fb2acf365fec3d 100644 --- a/mojo/edk/system/mapping_table.h +++ b/mojo/edk/system/mapping_table.h @@ -12,8 +12,8 @@ #include "base/containers/hash_tables.h" #include "base/memory/scoped_ptr.h" #include "mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/c/system/types.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/c/system/types.h" +#include "mojo/public/cpp/system/macros.h" namespace mojo { diff --git a/mojo/edk/system/master_impl.h b/mojo/edk/system/master_impl.h index d6d1a8d758cbfc..621db1366e3989 100644 --- a/mojo/edk/system/master_impl.h +++ b/mojo/edk/system/master_impl.h @@ -8,7 +8,7 @@ #include "base/process/process.h" #include "mojo/edk/system/master.mojom.h" #include "mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/cpp/system/macros.h" #if defined(OS_WIN) #include diff --git a/mojo/edk/system/master_impl_unittest.cc b/mojo/edk/system/master_impl_unittest.cc index 04d656e44e7546..a0a731e612ad4c 100644 --- a/mojo/edk/system/master_impl_unittest.cc +++ b/mojo/edk/system/master_impl_unittest.cc @@ -10,8 +10,8 @@ #include "base/files/scoped_temp_dir.h" #include "mojo/edk/embedder/embedder.h" #include "mojo/edk/test/test_utils.h" +#include "mojo/public/c/system/macros.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/c/system/macros.h" namespace mojo { namespace edk { diff --git a/mojo/edk/system/message_in_transit.h b/mojo/edk/system/message_in_transit.h index 34396b85511daa..78dc40a2d28b07 100644 --- a/mojo/edk/system/message_in_transit.h +++ b/mojo/edk/system/message_in_transit.h @@ -15,7 +15,7 @@ #include "base/memory/scoped_ptr.h" #include "mojo/edk/system/dispatcher.h" #include "mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/cpp/system/macros.h" namespace mojo { namespace edk { diff --git a/mojo/edk/system/message_in_transit_queue.h b/mojo/edk/system/message_in_transit_queue.h index a6e6adbea64642..4a054900056b6f 100644 --- a/mojo/edk/system/message_in_transit_queue.h +++ b/mojo/edk/system/message_in_transit_queue.h @@ -10,7 +10,7 @@ #include "base/memory/scoped_ptr.h" #include "mojo/edk/system/message_in_transit.h" #include "mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/cpp/system/macros.h" namespace mojo { namespace edk { diff --git a/mojo/edk/system/message_pipe_dispatcher.h b/mojo/edk/system/message_pipe_dispatcher.h index fa7b6e768b6725..524858309a1a28 100644 --- a/mojo/edk/system/message_pipe_dispatcher.h +++ b/mojo/edk/system/message_pipe_dispatcher.h @@ -11,7 +11,7 @@ #include "mojo/edk/system/dispatcher.h" #include "mojo/edk/system/raw_channel.h" #include "mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/cpp/system/macros.h" namespace mojo { namespace edk { diff --git a/mojo/edk/system/message_pipe_perftest.cc b/mojo/edk/system/message_pipe_perftest.cc index 053b0009e332a3..5d59e6566083d9 100644 --- a/mojo/edk/system/message_pipe_perftest.cc +++ b/mojo/edk/system/message_pipe_perftest.cc @@ -12,9 +12,9 @@ #include "mojo/edk/system/message_pipe_test_utils.h" #include "mojo/edk/system/test_utils.h" #include "mojo/edk/test/test_utils.h" +#include "mojo/public/c/system/functions.h" +#include "mojo/public/cpp/system/message_pipe.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/c/system/functions.h" -#include "third_party/mojo/src/mojo/public/cpp/system/message_pipe.h" namespace mojo { namespace edk { diff --git a/mojo/edk/system/message_pipe_test_utils.h b/mojo/edk/system/message_pipe_test_utils.h index ae6f61aaf1dea4..e067329d12b2e0 100644 --- a/mojo/edk/system/message_pipe_test_utils.h +++ b/mojo/edk/system/message_pipe_test_utils.h @@ -11,7 +11,7 @@ #include "mojo/edk/system/test_utils.h" #include "mojo/edk/test/multiprocess_test_helper.h" #include "mojo/edk/test/scoped_ipc_support.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/cpp/system/macros.h" namespace mojo { namespace edk { diff --git a/mojo/edk/system/message_pipe_unittest.cc b/mojo/edk/system/message_pipe_unittest.cc index 17e6b62bb3482a..9283acc35e1b40 100644 --- a/mojo/edk/system/message_pipe_unittest.cc +++ b/mojo/edk/system/message_pipe_unittest.cc @@ -4,8 +4,8 @@ #include "base/memory/ref_counted.h" #include "mojo/edk/system/test_utils.h" -#include "third_party/mojo/src/mojo/public/c/system/core.h" -#include "third_party/mojo/src/mojo/public/c/system/types.h" +#include "mojo/public/c/system/core.h" +#include "mojo/public/c/system/types.h" namespace mojo { namespace edk { diff --git a/mojo/edk/system/options_validation.h b/mojo/edk/system/options_validation.h index 2299f611c82219..6925075a3d0551 100644 --- a/mojo/edk/system/options_validation.h +++ b/mojo/edk/system/options_validation.h @@ -18,8 +18,8 @@ #include "base/logging.h" #include "mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/c/system/types.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/c/system/types.h" +#include "mojo/public/cpp/system/macros.h" namespace mojo { namespace edk { diff --git a/mojo/edk/system/options_validation_unittest.cc b/mojo/edk/system/options_validation_unittest.cc index bd4e14d247d2fe..d2c81808dae597 100644 --- a/mojo/edk/system/options_validation_unittest.cc +++ b/mojo/edk/system/options_validation_unittest.cc @@ -7,8 +7,8 @@ #include #include +#include "mojo/public/c/system/macros.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/c/system/macros.h" namespace mojo { namespace edk { diff --git a/mojo/edk/system/platform_handle_dispatcher.h b/mojo/edk/system/platform_handle_dispatcher.h index 701d6ef2b6e541..99ffcac7b06acb 100644 --- a/mojo/edk/system/platform_handle_dispatcher.h +++ b/mojo/edk/system/platform_handle_dispatcher.h @@ -8,7 +8,7 @@ #include "mojo/edk/embedder/scoped_platform_handle.h" #include "mojo/edk/system/simple_dispatcher.h" #include "mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/cpp/system/macros.h" namespace mojo { namespace edk { diff --git a/mojo/edk/system/raw_channel.h b/mojo/edk/system/raw_channel.h index f6ff1af5274544..07b7881640218a 100644 --- a/mojo/edk/system/raw_channel.h +++ b/mojo/edk/system/raw_channel.h @@ -15,7 +15,7 @@ #include "mojo/edk/system/message_in_transit.h" #include "mojo/edk/system/message_in_transit_queue.h" #include "mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/cpp/system/macros.h" namespace mojo { namespace edk { diff --git a/mojo/edk/system/raw_channel_posix.cc b/mojo/edk/system/raw_channel_posix.cc index 9f68d06ace9993..e6627d627ea972 100644 --- a/mojo/edk/system/raw_channel_posix.cc +++ b/mojo/edk/system/raw_channel_posix.cc @@ -26,7 +26,7 @@ #include "mojo/edk/embedder/platform_handle.h" #include "mojo/edk/embedder/platform_handle_vector.h" #include "mojo/edk/system/transport_data.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/cpp/system/macros.h" #if !defined(SO_PEEK_OFF) #define SO_PEEK_OFF 42 diff --git a/mojo/edk/system/raw_channel_unittest.cc b/mojo/edk/system/raw_channel_unittest.cc index d9be055b6d4399..fdc77d8c7c0d29 100644 --- a/mojo/edk/system/raw_channel_unittest.cc +++ b/mojo/edk/system/raw_channel_unittest.cc @@ -31,8 +31,8 @@ #include "mojo/edk/system/test_utils.h" #include "mojo/edk/system/transport_data.h" #include "mojo/edk/test/test_utils.h" +#include "mojo/public/cpp/system/macros.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace edk { diff --git a/mojo/edk/system/raw_channel_win.cc b/mojo/edk/system/raw_channel_win.cc index ec315017e7beda..3063ebe5ddc821 100644 --- a/mojo/edk/system/raw_channel_win.cc +++ b/mojo/edk/system/raw_channel_win.cc @@ -19,7 +19,7 @@ #include "mojo/edk/embedder/embedder_internal.h" #include "mojo/edk/embedder/platform_handle.h" #include "mojo/edk/system/transport_data.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/cpp/system/macros.h" #define STATUS_CANCELLED 0xC0000120 #define STATUS_PIPE_BROKEN 0xC000014B diff --git a/mojo/edk/system/shared_buffer_dispatcher.cc b/mojo/edk/system/shared_buffer_dispatcher.cc index 1f373d8f8955b6..1f15ea2d576059 100644 --- a/mojo/edk/system/shared_buffer_dispatcher.cc +++ b/mojo/edk/system/shared_buffer_dispatcher.cc @@ -12,7 +12,7 @@ #include "mojo/edk/embedder/platform_support.h" #include "mojo/edk/system/configuration.h" #include "mojo/edk/system/options_validation.h" -#include "third_party/mojo/src/mojo/public/c/system/macros.h" +#include "mojo/public/c/system/macros.h" namespace mojo { namespace edk { diff --git a/mojo/edk/system/shared_buffer_dispatcher.h b/mojo/edk/system/shared_buffer_dispatcher.h index 5c7cbb7cb46ac1..f3fc9e80cb14e4 100644 --- a/mojo/edk/system/shared_buffer_dispatcher.h +++ b/mojo/edk/system/shared_buffer_dispatcher.h @@ -8,7 +8,7 @@ #include "mojo/edk/embedder/platform_shared_buffer.h" #include "mojo/edk/system/simple_dispatcher.h" #include "mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/cpp/system/macros.h" namespace mojo { diff --git a/mojo/edk/system/shared_buffer_dispatcher_unittest.cc b/mojo/edk/system/shared_buffer_dispatcher_unittest.cc index bcbc49e1e66163..ceb936bf36941f 100644 --- a/mojo/edk/system/shared_buffer_dispatcher_unittest.cc +++ b/mojo/edk/system/shared_buffer_dispatcher_unittest.cc @@ -10,8 +10,8 @@ #include "mojo/edk/embedder/platform_shared_buffer.h" #include "mojo/edk/embedder/simple_platform_support.h" #include "mojo/edk/system/dispatcher.h" +#include "mojo/public/cpp/system/macros.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace edk { diff --git a/mojo/edk/system/simple_dispatcher.h b/mojo/edk/system/simple_dispatcher.h index 705c5a1de3498d..38e9d54cd48f10 100644 --- a/mojo/edk/system/simple_dispatcher.h +++ b/mojo/edk/system/simple_dispatcher.h @@ -10,7 +10,7 @@ #include "mojo/edk/system/awakable_list.h" #include "mojo/edk/system/dispatcher.h" #include "mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/cpp/system/macros.h" namespace mojo { namespace edk { diff --git a/mojo/edk/system/simple_dispatcher_unittest.cc b/mojo/edk/system/simple_dispatcher_unittest.cc index 6f85496170a6a0..b7f7d9530365d0 100644 --- a/mojo/edk/system/simple_dispatcher_unittest.cc +++ b/mojo/edk/system/simple_dispatcher_unittest.cc @@ -16,8 +16,8 @@ #include "mojo/edk/system/test_utils.h" #include "mojo/edk/system/waiter.h" #include "mojo/edk/system/waiter_test_utils.h" +#include "mojo/public/cpp/system/macros.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace edk { diff --git a/mojo/edk/system/test_utils.h b/mojo/edk/system/test_utils.h index 2baff3cba1981d..cf244b3a6df843 100644 --- a/mojo/edk/system/test_utils.h +++ b/mojo/edk/system/test_utils.h @@ -8,9 +8,9 @@ #include "base/test/test_io_thread.h" #include "base/time/time.h" #include "mojo/edk/test/scoped_ipc_support.h" +#include "mojo/public/c/system/types.h" +#include "mojo/public/cpp/system/macros.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/c/system/types.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace edk { diff --git a/mojo/edk/system/transport_data.h b/mojo/edk/system/transport_data.h index bd5646353b0517..16d8d01e3e82b3 100644 --- a/mojo/edk/system/transport_data.h +++ b/mojo/edk/system/transport_data.h @@ -16,7 +16,7 @@ #include "mojo/edk/embedder/platform_handle_vector.h" #include "mojo/edk/system/dispatcher.h" #include "mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/cpp/system/macros.h" namespace mojo { namespace edk { diff --git a/mojo/edk/system/waiter.h b/mojo/edk/system/waiter.h index 541e9c15cc7669..fa8e8361f09412 100644 --- a/mojo/edk/system/waiter.h +++ b/mojo/edk/system/waiter.h @@ -11,8 +11,8 @@ #include "base/synchronization/lock.h" #include "mojo/edk/system/awakable.h" #include "mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/c/system/types.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/c/system/types.h" +#include "mojo/public/cpp/system/macros.h" namespace mojo { namespace edk { diff --git a/mojo/edk/system/waiter_test_utils.h b/mojo/edk/system/waiter_test_utils.h index ca2158a053fe08..97434d50f6b3e3 100644 --- a/mojo/edk/system/waiter_test_utils.h +++ b/mojo/edk/system/waiter_test_utils.h @@ -12,8 +12,8 @@ #include "mojo/edk/system/dispatcher.h" #include "mojo/edk/system/handle_signals_state.h" #include "mojo/edk/system/waiter.h" -#include "third_party/mojo/src/mojo/public/c/system/types.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/c/system/types.h" +#include "mojo/public/cpp/system/macros.h" namespace mojo { namespace edk { diff --git a/mojo/edk/system/waiter_unittest.cc b/mojo/edk/system/waiter_unittest.cc index ed6be9a241c1a3..3e3827d30b1919 100644 --- a/mojo/edk/system/waiter_unittest.cc +++ b/mojo/edk/system/waiter_unittest.cc @@ -14,8 +14,8 @@ #include "base/synchronization/lock.h" #include "base/threading/simple_thread.h" #include "mojo/edk/system/test_utils.h" +#include "mojo/public/cpp/system/macros.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace edk { diff --git a/mojo/edk/test/BUILD.gn b/mojo/edk/test/BUILD.gn index 2f5fff5fcd2ab5..5f8ec7799d5793 100644 --- a/mojo/edk/test/BUILD.gn +++ b/mojo/edk/test/BUILD.gn @@ -3,7 +3,6 @@ # found in the LICENSE file. import("//mojo/edk/mojo_edk.gni") -import("//mojo/public/mojo.gni") import("//testing/test.gni") mojo_edk_source_set("test_support") { @@ -21,8 +20,8 @@ mojo_edk_source_set("test_support") { deps = [ "//base", "//base/test:test_support", + "//mojo/public/cpp/system", "//testing/gtest", - "//third_party/mojo/src/mojo/public/cpp/system", # TODO(use_chrome_edk): temporary since the Mojo wrapper primitives are # declared in third party only for now. @@ -41,8 +40,8 @@ mojo_edk_source_set("run_all_unittests") { ":test_support_impl", "//base", "//base/test:test_support", + "//mojo/public/c/test_support", "//testing/gtest", - "//third_party/mojo/src/mojo/public/c/test_support", # TODO(use_chrome_edk): temporary since the Mojo wrapper primitives are # declared in third party only for now. @@ -56,11 +55,11 @@ mojo_edk_source_set("run_all_perftests") { ":test_support_impl", "//base", "//base/test:test_support", + "//mojo/public/c/test_support", # TODO(use_chrome_edk): temporary since the Mojo wrapper primitives are # declared in third party only for now. "//third_party/mojo/src/mojo/edk/system", - "//third_party/mojo/src/mojo/public/c/test_support", ] sources = [ @@ -73,8 +72,8 @@ mojo_edk_source_set("test_support_impl") { deps = [ "//base", "//base/test:test_support", - "//third_party/mojo/src/mojo/public/c/test_support", - "//third_party/mojo/src/mojo/public/cpp/system", + "//mojo/public/c/test_support", + "//mojo/public/cpp/system", ] sources = [ @@ -98,27 +97,13 @@ group("public_tests") { ":mojo_public_system_unittests2", ":mojo_public_utility_unittests2", ] - - if (mojo_use_application_in_sdk) { - deps += [ ":mojo_public_application_unittests" ] - } -} - -if (mojo_use_application_in_sdk) { - # TODO(use_chrome_edk): remove "2" - test("mojo_public_application_unittests2") { - deps = [ - ":run_all_unittests", - "../../../third_party/mojo/src/mojo/public/cpp/application/tests", - ] - } } # TODO(use_chrome_edk): remove "2" test("mojo_public_bindings_unittests2") { deps = [ ":run_all_unittests", - "../../../third_party/mojo/src/mojo/public/cpp/bindings/tests", + "//mojo/public/cpp/bindings/tests", ] } @@ -126,7 +111,7 @@ test("mojo_public_bindings_unittests2") { test("mojo_public_environment_unittests2") { deps = [ ":run_all_unittests", - "../../../third_party/mojo/src/mojo/public/cpp/environment/tests", + "//mojo/public/cpp/environment/tests", ] } @@ -134,7 +119,7 @@ test("mojo_public_environment_unittests2") { test("mojo_public_system_perftests2") { deps = [ ":run_all_perftests", - "../../../third_party/mojo/src/mojo/public/c/system/tests:perftests", + "//mojo/public/c/system/tests:perftests", ] } @@ -142,7 +127,7 @@ test("mojo_public_system_perftests2") { test("mojo_public_system_unittests2") { deps = [ ":run_all_unittests", - "../../../third_party/mojo/src/mojo/public/cpp/system/tests", + "//mojo/public/cpp/system/tests", ] } @@ -150,6 +135,6 @@ test("mojo_public_system_unittests2") { test("mojo_public_utility_unittests2") { deps = [ ":run_all_unittests", - "../../../third_party/mojo/src/mojo/public/cpp/utility/tests", + "//mojo/public/cpp/utility/tests", ] } diff --git a/mojo/edk/test/multiprocess_test_helper.h b/mojo/edk/test/multiprocess_test_helper.h index 14a40350fd8520..3ff8b85ad9aeb8 100644 --- a/mojo/edk/test/multiprocess_test_helper.h +++ b/mojo/edk/test/multiprocess_test_helper.h @@ -11,8 +11,8 @@ #include "base/test/multiprocess_test.h" #include "base/test/test_timeouts.h" #include "mojo/edk/embedder/scoped_platform_handle.h" +#include "mojo/public/cpp/system/macros.h" #include "testing/multiprocess_func_list.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { diff --git a/mojo/edk/test/run_all_perftests.cc b/mojo/edk/test/run_all_perftests.cc index c9692ef3f70748..d700bc3a6f6719 100644 --- a/mojo/edk/test/run_all_perftests.cc +++ b/mojo/edk/test/run_all_perftests.cc @@ -6,7 +6,7 @@ #include "base/test/perf_test_suite.h" #include "mojo/edk/embedder/embedder.h" #include "mojo/edk/test/test_support_impl.h" -#include "third_party/mojo/src/mojo/public/tests/test_support_private.h" +#include "mojo/public/tests/test_support_private.h" int main(int argc, char** argv) { mojo::edk::Init(); diff --git a/mojo/edk/test/run_all_unittests.cc b/mojo/edk/test/run_all_unittests.cc index 26744ee5b2e2e1..23266444d925e8 100644 --- a/mojo/edk/test/run_all_unittests.cc +++ b/mojo/edk/test/run_all_unittests.cc @@ -11,8 +11,8 @@ #include "mojo/edk/embedder/embedder.h" #include "mojo/edk/test/scoped_ipc_support.h" #include "mojo/edk/test/test_support_impl.h" +#include "mojo/public/tests/test_support_private.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/tests/test_support_private.h" int main(int argc, char** argv) { #if !defined(OS_ANDROID) diff --git a/mojo/edk/test/scoped_ipc_support.cc b/mojo/edk/test/scoped_ipc_support.cc index c252529b6c7d83..c4168755e2e744 100644 --- a/mojo/edk/test/scoped_ipc_support.cc +++ b/mojo/edk/test/scoped_ipc_support.cc @@ -32,8 +32,7 @@ void ScopedIPCSupportHelper::Init( scoped_refptr io_thread_task_runner) { io_thread_task_runner_ = io_thread_task_runner; // Note: Run delegate methods on the I/O thread. - InitIPCSupport(io_thread_task_runner_, process_delegate, - io_thread_task_runner_); + InitIPCSupport(process_delegate, io_thread_task_runner_); } void ScopedIPCSupportHelper::OnShutdownCompleteImpl() { diff --git a/mojo/edk/test/scoped_ipc_support.h b/mojo/edk/test/scoped_ipc_support.h index 2bb5ff796154a7..cff0da7690e031 100644 --- a/mojo/edk/test/scoped_ipc_support.h +++ b/mojo/edk/test/scoped_ipc_support.h @@ -11,7 +11,7 @@ #include "base/task_runner.h" #include "mojo/edk/embedder/process_delegate.h" #include "mojo/edk/embedder/scoped_platform_handle.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/cpp/system/macros.h" namespace mojo { namespace edk { diff --git a/mojo/edk/test/test_support_impl.h b/mojo/edk/test/test_support_impl.h index 85e640ed6d4653..e672999b954b22 100644 --- a/mojo/edk/test/test_support_impl.h +++ b/mojo/edk/test/test_support_impl.h @@ -7,8 +7,8 @@ #include -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" -#include "third_party/mojo/src/mojo/public/tests/test_support_private.h" +#include "mojo/public/cpp/system/macros.h" +#include "mojo/public/tests/test_support_private.h" namespace mojo { namespace edk { diff --git a/mojo/environment/BUILD.gn b/mojo/environment/BUILD.gn index f376bace3b93f3..d794af7202e584 100644 --- a/mojo/environment/BUILD.gn +++ b/mojo/environment/BUILD.gn @@ -10,13 +10,13 @@ source_set("chromium") { "environment.cc", # TODO(vtl): This is kind of ugly. (See TODO in logging.h.) - "//third_party/mojo/src/mojo/public/cpp/environment/async_waiter.h", - "//third_party/mojo/src/mojo/public/cpp/environment/lib/async_waiter.cc", - "//third_party/mojo/src/mojo/public/cpp/environment/lib/logging.cc", - "//third_party/mojo/src/mojo/public/cpp/environment/lib/scoped_task_tracking.cc", - "//third_party/mojo/src/mojo/public/cpp/environment/lib/scoped_task_tracking.h", - "//third_party/mojo/src/mojo/public/cpp/environment/logging.h", - "//third_party/mojo/src/mojo/public/cpp/environment/task_tracker.h", + "//mojo/public/cpp/environment/async_waiter.h", + "//mojo/public/cpp/environment/lib/async_waiter.cc", + "//mojo/public/cpp/environment/lib/logging.cc", + "//mojo/public/cpp/environment/lib/scoped_task_tracking.cc", + "//mojo/public/cpp/environment/lib/scoped_task_tracking.h", + "//mojo/public/cpp/environment/logging.h", + "//mojo/public/cpp/environment/task_tracker.h", ] public_deps = [ @@ -24,10 +24,10 @@ source_set("chromium") { ] deps = [ - "//third_party/mojo/src/mojo/public/c/environment", - "//third_party/mojo/src/mojo/public/cpp/bindings:callback", - "//third_party/mojo/src/mojo/public/cpp/environment", - "//third_party/mojo/src/mojo/public/cpp/system", + "//mojo/public/c/environment", + "//mojo/public/cpp/bindings:callback", + "//mojo/public/cpp/environment", + "//mojo/public/cpp/system", ] } @@ -53,7 +53,7 @@ component("chromium_impl") { "//base", "//base/third_party/dynamic_annotations", "//mojo/message_pump", - "//third_party/mojo/src/mojo/public/c/system:for_component", - "//third_party/mojo/src/mojo/public/cpp/environment:environment", + "//mojo/public/c/system:for_component", + "//mojo/public/cpp/environment:environment", ] } diff --git a/mojo/environment/default_async_waiter_impl.h b/mojo/environment/default_async_waiter_impl.h index dea46214f6c6de..5140e35b4c2983 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 "third_party/mojo/src/mojo/public/c/environment/async_waiter.h" +#include "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 ca7323700b7566..c87a7276e434c2 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 "third_party/mojo/src/mojo/public/c/environment/logger.h" +#include "mojo/public/c/environment/logger.h" namespace mojo { namespace internal { diff --git a/mojo/environment/default_task_tracker_impl.h b/mojo/environment/default_task_tracker_impl.h index 0a417cfb1b3074..34d7f049d833e0 100644 --- a/mojo/environment/default_task_tracker_impl.h +++ b/mojo/environment/default_task_tracker_impl.h @@ -6,7 +6,7 @@ #define MOJO_ENVIRONMENT_DEFAULT_TASK_TRACKER_IMPL_H_ #include "mojo/environment/mojo_environment_impl_export.h" -#include "third_party/mojo/src/mojo/public/cpp/environment/task_tracker.h" +#include "mojo/public/cpp/environment/task_tracker.h" namespace mojo { namespace internal { diff --git a/mojo/environment/environment.cc b/mojo/environment/environment.cc index 7cc9b1cb05bc53..7b342e094743d8 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 "third_party/mojo/src/mojo/public/cpp/environment/environment.h" +#include "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/fetcher/BUILD.gn b/mojo/fetcher/BUILD.gn index da681cacba2cfe..358174c8078ba1 100644 --- a/mojo/fetcher/BUILD.gn +++ b/mojo/fetcher/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") source_set("fetcher") { sources = [ @@ -26,9 +26,9 @@ source_set("fetcher") { "//base", "//mojo/application/public/interfaces", "//mojo/common", + "//mojo/public/cpp/bindings", "//mojo/services/network/public/interfaces", "//mojo/services/updater", - "//third_party/mojo/src/mojo/public/cpp/bindings", "//url", ] deps = [ diff --git a/mojo/fetcher/data_fetcher.cc b/mojo/fetcher/data_fetcher.cc index 51c25a8e8a73f8..d5f875e28f7fe2 100644 --- a/mojo/fetcher/data_fetcher.cc +++ b/mojo/fetcher/data_fetcher.cc @@ -10,8 +10,8 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/thread_task_runner_handle.h" +#include "mojo/public/cpp/system/data_pipe.h" #include "net/base/data_url.h" -#include "third_party/mojo/src/mojo/public/cpp/system/data_pipe.h" namespace mojo { namespace fetcher { diff --git a/mojo/fetcher/data_fetcher_unittest.cc b/mojo/fetcher/data_fetcher_unittest.cc index b16123005041d4..cfaeb843802857 100644 --- a/mojo/fetcher/data_fetcher_unittest.cc +++ b/mojo/fetcher/data_fetcher_unittest.cc @@ -11,8 +11,8 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.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 mojo { namespace fetcher { diff --git a/mojo/fetcher/network_fetcher_unittest.cc b/mojo/fetcher/network_fetcher_unittest.cc index cd6c8d9327a2d0..e9583e9816c79f 100644 --- a/mojo/fetcher/network_fetcher_unittest.cc +++ b/mojo/fetcher/network_fetcher_unittest.cc @@ -11,10 +11,10 @@ #include "base/message_loop/message_loop.h" #include "base/run_loop.h" #include "mojo/fetcher/network_fetcher.h" +#include "mojo/public/cpp/bindings/strong_binding.h" #include "mojo/services/network/public/interfaces/url_loader.mojom.h" #include "mojo/services/network/public/interfaces/url_loader_factory.mojom.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" namespace mojo { namespace fetcher { diff --git a/mojo/gles2/BUILD.gn b/mojo/gles2/BUILD.gn index 39912e3bb014da..de8dda26724468 100644 --- a/mojo/gles2/BUILD.gn +++ b/mojo/gles2/BUILD.gn @@ -22,8 +22,8 @@ source_set("headers") { "//gpu/command_buffer/client", "//gpu/command_buffer/client:gles2_implementation", "//gpu/command_buffer/common", - "//third_party/mojo/src/mojo/public/c/gles2", - "//third_party/mojo/src/mojo/public/cpp/bindings", + "//mojo/public/c/gles2", + "//mojo/public/cpp/bindings", ] } @@ -61,10 +61,10 @@ component("gles2") { "//gpu/command_buffer/common", "//mojo/environment:chromium", "//mojo/platform_handle:for_component", - "//third_party/mojo/src/mojo/public/c/gles2", - "//third_party/mojo/src/mojo/public/c/system:for_component", - "//third_party/mojo/src/mojo/public/cpp/bindings", - "//third_party/mojo/src/mojo/public/cpp/system", + "//mojo/public/c/gles2", + "//mojo/public/c/system:for_component", + "//mojo/public/cpp/bindings", + "//mojo/public/cpp/system", ] if (!is_component_build) { diff --git a/mojo/gles2/command_buffer_client_impl.h b/mojo/gles2/command_buffer_client_impl.h index d04e73d203a693..b0ce570652b8ec 100644 --- a/mojo/gles2/command_buffer_client_impl.h +++ b/mojo/gles2/command_buffer_client_impl.h @@ -14,7 +14,7 @@ #include "gpu/command_buffer/client/gpu_control.h" #include "gpu/command_buffer/common/command_buffer.h" #include "gpu/command_buffer/common/command_buffer_shared.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" +#include "mojo/public/cpp/bindings/binding.h" namespace base { class RunLoop; diff --git a/mojo/gles2/gles2_context.cc b/mojo/gles2/gles2_context.cc index d16bc42a89560a..5574840129cf68 100644 --- a/mojo/gles2/gles2_context.cc +++ b/mojo/gles2/gles2_context.cc @@ -7,8 +7,8 @@ #include "gpu/command_buffer/client/gles2_cmd_helper.h" #include "gpu/command_buffer/client/gles2_implementation.h" #include "gpu/command_buffer/client/transfer_buffer.h" -#include "third_party/mojo/src/mojo/public/c/gles2/gles2.h" -#include "third_party/mojo/src/mojo/public/cpp/system/core.h" +#include "mojo/public/c/gles2/gles2.h" +#include "mojo/public/cpp/system/core.h" namespace gles2 { diff --git a/mojo/gles2/gles2_context.h b/mojo/gles2/gles2_context.h index 829b324032cf63..5ab4b844d2a62b 100644 --- a/mojo/gles2/gles2_context.h +++ b/mojo/gles2/gles2_context.h @@ -11,7 +11,7 @@ #include "base/memory/scoped_ptr.h" #include "gpu/command_buffer/client/gles2_implementation.h" #include "mojo/gles2/command_buffer_client_impl.h" -#include "third_party/mojo/src/mojo/public/c/gles2/gles2.h" +#include "mojo/public/c/gles2/gles2.h" struct MojoGLES2ContextPrivate {}; diff --git a/mojo/gles2/gles2_impl.cc b/mojo/gles2/gles2_impl.cc index f1069774c01543..9e4fb9af9b1f87 100644 --- a/mojo/gles2/gles2_impl.cc +++ b/mojo/gles2/gles2_impl.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 "third_party/mojo/src/mojo/public/c/gles2/gles2.h" +#include "mojo/public/c/gles2/gles2.h" #include "base/lazy_instance.h" #include "base/threading/thread_local.h" @@ -11,7 +11,7 @@ #include "mojo/gles2/gles2_context.h" // Even though this isn't used here, we need to include it to get the symbols to // be exported in component build. -#include "third_party/mojo/src/mojo/public/c/gles2/chromium_extension.h" +#include "mojo/public/c/gles2/chromium_extension.h" using gles2::GLES2Context; @@ -94,8 +94,8 @@ void* MojoGLES2GetContextSupport(MojoGLES2Context context) { DCHECK(g_gpu_interface.Get().Get()); \ return g_gpu_interface.Get().Get()->Function ARGUMENTS; \ } -#include "third_party/mojo/src/mojo/public/c/gles2/gles2_call_visitor_autogen.h" -#include "third_party/mojo/src/mojo/public/c/gles2/gles2_call_visitor_chromium_extension_autogen.h" +#include "mojo/public/c/gles2/gles2_call_visitor_autogen.h" +#include "mojo/public/c/gles2/gles2_call_visitor_chromium_extension_autogen.h" #undef VISIT_GL_CALL } // extern "C" diff --git a/mojo/gpu/BUILD.gn b/mojo/gpu/BUILD.gn index 4c5e35050b7146..ad372388a64363 100644 --- a/mojo/gpu/BUILD.gn +++ b/mojo/gpu/BUILD.gn @@ -13,6 +13,6 @@ source_set("mojo_gles2_implementation") { deps = [ "//base", "//gpu/command_buffer/client:gles2_interface", - "//third_party/mojo/src/mojo/public/c/gles2", + "//mojo/public/c/gles2", ] } diff --git a/mojo/gpu/mojo_gles2_impl_autogen.cc b/mojo/gpu/mojo_gles2_impl_autogen.cc index e6386ea2181c45..2413ba867d7635 100644 --- a/mojo/gpu/mojo_gles2_impl_autogen.cc +++ b/mojo/gpu/mojo_gles2_impl_autogen.cc @@ -11,8 +11,8 @@ #include "mojo/gpu/mojo_gles2_impl_autogen.h" #include "base/logging.h" -#include "third_party/mojo/src/mojo/public/c/gles2/chromium_extension.h" -#include "third_party/mojo/src/mojo/public/c/gles2/gles2.h" +#include "mojo/public/c/gles2/chromium_extension.h" +#include "mojo/public/c/gles2/gles2.h" namespace mojo { diff --git a/mojo/gpu/mojo_gles2_impl_autogen.h b/mojo/gpu/mojo_gles2_impl_autogen.h index b2c1867319b623..c0b1c86ec8df1c 100644 --- a/mojo/gpu/mojo_gles2_impl_autogen.h +++ b/mojo/gpu/mojo_gles2_impl_autogen.h @@ -14,7 +14,7 @@ #define MOJO_GPU_MOJO_GLES2_IMPL_AUTOGEN_H_ #include "gpu/command_buffer/client/gles2_interface.h" -#include "third_party/mojo/src/mojo/public/c/gles2/gles2.h" +#include "mojo/public/c/gles2/gles2.h" namespace mojo { diff --git a/mojo/message_pump/BUILD.gn b/mojo/message_pump/BUILD.gn index b8132a155cacc8..3f1298bf1fbe04 100644 --- a/mojo/message_pump/BUILD.gn +++ b/mojo/message_pump/BUILD.gn @@ -17,10 +17,13 @@ component("message_pump") { defines = [ "MOJO_MESSAGE_PUMP_IMPLEMENTATION" ] - deps = [ + public_deps = [ "//base", + "//mojo/public/cpp/system", + ] + + deps = [ "//base/third_party/dynamic_annotations", - "//third_party/mojo/src/mojo/public/c/system:for_component", - "//third_party/mojo/src/mojo/public/cpp/system", + "//mojo/public/c/system:for_component", ] } diff --git a/mojo/message_pump/handle_watcher.h b/mojo/message_pump/handle_watcher.h index 4f7115a8613fa7..1dc079ed6b239b 100644 --- a/mojo/message_pump/handle_watcher.h +++ b/mojo/message_pump/handle_watcher.h @@ -10,7 +10,7 @@ #include "base/memory/scoped_ptr.h" #include "base/run_loop.h" #include "mojo/message_pump/mojo_message_pump_export.h" -#include "third_party/mojo/src/mojo/public/cpp/system/core.h" +#include "mojo/public/cpp/system/core.h" namespace base { class Thread; diff --git a/mojo/message_pump/handle_watcher_perftest.cc b/mojo/message_pump/handle_watcher_perftest.cc index afdbb9f5af3b50..4ea4f26c00d3f8 100644 --- a/mojo/message_pump/handle_watcher_perftest.cc +++ b/mojo/message_pump/handle_watcher_perftest.cc @@ -12,9 +12,9 @@ #include "base/run_loop.h" #include "base/time/time.h" #include "mojo/message_pump/message_pump_mojo.h" +#include "mojo/public/cpp/test_support/test_support.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/test_support/test_support.h" -#include "third_party/mojo/src/mojo/public/cpp/test_support/test_utils.h" namespace mojo { namespace common { diff --git a/mojo/message_pump/handle_watcher_unittest.cc b/mojo/message_pump/handle_watcher_unittest.cc index bfbfa9f9a8f20c..f904df0586f180 100644 --- a/mojo/message_pump/handle_watcher_unittest.cc +++ b/mojo/message_pump/handle_watcher_unittest.cc @@ -15,9 +15,9 @@ #include "base/threading/thread.h" #include "mojo/message_pump/message_pump_mojo.h" #include "mojo/message_pump/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/message_pump/message_pump_mojo.h b/mojo/message_pump/message_pump_mojo.h index d4028f143fbe2d..06869730eec7a0 100644 --- a/mojo/message_pump/message_pump_mojo.h +++ b/mojo/message_pump/message_pump_mojo.h @@ -14,7 +14,7 @@ #include "base/synchronization/lock.h" #include "base/time/time.h" #include "mojo/message_pump/mojo_message_pump_export.h" -#include "third_party/mojo/src/mojo/public/cpp/system/core.h" +#include "mojo/public/cpp/system/core.h" namespace mojo { namespace common { diff --git a/mojo/message_pump/message_pump_mojo_handler.h b/mojo/message_pump/message_pump_mojo_handler.h index 35ae0369af471f..8beb9baa340fe3 100644 --- a/mojo/message_pump/message_pump_mojo_handler.h +++ b/mojo/message_pump/message_pump_mojo_handler.h @@ -6,7 +6,7 @@ #define MOJO_MESSAGE_PUMP_MESSAGE_PUMP_MOJO_HANDLER_H_ #include "mojo/message_pump/mojo_message_pump_export.h" -#include "third_party/mojo/src/mojo/public/cpp/system/core.h" +#include "mojo/public/cpp/system/core.h" namespace mojo { namespace common { diff --git a/mojo/message_pump/message_pump_mojo_unittest.cc b/mojo/message_pump/message_pump_mojo_unittest.cc index 51f3670c513d94..687d5f39dc0e94 100644 --- a/mojo/message_pump/message_pump_mojo_unittest.cc +++ b/mojo/message_pump/message_pump_mojo_unittest.cc @@ -7,8 +7,8 @@ #include "base/message_loop/message_loop_test.h" #include "base/run_loop.h" #include "mojo/message_pump/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/mojo_base.gyp b/mojo/mojo_base.gyp index 44879eb876fa3a..9c308c6f526b45 100644 --- a/mojo/mojo_base.gyp +++ b/mojo/mojo_base.gyp @@ -156,13 +156,13 @@ ], 'sources': [ # TODO(vtl): This is kind of ugly. (See TODO in logging.h.) - "../third_party/mojo/src/mojo/public/cpp/environment/async_waiter.h", - "../third_party/mojo/src/mojo/public/cpp/environment/lib/async_waiter.cc", - "../third_party/mojo/src/mojo/public/cpp/environment/lib/logging.cc", - "../third_party/mojo/src/mojo/public/cpp/environment/lib/scoped_task_tracking.cc", - "../third_party/mojo/src/mojo/public/cpp/environment/lib/scoped_task_tracking.cc", - "../third_party/mojo/src/mojo/public/cpp/environment/logging.h", - "../third_party/mojo/src/mojo/public/cpp/environment/task_tracker.h", + "../mojo/public/cpp/environment/async_waiter.h", + "../mojo/public/cpp/environment/lib/async_waiter.cc", + "../mojo/public/cpp/environment/lib/logging.cc", + "../mojo/public/cpp/environment/lib/scoped_task_tracking.cc", + "../mojo/public/cpp/environment/lib/scoped_task_tracking.cc", + "../mojo/public/cpp/environment/logging.h", + "../mojo/public/cpp/environment/task_tracker.h", 'environment/environment.cc', ], 'include_dirs': [ diff --git a/mojo/mojo_public_gles2_for_loadable_module.gypi b/mojo/mojo_public_gles2_for_loadable_module.gypi deleted file mode 100644 index cd5dbbf1a15f84..00000000000000 --- a/mojo/mojo_public_gles2_for_loadable_module.gypi +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 2014 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -# In the non component build, the thunks need to be linked directly into the -# loadable module since they define symbols that should be exported from that -# library. So, this variable expands out to either list the sources directly (in -# the component build where no symbols need to be exported) a dependency. -{ - 'conditions': [ - ['component=="shared_library"', { - 'dependencies': [ - '<(DEPTH)/mojo/mojo.gyp:mojo_gles2_impl', - ], - }, { # component!="shared_library" - 'defines': [ - 'MOJO_GLES2_IMPLEMENTATION', - 'GLES2_USE_MOJO', - ], - 'include_dirs': [ - '<(DEPTH)', - ], - 'dependencies': [ - '<(DEPTH)/third_party/khronos/khronos.gyp:khronos_headers' - ], - 'direct_dependent_settings': { - 'include_dirs': [ - '<(DEPTH)', - ], - 'defines': [ - 'GLES2_USE_MOJO', - ], - }, - 'sources': [ - '<(DEPTH)/third_party/mojo/src/mojo/public/c/gles2/gles2.h', - '<(DEPTH)/third_party/mojo/src/mojo/public/c/gles2/gles2_export.h', - '<(DEPTH)/third_party/mojo/src/mojo/public/platform/native/gles2_thunks.cc', - '<(DEPTH)/third_party/mojo/src/mojo/public/platform/native/gles2_thunks.h', - '<(DEPTH)/third_party/mojo/src/mojo/public/platform/native/gles2_impl_thunks.cc', - '<(DEPTH)/third_party/mojo/src/mojo/public/platform/native/gles2_impl_thunks.h', - '<(DEPTH)/third_party/mojo/src/mojo/public/platform/native/gles2_impl_chromium_texture_mailbox_thunks.cc', - '<(DEPTH)/third_party/mojo/src/mojo/public/platform/native/gles2_impl_chromium_texture_mailbox_thunks.h', - '<(DEPTH)/third_party/mojo/src/mojo/public/platform/native/gles2_impl_chromium_sync_point_thunks.cc', - '<(DEPTH)/third_party/mojo/src/mojo/public/platform/native/gles2_impl_chromium_sync_point_thunks.h', - ], - }] - ] -} diff --git a/mojo/package_manager/content_handler_unittest.cc b/mojo/package_manager/content_handler_unittest.cc index 0b1dca2ae32bc4..dfce5fcc06ac91 100644 --- a/mojo/package_manager/content_handler_unittest.cc +++ b/mojo/package_manager/content_handler_unittest.cc @@ -16,13 +16,13 @@ #include "mojo/application/public/interfaces/content_handler.mojom.h" #include "mojo/application/public/interfaces/service_provider.mojom.h" #include "mojo/package_manager/package_manager_impl.h" +#include "mojo/public/cpp/bindings/strong_binding.h" #include "mojo/shell/application_loader.h" #include "mojo/shell/application_manager.h" #include "mojo/shell/connect_util.h" #include "mojo/shell/fetcher.h" #include "mojo/shell/test_package_manager.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" namespace mojo { namespace package_manager { diff --git a/mojo/platform_handle/BUILD.gn b/mojo/platform_handle/BUILD.gn index 2afc90a005de6e..d5818f7f5de362 100644 --- a/mojo/platform_handle/BUILD.gn +++ b/mojo/platform_handle/BUILD.gn @@ -2,8 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -# See comments in third_party/mojo/src/mojo/public/c/system/BUILD.gn which this -# is based on. +# See comments in mojo/public/c/system/BUILD.gn which this is based on. # Summary: depend on this target to use the platform handle functions without # linking against a specific implementation. # For component targets, add //mojo/platform_handle:for_component to your deps @@ -16,7 +15,7 @@ source_set("platform_handle") { "platform_handle_functions.h", ] deps = [ - "//third_party/mojo/src/mojo/public/c/system", + "//mojo/public/c/system", ] } @@ -31,8 +30,8 @@ component("platform_handle_impl") { defines = [ "PLATFORM_HANDLE_IMPLEMENTATION" ] deps = [ "//base", + "//mojo/public/c/system:for_component", "//third_party/mojo/src/mojo/edk/embedder:headers", - "//third_party/mojo/src/mojo/public/c/system:for_component", ] } @@ -46,7 +45,7 @@ source_set("platform_handle_thunks") { ] defines = [ "PLATFORM_HANDLE_IMPLEMENTATION" ] deps = [ - "//third_party/mojo/src/mojo/public/c/system", + "//mojo/public/c/system", ] } diff --git a/mojo/platform_handle/platform_handle_functions.h b/mojo/platform_handle/platform_handle_functions.h index dec5d1f187492d..6b9276bca9b8d6 100644 --- a/mojo/platform_handle/platform_handle_functions.h +++ b/mojo/platform_handle/platform_handle_functions.h @@ -7,7 +7,7 @@ #include "mojo/platform_handle/platform_handle.h" #include "mojo/platform_handle/platform_handle_exports.h" -#include "third_party/mojo/src/mojo/public/c/system/types.h" +#include "mojo/public/c/system/types.h" extern "C" { diff --git a/third_party/mojo/src/mojo/public/BUILD.gn b/mojo/public/BUILD.gn similarity index 64% rename from third_party/mojo/src/mojo/public/BUILD.gn rename to mojo/public/BUILD.gn index df936d54d87a35..d7bb448beee889 100644 --- a/third_party/mojo/src/mojo/public/BUILD.gn +++ b/mojo/public/BUILD.gn @@ -2,8 +2,6 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//mojo/public/mojo.gni") - group("public") { # Meta-target, don't link into production code. testonly = true @@ -16,20 +14,12 @@ group("public") { "interfaces/bindings/tests:test_interfaces", ] - if (mojo_use_application_in_sdk) { - deps += [ "cpp/application:standalone" ] - } - if (is_android) { deps += [ "java:system", "java:bindings", ] } - - if (is_android && mojo_use_application_in_sdk) { - deps += [ "java:application" ] - } } group("sdk") { @@ -41,17 +31,6 @@ group("sdk") { "interfaces/bindings", "js", ] - - if (mojo_use_application_in_sdk) { - deps += [ - "cpp/application:standalone", - "interfaces/application", - ] - } - - if (mojo_use_network_in_sdk) { - deps += [ "interfaces/network" ] - } } static_library("libmojo_sdk") { diff --git a/third_party/mojo/src/mojo/public/DEPS b/mojo/public/DEPS similarity index 100% rename from third_party/mojo/src/mojo/public/DEPS rename to mojo/public/DEPS diff --git a/third_party/mojo/src/mojo/public/LICENSE b/mojo/public/LICENSE similarity index 100% rename from third_party/mojo/src/mojo/public/LICENSE rename to mojo/public/LICENSE diff --git a/third_party/mojo/src/mojo/public/README.md b/mojo/public/README.md similarity index 100% rename from third_party/mojo/src/mojo/public/README.md rename to mojo/public/README.md diff --git a/third_party/mojo/src/mojo/public/c/README.md b/mojo/public/c/README.md similarity index 100% rename from third_party/mojo/src/mojo/public/c/README.md rename to mojo/public/c/README.md diff --git a/third_party/mojo/src/mojo/public/c/environment/BUILD.gn b/mojo/public/c/environment/BUILD.gn similarity index 100% rename from third_party/mojo/src/mojo/public/c/environment/BUILD.gn rename to mojo/public/c/environment/BUILD.gn diff --git a/third_party/mojo/src/mojo/public/c/environment/async_waiter.h b/mojo/public/c/environment/async_waiter.h similarity index 91% rename from third_party/mojo/src/mojo/public/c/environment/async_waiter.h rename to mojo/public/c/environment/async_waiter.h index fd53891a0bae8b..b5a1f7523fe6b3 100644 --- a/third_party/mojo/src/mojo/public/c/environment/async_waiter.h +++ b/mojo/public/c/environment/async_waiter.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_C_ENVIRONMENT_ASYNC_WAITER_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_C_ENVIRONMENT_ASYNC_WAITER_H_ +#ifndef MOJO_PUBLIC_C_ENVIRONMENT_ASYNC_WAITER_H_ +#define MOJO_PUBLIC_C_ENVIRONMENT_ASYNC_WAITER_H_ -#include "third_party/mojo/src/mojo/public/c/system/types.h" +#include "mojo/public/c/system/types.h" typedef uintptr_t MojoAsyncWaitID; @@ -62,4 +62,4 @@ struct MojoAsyncWaiter { void (*CancelWait)(MojoAsyncWaitID wait_id); }; -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_C_ENVIRONMENT_ASYNC_WAITER_H_ +#endif // MOJO_PUBLIC_C_ENVIRONMENT_ASYNC_WAITER_H_ diff --git a/third_party/mojo/src/mojo/public/c/environment/logger.h b/mojo/public/c/environment/logger.h similarity index 92% rename from third_party/mojo/src/mojo/public/c/environment/logger.h rename to mojo/public/c/environment/logger.h index 05dd6eff114ce8..2a9b617a383d8a 100644 --- a/third_party/mojo/src/mojo/public/c/environment/logger.h +++ b/mojo/public/c/environment/logger.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_C_ENVIRONMENT_LOGGER_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_C_ENVIRONMENT_LOGGER_H_ +#ifndef MOJO_PUBLIC_C_ENVIRONMENT_LOGGER_H_ +#define MOJO_PUBLIC_C_ENVIRONMENT_LOGGER_H_ #include @@ -58,4 +58,4 @@ struct MojoLogger { void (*SetMinimumLogLevel)(MojoLogLevel minimum_log_level); }; -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_C_ENVIRONMENT_LOGGER_H_ +#endif // MOJO_PUBLIC_C_ENVIRONMENT_LOGGER_H_ diff --git a/third_party/mojo/src/mojo/public/c/gles2/BUILD.gn b/mojo/public/c/gles2/BUILD.gn similarity index 100% rename from third_party/mojo/src/mojo/public/c/gles2/BUILD.gn rename to mojo/public/c/gles2/BUILD.gn diff --git a/third_party/mojo/src/mojo/public/c/gles2/chromium_extension.h b/mojo/public/c/gles2/chromium_extension.h similarity index 52% rename from third_party/mojo/src/mojo/public/c/gles2/chromium_extension.h rename to mojo/public/c/gles2/chromium_extension.h index 2b3568b6b399c0..3359c7e6198d67 100644 --- a/third_party/mojo/src/mojo/public/c/gles2/chromium_extension.h +++ b/mojo/public/c/gles2/chromium_extension.h @@ -2,17 +2,17 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_C_GLES2_CHROMIUM_EXTENSION_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_C_GLES2_CHROMIUM_EXTENSION_H_ +#ifndef MOJO_PUBLIC_C_GLES2_CHROMIUM_EXTENSION_H_ +#define MOJO_PUBLIC_C_GLES2_CHROMIUM_EXTENSION_H_ // Note: This header should be compilable as C. #include #include -#include "third_party/mojo/src/mojo/public/c/gles2/gles2_export.h" -#include "third_party/mojo/src/mojo/public/c/gles2/gles2_types.h" -#include "third_party/mojo/src/mojo/public/c/system/types.h" +#include "mojo/public/c/gles2/gles2_export.h" +#include "mojo/public/c/gles2/gles2_types.h" +#include "mojo/public/c/system/types.h" extern "C" typedef struct _ClientBuffer* ClientBuffer; @@ -22,11 +22,11 @@ extern "C" { #define VISIT_GL_CALL(Function, ReturnType, PARAMETERS, ARGUMENTS) \ MOJO_GLES2_EXPORT ReturnType GL_APIENTRY gl##Function PARAMETERS; -#include "third_party/mojo/src/mojo/public/c/gles2/gles2_call_visitor_chromium_extension_autogen.h" +#include "mojo/public/c/gles2/gles2_call_visitor_chromium_extension_autogen.h" #undef VISIT_GL_CALL #ifdef __cplusplus } // extern "C" #endif -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_C_GLES2_CHROMIUM_EXTENSION_H_ +#endif // MOJO_PUBLIC_C_GLES2_CHROMIUM_EXTENSION_H_ diff --git a/third_party/mojo/src/mojo/public/c/gles2/gles2.h b/mojo/public/c/gles2/gles2.h similarity index 72% rename from third_party/mojo/src/mojo/public/c/gles2/gles2.h rename to mojo/public/c/gles2/gles2.h index 29f008a60a3f7e..b8196b97828729 100644 --- a/third_party/mojo/src/mojo/public/c/gles2/gles2.h +++ b/mojo/public/c/gles2/gles2.h @@ -2,18 +2,18 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_C_GLES2_GLES2_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_C_GLES2_GLES2_H_ +#ifndef MOJO_PUBLIC_C_GLES2_GLES2_H_ +#define MOJO_PUBLIC_C_GLES2_GLES2_H_ // Note: This header should be compilable as C. #include #include -#include "third_party/mojo/src/mojo/public/c/environment/async_waiter.h" -#include "third_party/mojo/src/mojo/public/c/gles2/gles2_export.h" -#include "third_party/mojo/src/mojo/public/c/gles2/gles2_types.h" -#include "third_party/mojo/src/mojo/public/c/system/types.h" +#include "mojo/public/c/environment/async_waiter.h" +#include "mojo/public/c/gles2/gles2_export.h" +#include "mojo/public/c/gles2/gles2_types.h" +#include "mojo/public/c/system/types.h" #ifdef __cplusplus extern "C" { @@ -40,11 +40,11 @@ MOJO_GLES2_EXPORT void* MojoGLES2GetGLES2Interface(MojoGLES2Context context); #define VISIT_GL_CALL(Function, ReturnType, PARAMETERS, ARGUMENTS) \ MOJO_GLES2_EXPORT ReturnType GL_APIENTRY gl##Function PARAMETERS; -#include "third_party/mojo/src/mojo/public/c/gles2/gles2_call_visitor_autogen.h" +#include "mojo/public/c/gles2/gles2_call_visitor_autogen.h" #undef VISIT_GL_CALL #ifdef __cplusplus } // extern "C" #endif -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_C_GLES2_GLES2_H_ +#endif // MOJO_PUBLIC_C_GLES2_GLES2_H_ diff --git a/third_party/mojo/src/mojo/public/c/gles2/gles2_call_visitor_autogen.h b/mojo/public/c/gles2/gles2_call_visitor_autogen.h similarity index 100% rename from third_party/mojo/src/mojo/public/c/gles2/gles2_call_visitor_autogen.h rename to mojo/public/c/gles2/gles2_call_visitor_autogen.h diff --git a/third_party/mojo/src/mojo/public/c/gles2/gles2_call_visitor_chromium_extension_autogen.h b/mojo/public/c/gles2/gles2_call_visitor_chromium_extension_autogen.h similarity index 100% rename from third_party/mojo/src/mojo/public/c/gles2/gles2_call_visitor_chromium_extension_autogen.h rename to mojo/public/c/gles2/gles2_call_visitor_chromium_extension_autogen.h diff --git a/third_party/mojo/src/mojo/public/c/gles2/gles2_export.h b/mojo/public/c/gles2/gles2_export.h similarity index 79% rename from third_party/mojo/src/mojo/public/c/gles2/gles2_export.h rename to mojo/public/c/gles2/gles2_export.h index a91e525def6ef3..60667b11cc7cd7 100644 --- a/third_party/mojo/src/mojo/public/c/gles2/gles2_export.h +++ b/mojo/public/c/gles2/gles2_export.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_C_GLES2_GLES2_EXPORT_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_C_GLES2_GLES2_EXPORT_H_ +#ifndef MOJO_PUBLIC_C_GLES2_GLES2_EXPORT_H_ +#define MOJO_PUBLIC_C_GLES2_GLES2_EXPORT_H_ #if defined(COMPONENT_BUILD) && defined(MOJO_USE_GLES2_IMPL) #if defined(WIN32) @@ -30,4 +30,4 @@ #endif // defined(COMPONENT_BUILD) && defined(MOJO_USE_GLES2_IMPL) -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_C_GLES2_GLES2_EXPORT_H_ +#endif // MOJO_PUBLIC_C_GLES2_GLES2_EXPORT_H_ diff --git a/third_party/mojo/src/mojo/public/c/gles2/gles2_types.h b/mojo/public/c/gles2/gles2_types.h similarity index 65% rename from third_party/mojo/src/mojo/public/c/gles2/gles2_types.h rename to mojo/public/c/gles2/gles2_types.h index 79e94affd8ff9d..75be18b00d3662 100644 --- a/third_party/mojo/src/mojo/public/c/gles2/gles2_types.h +++ b/mojo/public/c/gles2/gles2_types.h @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_C_GLES2_GLES2_TYPES_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_C_GLES2_GLES2_TYPES_H_ +#ifndef MOJO_PUBLIC_C_GLES2_GLES2_TYPES_H_ +#define MOJO_PUBLIC_C_GLES2_GLES2_TYPES_H_ // Note: This header should be compilable as C. #include -#include "third_party/mojo/src/mojo/public/c/gles2/gles2_export.h" +#include "mojo/public/c/gles2/gles2_export.h" #ifdef __cplusplus extern "C" { @@ -23,4 +23,4 @@ typedef void (*MojoGLES2SignalSyncPointCallback)(void* closure); } // extern "C" #endif -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_C_GLES2_GLES2_TYPES_H_ +#endif // MOJO_PUBLIC_C_GLES2_GLES2_TYPES_H_ diff --git a/third_party/mojo/src/mojo/public/c/gpu/BUILD.gn b/mojo/public/c/gpu/BUILD.gn similarity index 77% rename from third_party/mojo/src/mojo/public/c/gpu/BUILD.gn rename to mojo/public/c/gpu/BUILD.gn index afab7a14f36d2e..c12b92a149e19e 100644 --- a/third_party/mojo/src/mojo/public/c/gpu/BUILD.gn +++ b/mojo/public/c/gpu/BUILD.gn @@ -14,7 +14,6 @@ group("gpu") { deps = [ ":MGL", - ":GLES2", "../../platform/native:mgl_thunks", "../../platform/native:gles2", ] @@ -49,21 +48,3 @@ mojo_sdk_source_set("MGL_onscreen") { ":MGL", ] } - -mojo_sdk_source_set("GLES2") { - sources = [ - "GLES2/gl2.h", - "GLES2/gl2ext.h", - "GLES2/gl2mojo.h", - ] - - public_deps = [ - ":KHR", - ] -} - -mojo_sdk_source_set("KHR") { - sources = [ - "KHR/khrplatform.h", - ] -} diff --git a/third_party/mojo/src/mojo/public/c/gpu/DEPS b/mojo/public/c/gpu/DEPS similarity index 100% rename from third_party/mojo/src/mojo/public/c/gpu/DEPS rename to mojo/public/c/gpu/DEPS diff --git a/third_party/mojo/src/mojo/public/c/gpu/MGL/mgl.h b/mojo/public/c/gpu/MGL/mgl.h similarity index 86% rename from third_party/mojo/src/mojo/public/c/gpu/MGL/mgl.h rename to mojo/public/c/gpu/MGL/mgl.h index 873838d8d2c848..2633976ddbdcc8 100644 --- a/third_party/mojo/src/mojo/public/c/gpu/MGL/mgl.h +++ b/mojo/public/c/gpu/MGL/mgl.h @@ -4,13 +4,13 @@ // Note: This header should be compilable as C. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_C_GPU_MGL_MGL_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_C_GPU_MGL_MGL_H_ +#ifndef MOJO_PUBLIC_C_GPU_MGL_MGL_H_ +#define MOJO_PUBLIC_C_GPU_MGL_MGL_H_ #include -#include "third_party/mojo/src/mojo/public/c/gpu/MGL/mgl_types.h" -#include "third_party/mojo/src/mojo/public/c/system/types.h" +#include "mojo/public/c/gpu/MGL/mgl_types.h" +#include "mojo/public/c/system/types.h" #ifdef __cplusplus extern "C" { @@ -59,4 +59,4 @@ MGLContext MGLGetCurrentContext(void); } // extern "C" #endif -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_C_GPU_MGL_MGL_H_ +#endif // MOJO_PUBLIC_C_GPU_MGL_MGL_H_ diff --git a/third_party/mojo/src/mojo/public/c/gpu/MGL/mgl_onscreen.h b/mojo/public/c/gpu/MGL/mgl_onscreen.h similarity index 69% rename from third_party/mojo/src/mojo/public/c/gpu/MGL/mgl_onscreen.h rename to mojo/public/c/gpu/MGL/mgl_onscreen.h index fa7f103bb22f00..f79521490f23cd 100644 --- a/third_party/mojo/src/mojo/public/c/gpu/MGL/mgl_onscreen.h +++ b/mojo/public/c/gpu/MGL/mgl_onscreen.h @@ -4,12 +4,12 @@ // Note: This header should be compilable as C. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_C_GPU_MGL_MGL_ONSCREEN_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_C_GPU_MGL_MGL_ONSCREEN_H_ +#ifndef MOJO_PUBLIC_C_GPU_MGL_MGL_ONSCREEN_H_ +#define MOJO_PUBLIC_C_GPU_MGL_MGL_ONSCREEN_H_ #include -#include "third_party/mojo/src/mojo/public/c/gpu/MGL/mgl_types.h" +#include "mojo/public/c/gpu/MGL/mgl_types.h" #ifdef __cplusplus extern "C" { @@ -26,4 +26,4 @@ void MGLSwapBuffers(); } // extern "C" #endif -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_C_GPU_MGL_MGL_ONSCREEN_H_ +#endif // MOJO_PUBLIC_C_GPU_MGL_MGL_ONSCREEN_H_ diff --git a/third_party/mojo/src/mojo/public/c/gpu/MGL/mgl_types.h b/mojo/public/c/gpu/MGL/mgl_types.h similarity index 100% rename from third_party/mojo/src/mojo/public/c/gpu/MGL/mgl_types.h rename to mojo/public/c/gpu/MGL/mgl_types.h diff --git a/third_party/mojo/src/mojo/public/c/system/BUILD.gn b/mojo/public/c/system/BUILD.gn similarity index 93% rename from third_party/mojo/src/mojo/public/c/system/BUILD.gn rename to mojo/public/c/system/BUILD.gn index 3c4b29a54f4f95..51fc58d8752f90 100644 --- a/third_party/mojo/src/mojo/public/c/system/BUILD.gn +++ b/mojo/public/c/system/BUILD.gn @@ -39,7 +39,7 @@ group("for_shared_library") { ] if (is_component_build) { deps = [ - "../../../edk/system", + "//third_party/mojo/src/mojo/edk/system", ] } else { deps = [ @@ -54,7 +54,7 @@ group("for_component") { ] if (is_component_build) { deps = [ - "../../../edk/system", + "//third_party/mojo/src/mojo/edk/system", ] } } diff --git a/third_party/mojo/src/mojo/public/c/system/buffer.h b/mojo/public/c/system/buffer.h similarity index 95% rename from third_party/mojo/src/mojo/public/c/system/buffer.h rename to mojo/public/c/system/buffer.h index 619b3382296778..45d2c2d761fb32 100644 --- a/third_party/mojo/src/mojo/public/c/system/buffer.h +++ b/mojo/public/c/system/buffer.h @@ -9,12 +9,12 @@ // // Note: This header should be compilable as C. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_C_SYSTEM_BUFFER_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_C_SYSTEM_BUFFER_H_ +#ifndef MOJO_PUBLIC_C_SYSTEM_BUFFER_H_ +#define MOJO_PUBLIC_C_SYSTEM_BUFFER_H_ -#include "third_party/mojo/src/mojo/public/c/system/macros.h" -#include "third_party/mojo/src/mojo/public/c/system/system_export.h" -#include "third_party/mojo/src/mojo/public/c/system/types.h" +#include "mojo/public/c/system/macros.h" +#include "mojo/public/c/system/system_export.h" +#include "mojo/public/c/system/types.h" // |MojoCreateSharedBufferOptions|: Used to specify creation parameters for a // shared buffer to |MojoCreateSharedBuffer()|. @@ -183,4 +183,4 @@ MOJO_SYSTEM_EXPORT MojoResult MojoUnmapBuffer(void* buffer); // In. } // extern "C" #endif -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_C_SYSTEM_BUFFER_H_ +#endif // MOJO_PUBLIC_C_SYSTEM_BUFFER_H_ diff --git a/mojo/public/c/system/core.h b/mojo/public/c/system/core.h new file mode 100644 index 00000000000000..0e78786319aa01 --- /dev/null +++ b/mojo/public/c/system/core.h @@ -0,0 +1,21 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// This is a catch-all header that includes everything. +// +// Note: This header should be compilable as C. + +#ifndef MOJO_PUBLIC_C_SYSTEM_CORE_H_ +#define MOJO_PUBLIC_C_SYSTEM_CORE_H_ + +#include "mojo/public/c/system/buffer.h" +#include "mojo/public/c/system/data_pipe.h" +#include "mojo/public/c/system/functions.h" +#include "mojo/public/c/system/macros.h" +#include "mojo/public/c/system/main.h" +#include "mojo/public/c/system/message_pipe.h" +#include "mojo/public/c/system/system_export.h" +#include "mojo/public/c/system/types.h" + +#endif // MOJO_PUBLIC_C_SYSTEM_CORE_H_ diff --git a/third_party/mojo/src/mojo/public/c/system/data_pipe.h b/mojo/public/c/system/data_pipe.h similarity index 97% rename from third_party/mojo/src/mojo/public/c/system/data_pipe.h rename to mojo/public/c/system/data_pipe.h index eb54f8188d7131..54cfea8b2d7823 100644 --- a/third_party/mojo/src/mojo/public/c/system/data_pipe.h +++ b/mojo/public/c/system/data_pipe.h @@ -6,12 +6,12 @@ // // Note: This header should be compilable as C. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_C_SYSTEM_DATA_PIPE_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_C_SYSTEM_DATA_PIPE_H_ +#ifndef MOJO_PUBLIC_C_SYSTEM_DATA_PIPE_H_ +#define MOJO_PUBLIC_C_SYSTEM_DATA_PIPE_H_ -#include "third_party/mojo/src/mojo/public/c/system/macros.h" -#include "third_party/mojo/src/mojo/public/c/system/system_export.h" -#include "third_party/mojo/src/mojo/public/c/system/types.h" +#include "mojo/public/c/system/macros.h" +#include "mojo/public/c/system/system_export.h" +#include "mojo/public/c/system/types.h" // |MojoCreateDataPipeOptions|: Used to specify creation parameters for a data // pipe to |MojoCreateDataPipe()|. @@ -363,4 +363,4 @@ MOJO_SYSTEM_EXPORT MojoResult } // extern "C" #endif -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_C_SYSTEM_DATA_PIPE_H_ +#endif // MOJO_PUBLIC_C_SYSTEM_DATA_PIPE_H_ diff --git a/third_party/mojo/src/mojo/public/c/system/functions.h b/mojo/public/c/system/functions.h similarity index 95% rename from third_party/mojo/src/mojo/public/c/system/functions.h rename to mojo/public/c/system/functions.h index 9a8ae5e52be983..8b576c189aa8e7 100644 --- a/third_party/mojo/src/mojo/public/c/system/functions.h +++ b/mojo/public/c/system/functions.h @@ -6,11 +6,11 @@ // // Note: This header should be compilable as C. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_C_SYSTEM_FUNCTIONS_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_C_SYSTEM_FUNCTIONS_H_ +#ifndef MOJO_PUBLIC_C_SYSTEM_FUNCTIONS_H_ +#define MOJO_PUBLIC_C_SYSTEM_FUNCTIONS_H_ -#include "third_party/mojo/src/mojo/public/c/system/system_export.h" -#include "third_party/mojo/src/mojo/public/c/system/types.h" +#include "mojo/public/c/system/system_export.h" +#include "mojo/public/c/system/types.h" #ifdef __cplusplus extern "C" { @@ -131,4 +131,4 @@ MojoWaitMany(const MojoHandle* handles, } // extern "C" #endif -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_C_SYSTEM_FUNCTIONS_H_ +#endif // MOJO_PUBLIC_C_SYSTEM_FUNCTIONS_H_ diff --git a/third_party/mojo/src/mojo/public/c/system/macros.h b/mojo/public/c/system/macros.h similarity index 93% rename from third_party/mojo/src/mojo/public/c/system/macros.h rename to mojo/public/c/system/macros.h index 17470c6cb3e868..7f28e1836623c2 100644 --- a/third_party/mojo/src/mojo/public/c/system/macros.h +++ b/mojo/public/c/system/macros.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_C_SYSTEM_MACROS_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_C_SYSTEM_MACROS_H_ +#ifndef MOJO_PUBLIC_C_SYSTEM_MACROS_H_ +#define MOJO_PUBLIC_C_SYSTEM_MACROS_H_ #include @@ -76,4 +76,4 @@ inline void mojo_ignore_result(const T&) { #error "Please define MOJO_ALIGNAS() for your compiler." #endif -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_C_SYSTEM_MACROS_H_ +#endif // MOJO_PUBLIC_C_SYSTEM_MACROS_H_ diff --git a/third_party/mojo/src/mojo/public/c/system/main.h b/mojo/public/c/system/main.h similarity index 76% rename from third_party/mojo/src/mojo/public/c/system/main.h rename to mojo/public/c/system/main.h index c73cf3aa436cb1..65d0837c03eb9b 100644 --- a/third_party/mojo/src/mojo/public/c/system/main.h +++ b/mojo/public/c/system/main.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_C_SYSTEM_MAIN_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_C_SYSTEM_MAIN_H_ +#ifndef MOJO_PUBLIC_C_SYSTEM_MAIN_H_ +#define MOJO_PUBLIC_C_SYSTEM_MAIN_H_ -#include "third_party/mojo/src/mojo/public/c/system/types.h" +#include "mojo/public/c/system/types.h" // Implement MojoMain directly as the entry point for an application. // @@ -32,4 +32,4 @@ __attribute__((visibility("default"))) MojoResult } // extern "C" #endif -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_C_SYSTEM_MAIN_H_ +#endif // MOJO_PUBLIC_C_SYSTEM_MAIN_H_ diff --git a/third_party/mojo/src/mojo/public/c/system/message_pipe.h b/mojo/public/c/system/message_pipe.h similarity index 95% rename from third_party/mojo/src/mojo/public/c/system/message_pipe.h rename to mojo/public/c/system/message_pipe.h index f870150477b4e9..d42c3fc65df49c 100644 --- a/third_party/mojo/src/mojo/public/c/system/message_pipe.h +++ b/mojo/public/c/system/message_pipe.h @@ -6,12 +6,12 @@ // // Note: This header should be compilable as C. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_C_SYSTEM_MESSAGE_PIPE_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_C_SYSTEM_MESSAGE_PIPE_H_ +#ifndef MOJO_PUBLIC_C_SYSTEM_MESSAGE_PIPE_H_ +#define MOJO_PUBLIC_C_SYSTEM_MESSAGE_PIPE_H_ -#include "third_party/mojo/src/mojo/public/c/system/macros.h" -#include "third_party/mojo/src/mojo/public/c/system/system_export.h" -#include "third_party/mojo/src/mojo/public/c/system/types.h" +#include "mojo/public/c/system/macros.h" +#include "mojo/public/c/system/system_export.h" +#include "mojo/public/c/system/types.h" // |MojoCreateMessagePipeOptions|: Used to specify creation parameters for a // message pipe to |MojoCreateMessagePipe()|. @@ -174,4 +174,4 @@ MOJO_SYSTEM_EXPORT MojoResult } // extern "C" #endif -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_C_SYSTEM_MESSAGE_PIPE_H_ +#endif // MOJO_PUBLIC_C_SYSTEM_MESSAGE_PIPE_H_ diff --git a/third_party/mojo/src/mojo/public/c/system/system_export.h b/mojo/public/c/system/system_export.h similarity index 79% rename from third_party/mojo/src/mojo/public/c/system/system_export.h rename to mojo/public/c/system/system_export.h index bce06462091df3..bc3b459843f1b7 100644 --- a/third_party/mojo/src/mojo/public/c/system/system_export.h +++ b/mojo/public/c/system/system_export.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_C_SYSTEM_SYSTEM_EXPORT_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_C_SYSTEM_SYSTEM_EXPORT_H_ +#ifndef MOJO_PUBLIC_C_SYSTEM_SYSTEM_EXPORT_H_ +#define MOJO_PUBLIC_C_SYSTEM_SYSTEM_EXPORT_H_ #if defined(COMPONENT_BUILD) && defined(MOJO_USE_SYSTEM_IMPL) #if defined(WIN32) @@ -30,4 +30,4 @@ #endif // defined(COMPONENT_BUILD) && defined(MOJO_USE_SYSTEM_IMPL) -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_C_SYSTEM_SYSTEM_EXPORT_H_ +#endif // MOJO_PUBLIC_C_SYSTEM_SYSTEM_EXPORT_H_ diff --git a/third_party/mojo/src/mojo/public/c/system/tests/BUILD.gn b/mojo/public/c/system/tests/BUILD.gn similarity index 86% rename from third_party/mojo/src/mojo/public/c/system/tests/BUILD.gn rename to mojo/public/c/system/tests/BUILD.gn index 32b915a23beb39..bb3cc5e569e9a8 100644 --- a/third_party/mojo/src/mojo/public/c/system/tests/BUILD.gn +++ b/mojo/public/c/system/tests/BUILD.gn @@ -7,8 +7,10 @@ import("../../../mojo_sdk.gni") mojo_sdk_source_set("tests") { testonly = true - mojo_sdk_visibility = - [ "mojo/public/cpp/system/tests:mojo_public_system_unittests" ] + visibility = [ + "//mojo/public/cpp/system/tests:mojo_public_system_unittests", + "//mojo/public/cpp/system/tests:tests", + ] sources = [ "core_unittest.cc", diff --git a/third_party/mojo/src/mojo/public/c/system/tests/core_perftest.cc b/mojo/public/c/system/tests/core_perftest.cc similarity index 96% rename from third_party/mojo/src/mojo/public/c/system/tests/core_perftest.cc rename to mojo/public/c/system/tests/core_perftest.cc index 1b706fea0d38a6..3ee30150c4d542 100644 --- a/third_party/mojo/src/mojo/public/c/system/tests/core_perftest.cc +++ b/mojo/public/c/system/tests/core_perftest.cc @@ -4,21 +4,21 @@ // This tests the performance of the C API. -#include "third_party/mojo/src/mojo/public/c/system/core.h" +#include "mojo/public/c/system/core.h" #include #include #include +#include "mojo/public/cpp/system/macros.h" +#include "mojo/public/cpp/test_support/test_support.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/macros.h" -#include "third_party/mojo/src/mojo/public/cpp/test_support/test_support.h" -#include "third_party/mojo/src/mojo/public/cpp/test_support/test_utils.h" // TODO(vtl): (here and below) crbug.com/342893 #if !defined(WIN32) #include -#include "third_party/mojo/src/mojo/public/cpp/utility/thread.h" +#include "mojo/public/cpp/utility/thread.h" #endif // !defined(WIN32) namespace { diff --git a/third_party/mojo/src/mojo/public/c/system/tests/core_unittest.cc b/mojo/public/c/system/tests/core_unittest.cc similarity index 99% rename from third_party/mojo/src/mojo/public/c/system/tests/core_unittest.cc rename to mojo/public/c/system/tests/core_unittest.cc index 2168e7f29fe62c..de59a70f2a9706 100644 --- a/third_party/mojo/src/mojo/public/c/system/tests/core_unittest.cc +++ b/mojo/public/c/system/tests/core_unittest.cc @@ -4,7 +4,7 @@ // This file tests the C API. -#include "third_party/mojo/src/mojo/public/c/system/core.h" +#include "mojo/public/c/system/core.h" #include diff --git a/third_party/mojo/src/mojo/public/c/system/tests/core_unittest_pure_c.c b/mojo/public/c/system/tests/core_unittest_pure_c.c similarity index 95% rename from third_party/mojo/src/mojo/public/c/system/tests/core_unittest_pure_c.c rename to mojo/public/c/system/tests/core_unittest_pure_c.c index 22d3146fdc4387..d5978a91891a77 100644 --- a/third_party/mojo/src/mojo/public/c/system/tests/core_unittest_pure_c.c +++ b/mojo/public/c/system/tests/core_unittest_pure_c.c @@ -11,9 +11,9 @@ // Include all the header files that are meant to be compilable as C. Start with // core.h, since it's the most important one. -#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/c/system/macros.h" +#include "mojo/public/c/environment/async_waiter.h" +#include "mojo/public/c/system/core.h" +#include "mojo/public/c/system/macros.h" // The joys of the C preprocessor.... #define STRINGIFY(x) #x diff --git a/third_party/mojo/src/mojo/public/c/system/tests/macros_unittest.cc b/mojo/public/c/system/tests/macros_unittest.cc similarity index 97% rename from third_party/mojo/src/mojo/public/c/system/tests/macros_unittest.cc rename to mojo/public/c/system/tests/macros_unittest.cc index 3565e85e66adcb..b22e1249fa6f47 100644 --- a/third_party/mojo/src/mojo/public/c/system/tests/macros_unittest.cc +++ b/mojo/public/c/system/tests/macros_unittest.cc @@ -8,7 +8,7 @@ // TODO(vtl): Fix no-compile tests (which are all disabled; crbug.com/105388) // and write some "negative" tests. -#include "third_party/mojo/src/mojo/public/c/system/macros.h" +#include "mojo/public/c/system/macros.h" #include #include diff --git a/third_party/mojo/src/mojo/public/c/system/types.h b/mojo/public/c/system/types.h similarity index 97% rename from third_party/mojo/src/mojo/public/c/system/types.h rename to mojo/public/c/system/types.h index 2f0b134f3f0f88..4574d7413615ea 100644 --- a/third_party/mojo/src/mojo/public/c/system/types.h +++ b/mojo/public/c/system/types.h @@ -7,12 +7,12 @@ // // Note: This header should be compilable as C. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_C_SYSTEM_TYPES_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_C_SYSTEM_TYPES_H_ +#ifndef MOJO_PUBLIC_C_SYSTEM_TYPES_H_ +#define MOJO_PUBLIC_C_SYSTEM_TYPES_H_ #include -#include "third_party/mojo/src/mojo/public/c/system/macros.h" +#include "mojo/public/c/system/macros.h" // TODO(vtl): Notes: Use of undefined flags will lead to undefined behavior // (typically they'll be ignored), not necessarily an error. @@ -182,4 +182,4 @@ struct MOJO_ALIGNAS(4) MojoHandleSignalsState { MOJO_STATIC_ASSERT(sizeof(MojoHandleSignalsState) == 8, "MojoHandleSignalsState has wrong size"); -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_C_SYSTEM_TYPES_H_ +#endif // MOJO_PUBLIC_C_SYSTEM_TYPES_H_ diff --git a/third_party/mojo/src/mojo/public/c/test_support/BUILD.gn b/mojo/public/c/test_support/BUILD.gn similarity index 100% rename from third_party/mojo/src/mojo/public/c/test_support/BUILD.gn rename to mojo/public/c/test_support/BUILD.gn diff --git a/third_party/mojo/src/mojo/public/c/test_support/test_support.h b/mojo/public/c/test_support/test_support.h similarity index 84% rename from third_party/mojo/src/mojo/public/c/test_support/test_support.h rename to mojo/public/c/test_support/test_support.h index 2f8c28ce1c28cf..73a2eefac2e219 100644 --- a/third_party/mojo/src/mojo/public/c/test_support/test_support.h +++ b/mojo/public/c/test_support/test_support.h @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_C_TEST_SUPPORT_TEST_SUPPORT_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_C_TEST_SUPPORT_TEST_SUPPORT_H_ +#ifndef MOJO_PUBLIC_C_TEST_SUPPORT_TEST_SUPPORT_H_ +#define MOJO_PUBLIC_C_TEST_SUPPORT_TEST_SUPPORT_H_ // Note: This header should be compilable as C. #include -#include "third_party/mojo/src/mojo/public/c/test_support/test_support_export.h" +#include "mojo/public/c/test_support/test_support_export.h" #ifdef __cplusplus extern "C" { @@ -52,4 +52,4 @@ char** MojoTestSupportEnumerateSourceRootRelativeDirectory( } // extern "C" #endif -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_C_TEST_SUPPORT_TEST_SUPPORT_H_ +#endif // MOJO_PUBLIC_C_TEST_SUPPORT_TEST_SUPPORT_H_ diff --git a/third_party/mojo/src/mojo/public/c/test_support/test_support_export.h b/mojo/public/c/test_support/test_support_export.h similarity index 70% rename from third_party/mojo/src/mojo/public/c/test_support/test_support_export.h rename to mojo/public/c/test_support/test_support_export.h index 7200fecc0d1fa3..e22a9e30144197 100644 --- a/third_party/mojo/src/mojo/public/c/test_support/test_support_export.h +++ b/mojo/public/c/test_support/test_support_export.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_C_TEST_SUPPORT_TEST_SUPPORT_EXPORT_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_C_TEST_SUPPORT_TEST_SUPPORT_EXPORT_H_ +#ifndef MOJO_PUBLIC_C_TEST_SUPPORT_TEST_SUPPORT_EXPORT_H_ +#define MOJO_PUBLIC_C_TEST_SUPPORT_TEST_SUPPORT_EXPORT_H_ #if defined(WIN32) @@ -23,4 +23,4 @@ #endif // defined(WIN32) -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_C_TEST_SUPPORT_TEST_SUPPORT_EXPORT_H_ +#endif // MOJO_PUBLIC_C_TEST_SUPPORT_TEST_SUPPORT_EXPORT_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/README.md b/mojo/public/cpp/README.md similarity index 100% rename from third_party/mojo/src/mojo/public/cpp/README.md rename to mojo/public/cpp/README.md diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/BUILD.gn b/mojo/public/cpp/bindings/BUILD.gn similarity index 100% rename from third_party/mojo/src/mojo/public/cpp/bindings/BUILD.gn rename to mojo/public/cpp/bindings/BUILD.gn diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/array.h b/mojo/public/cpp/bindings/array.h similarity index 93% rename from third_party/mojo/src/mojo/public/cpp/bindings/array.h rename to mojo/public/cpp/bindings/array.h index f9b779a323f334..f7d392178b3f0d 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/array.h +++ b/mojo/public/cpp/bindings/array.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_ARRAY_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_ARRAY_H_ +#ifndef MOJO_PUBLIC_CPP_BINDINGS_ARRAY_H_ +#define MOJO_PUBLIC_CPP_BINDINGS_ARRAY_H_ #include @@ -12,11 +12,11 @@ #include #include -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/array_internal.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/bindings_internal.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/template_util.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/value_traits.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/type_converter.h" +#include "mojo/public/cpp/bindings/lib/array_internal.h" +#include "mojo/public/cpp/bindings/lib/bindings_internal.h" +#include "mojo/public/cpp/bindings/lib/template_util.h" +#include "mojo/public/cpp/bindings/lib/value_traits.h" +#include "mojo/public/cpp/bindings/type_converter.h" namespace mojo { @@ -246,4 +246,4 @@ struct TypeConverter, Array> { } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_ARRAY_H_ +#endif // MOJO_PUBLIC_CPP_BINDINGS_ARRAY_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/associated_interface_ptr_info.h b/mojo/public/cpp/bindings/associated_interface_ptr_info.h similarity index 68% rename from third_party/mojo/src/mojo/public/cpp/bindings/associated_interface_ptr_info.h rename to mojo/public/cpp/bindings/associated_interface_ptr_info.h index 780fe0e86ac341..55f9c4a68f6431 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/associated_interface_ptr_info.h +++ b/mojo/public/cpp/bindings/associated_interface_ptr_info.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_ASSOCIATED_INTERFACE_PTR_INFO_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_ASSOCIATED_INTERFACE_PTR_INFO_H_ +#ifndef MOJO_PUBLIC_CPP_BINDINGS_ASSOCIATED_INTERFACE_PTR_INFO_H_ +#define MOJO_PUBLIC_CPP_BINDINGS_ASSOCIATED_INTERFACE_PTR_INFO_H_ -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/cpp/system/macros.h" namespace mojo { @@ -29,4 +29,4 @@ class AssociatedInterfacePtrInfo { } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_ASSOCIATED_INTERFACE_PTR_INFO_H_ +#endif // MOJO_PUBLIC_CPP_BINDINGS_ASSOCIATED_INTERFACE_PTR_INFO_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/associated_interface_request.h b/mojo/public/cpp/bindings/associated_interface_request.h similarity index 67% rename from third_party/mojo/src/mojo/public/cpp/bindings/associated_interface_request.h rename to mojo/public/cpp/bindings/associated_interface_request.h index 4cd037e2fb84f0..9882b89062de89 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/associated_interface_request.h +++ b/mojo/public/cpp/bindings/associated_interface_request.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_ASSOCIATED_INTERFACE_REQUEST_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_ASSOCIATED_INTERFACE_REQUEST_H_ +#ifndef MOJO_PUBLIC_CPP_BINDINGS_ASSOCIATED_INTERFACE_REQUEST_H_ +#define MOJO_PUBLIC_CPP_BINDINGS_ASSOCIATED_INTERFACE_REQUEST_H_ -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/cpp/system/macros.h" namespace mojo { @@ -28,4 +28,4 @@ class AssociatedInterfaceRequest { } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_ASSOCIATED_INTERFACE_REQUEST_H_ +#endif // MOJO_PUBLIC_CPP_BINDINGS_ASSOCIATED_INTERFACE_REQUEST_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/binding.h b/mojo/public/cpp/bindings/binding.h similarity index 90% rename from third_party/mojo/src/mojo/public/cpp/bindings/binding.h rename to mojo/public/cpp/bindings/binding.h index 3bee7c2e516640..de9159fd32db3b 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/binding.h +++ b/mojo/public/cpp/bindings/binding.h @@ -2,19 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_BINDING_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_BINDING_H_ - -#include "third_party/mojo/src/mojo/public/c/environment/async_waiter.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/callback.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_ptr.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_ptr_info.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/filter_chain.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/message_header_validator.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/router.h" -#include "third_party/mojo/src/mojo/public/cpp/environment/logging.h" -#include "third_party/mojo/src/mojo/public/cpp/system/core.h" +#ifndef MOJO_PUBLIC_CPP_BINDINGS_BINDING_H_ +#define MOJO_PUBLIC_CPP_BINDINGS_BINDING_H_ + +#include "mojo/public/c/environment/async_waiter.h" +#include "mojo/public/cpp/bindings/callback.h" +#include "mojo/public/cpp/bindings/interface_ptr.h" +#include "mojo/public/cpp/bindings/interface_ptr_info.h" +#include "mojo/public/cpp/bindings/interface_request.h" +#include "mojo/public/cpp/bindings/lib/filter_chain.h" +#include "mojo/public/cpp/bindings/lib/message_header_validator.h" +#include "mojo/public/cpp/bindings/lib/router.h" +#include "mojo/public/cpp/environment/logging.h" +#include "mojo/public/cpp/system/core.h" namespace mojo { @@ -236,4 +236,4 @@ class Binding { } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_BINDING_H_ +#endif // MOJO_PUBLIC_CPP_BINDINGS_BINDING_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/callback.h b/mojo/public/cpp/bindings/callback.h similarity index 89% rename from third_party/mojo/src/mojo/public/cpp/bindings/callback.h rename to mojo/public/cpp/bindings/callback.h index 25b9e8e8b0fe8f..beec1a102e7024 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/callback.h +++ b/mojo/public/cpp/bindings/callback.h @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_CALLBACK_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_CALLBACK_H_ +#ifndef MOJO_PUBLIC_CPP_BINDINGS_CALLBACK_H_ +#define MOJO_PUBLIC_CPP_BINDINGS_CALLBACK_H_ -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/callback_internal.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/shared_ptr.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/template_util.h" +#include "mojo/public/cpp/bindings/lib/callback_internal.h" +#include "mojo/public/cpp/bindings/lib/shared_ptr.h" +#include "mojo/public/cpp/bindings/lib/template_util.h" namespace mojo { @@ -112,4 +112,4 @@ typedef Callback Closure; } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_CALLBACK_H_ +#endif // MOJO_PUBLIC_CPP_BINDINGS_CALLBACK_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/interface_ptr.h b/mojo/public/cpp/bindings/interface_ptr.h similarity index 92% rename from third_party/mojo/src/mojo/public/cpp/bindings/interface_ptr.h rename to mojo/public/cpp/bindings/interface_ptr.h index 8cfd64655ce105..dc446677d21a8c 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/interface_ptr.h +++ b/mojo/public/cpp/bindings/interface_ptr.h @@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_INTERFACE_PTR_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_INTERFACE_PTR_H_ +#ifndef MOJO_PUBLIC_CPP_BINDINGS_INTERFACE_PTR_H_ +#define MOJO_PUBLIC_CPP_BINDINGS_INTERFACE_PTR_H_ #include -#include "third_party/mojo/src/mojo/public/cpp/bindings/callback.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_ptr_info.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/interface_ptr_internal.h" -#include "third_party/mojo/src/mojo/public/cpp/environment/environment.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/cpp/bindings/callback.h" +#include "mojo/public/cpp/bindings/interface_ptr_info.h" +#include "mojo/public/cpp/bindings/lib/interface_ptr_internal.h" +#include "mojo/public/cpp/environment/environment.h" +#include "mojo/public/cpp/system/macros.h" namespace mojo { @@ -194,4 +194,4 @@ InterfacePtr MakeProxy( } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_INTERFACE_PTR_H_ +#endif // MOJO_PUBLIC_CPP_BINDINGS_INTERFACE_PTR_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/interface_ptr_info.h b/mojo/public/cpp/bindings/interface_ptr_info.h similarity index 80% rename from third_party/mojo/src/mojo/public/cpp/bindings/interface_ptr_info.h rename to mojo/public/cpp/bindings/interface_ptr_info.h index bb96a50b6b4673..4f61915fb2a252 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/interface_ptr_info.h +++ b/mojo/public/cpp/bindings/interface_ptr_info.h @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_INTERFACE_PTR_INFO_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_INTERFACE_PTR_INFO_H_ +#ifndef MOJO_PUBLIC_CPP_BINDINGS_INTERFACE_PTR_INFO_H_ +#define MOJO_PUBLIC_CPP_BINDINGS_INTERFACE_PTR_INFO_H_ -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" -#include "third_party/mojo/src/mojo/public/cpp/system/message_pipe.h" +#include "mojo/public/cpp/system/macros.h" +#include "mojo/public/cpp/system/message_pipe.h" namespace mojo { @@ -55,4 +55,4 @@ class InterfacePtrInfo { } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_INTERFACE_PTR_INFO_H_ +#endif // MOJO_PUBLIC_CPP_BINDINGS_INTERFACE_PTR_INFO_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h b/mojo/public/cpp/bindings/interface_request.h similarity index 93% rename from third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h rename to mojo/public/cpp/bindings/interface_request.h index 0bd42f76144d29..c139306e2c8d67 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h +++ b/mojo/public/cpp/bindings/interface_request.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_INTERFACE_REQUEST_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_INTERFACE_REQUEST_H_ +#ifndef MOJO_PUBLIC_CPP_BINDINGS_INTERFACE_REQUEST_H_ +#define MOJO_PUBLIC_CPP_BINDINGS_INTERFACE_REQUEST_H_ -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_ptr.h" +#include "mojo/public/cpp/bindings/interface_ptr.h" namespace mojo { @@ -115,4 +115,4 @@ InterfaceRequest GetProxy(InterfacePtr* ptr) { } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_INTERFACE_REQUEST_H_ +#endif // MOJO_PUBLIC_CPP_BINDINGS_INTERFACE_REQUEST_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/lib/TODO b/mojo/public/cpp/bindings/lib/TODO similarity index 100% rename from third_party/mojo/src/mojo/public/cpp/bindings/lib/TODO rename to mojo/public/cpp/bindings/lib/TODO diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/lib/array_internal.cc b/mojo/public/cpp/bindings/lib/array_internal.cc similarity index 96% rename from third_party/mojo/src/mojo/public/cpp/bindings/lib/array_internal.cc rename to mojo/public/cpp/bindings/lib/array_internal.cc index a92911e7d14a0a..61e4b0deafa449 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/lib/array_internal.cc +++ b/mojo/public/cpp/bindings/lib/array_internal.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 "third_party/mojo/src/mojo/public/cpp/bindings/lib/array_internal.h" +#include "mojo/public/cpp/bindings/lib/array_internal.h" #include diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/lib/array_internal.h b/mojo/public/cpp/bindings/lib/array_internal.h similarity index 94% rename from third_party/mojo/src/mojo/public/cpp/bindings/lib/array_internal.h rename to mojo/public/cpp/bindings/lib/array_internal.h index 152ae59ef32619..41ca174d1d27c3 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/lib/array_internal.h +++ b/mojo/public/cpp/bindings/lib/array_internal.h @@ -2,22 +2,22 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_ARRAY_INTERNAL_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_ARRAY_INTERNAL_H_ +#ifndef MOJO_PUBLIC_CPP_BINDINGS_LIB_ARRAY_INTERNAL_H_ +#define MOJO_PUBLIC_CPP_BINDINGS_LIB_ARRAY_INTERNAL_H_ #include #include -#include "third_party/mojo/src/mojo/public/c/system/macros.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/bindings_internal.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/bindings_serialization.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/bounds_checker.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/buffer.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/map_data_internal.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/template_util.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/validate_params.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/validation_errors.h" -#include "third_party/mojo/src/mojo/public/cpp/environment/logging.h" +#include "mojo/public/c/system/macros.h" +#include "mojo/public/cpp/bindings/lib/bindings_internal.h" +#include "mojo/public/cpp/bindings/lib/bindings_serialization.h" +#include "mojo/public/cpp/bindings/lib/bounds_checker.h" +#include "mojo/public/cpp/bindings/lib/buffer.h" +#include "mojo/public/cpp/bindings/lib/map_data_internal.h" +#include "mojo/public/cpp/bindings/lib/template_util.h" +#include "mojo/public/cpp/bindings/lib/validate_params.h" +#include "mojo/public/cpp/bindings/lib/validation_errors.h" +#include "mojo/public/cpp/environment/logging.h" namespace mojo { template @@ -531,4 +531,4 @@ struct WrapperTraits { } // namespace internal } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_ARRAY_INTERNAL_H_ +#endif // MOJO_PUBLIC_CPP_BINDINGS_LIB_ARRAY_INTERNAL_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/lib/array_serialization.h b/mojo/public/cpp/bindings/lib/array_serialization.h similarity index 94% rename from third_party/mojo/src/mojo/public/cpp/bindings/lib/array_serialization.h rename to mojo/public/cpp/bindings/lib/array_serialization.h index 854dd74f3e9c03..9d0e7bb438d0c6 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/lib/array_serialization.h +++ b/mojo/public/cpp/bindings/lib/array_serialization.h @@ -2,19 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_ARRAY_SERIALIZATION_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_ARRAY_SERIALIZATION_H_ +#ifndef MOJO_PUBLIC_CPP_BINDINGS_LIB_ARRAY_SERIALIZATION_H_ +#define MOJO_PUBLIC_CPP_BINDINGS_LIB_ARRAY_SERIALIZATION_H_ #include // For |memcpy()|. #include -#include "third_party/mojo/src/mojo/public/c/system/macros.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/array_internal.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/map_serialization.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/string_serialization.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/template_util.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/validation_errors.h" +#include "mojo/public/c/system/macros.h" +#include "mojo/public/cpp/bindings/lib/array_internal.h" +#include "mojo/public/cpp/bindings/lib/map_serialization.h" +#include "mojo/public/cpp/bindings/lib/string_serialization.h" +#include "mojo/public/cpp/bindings/lib/template_util.h" +#include "mojo/public/cpp/bindings/lib/validation_errors.h" namespace mojo { @@ -335,4 +335,4 @@ inline void Deserialize_(internal::Array_Data* input, Array* output) { } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_ARRAY_SERIALIZATION_H_ +#endif // MOJO_PUBLIC_CPP_BINDINGS_LIB_ARRAY_SERIALIZATION_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/lib/bindings_internal.h b/mojo/public/cpp/bindings/lib/bindings_internal.h similarity index 86% rename from third_party/mojo/src/mojo/public/cpp/bindings/lib/bindings_internal.h rename to mojo/public/cpp/bindings/lib/bindings_internal.h index 4221239bbce327..436f5800f238a3 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/lib/bindings_internal.h +++ b/mojo/public/cpp/bindings/lib/bindings_internal.h @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_BINDINGS_INTERNAL_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_BINDINGS_INTERNAL_H_ +#ifndef MOJO_PUBLIC_CPP_BINDINGS_LIB_BINDINGS_INTERNAL_H_ +#define MOJO_PUBLIC_CPP_BINDINGS_LIB_BINDINGS_INTERNAL_H_ -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/template_util.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/struct_ptr.h" -#include "third_party/mojo/src/mojo/public/cpp/system/core.h" +#include "mojo/public/cpp/bindings/lib/template_util.h" +#include "mojo/public/cpp/bindings/struct_ptr.h" +#include "mojo/public/cpp/system/core.h" namespace mojo { namespace internal { @@ -131,4 +131,4 @@ struct WrapperTraits { } // namespace internal } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_BINDINGS_INTERNAL_H_ +#endif // MOJO_PUBLIC_CPP_BINDINGS_LIB_BINDINGS_INTERNAL_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/lib/bindings_serialization.cc b/mojo/public/cpp/bindings/lib/bindings_serialization.cc similarity index 93% rename from third_party/mojo/src/mojo/public/cpp/bindings/lib/bindings_serialization.cc rename to mojo/public/cpp/bindings/lib/bindings_serialization.cc index 12730605df9332..791afe20278607 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/lib/bindings_serialization.cc +++ b/mojo/public/cpp/bindings/lib/bindings_serialization.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/bindings_serialization.h" +#include "mojo/public/cpp/bindings/lib/bindings_serialization.h" -#include "third_party/mojo/src/mojo/public/cpp/environment/logging.h" +#include "mojo/public/cpp/environment/logging.h" namespace mojo { namespace internal { diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/lib/bindings_serialization.h b/mojo/public/cpp/bindings/lib/bindings_serialization.h similarity index 86% rename from third_party/mojo/src/mojo/public/cpp/bindings/lib/bindings_serialization.h rename to mojo/public/cpp/bindings/lib/bindings_serialization.h index 8fa95d35fc074e..5e2f9a775ca89e 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/lib/bindings_serialization.h +++ b/mojo/public/cpp/bindings/lib/bindings_serialization.h @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_BINDINGS_SERIALIZATION_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_BINDINGS_SERIALIZATION_H_ +#ifndef MOJO_PUBLIC_CPP_BINDINGS_LIB_BINDINGS_SERIALIZATION_H_ +#define MOJO_PUBLIC_CPP_BINDINGS_LIB_BINDINGS_SERIALIZATION_H_ #include -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_ptr.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/bindings_internal.h" -#include "third_party/mojo/src/mojo/public/cpp/system/core.h" +#include "mojo/public/cpp/bindings/interface_ptr.h" +#include "mojo/public/cpp/bindings/lib/bindings_internal.h" +#include "mojo/public/cpp/system/core.h" namespace mojo { namespace internal { @@ -88,4 +88,4 @@ inline void InterfaceDataToPointer(Interface_Data* input, } // namespace internal } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_BINDINGS_SERIALIZATION_H_ +#endif // MOJO_PUBLIC_CPP_BINDINGS_LIB_BINDINGS_SERIALIZATION_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/lib/bounds_checker.cc b/mojo/public/cpp/bindings/lib/bounds_checker.cc similarity index 88% rename from third_party/mojo/src/mojo/public/cpp/bindings/lib/bounds_checker.cc rename to mojo/public/cpp/bindings/lib/bounds_checker.cc index 2e4e9261f6f09e..5b96b2d09dc566 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/lib/bounds_checker.cc +++ b/mojo/public/cpp/bindings/lib/bounds_checker.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/bounds_checker.h" +#include "mojo/public/cpp/bindings/lib/bounds_checker.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/bindings_serialization.h" -#include "third_party/mojo/src/mojo/public/cpp/environment/logging.h" -#include "third_party/mojo/src/mojo/public/cpp/system/handle.h" +#include "mojo/public/cpp/bindings/lib/bindings_serialization.h" +#include "mojo/public/cpp/environment/logging.h" +#include "mojo/public/cpp/system/handle.h" namespace mojo { namespace internal { diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/lib/bounds_checker.h b/mojo/public/cpp/bindings/lib/bounds_checker.h similarity index 86% rename from third_party/mojo/src/mojo/public/cpp/bindings/lib/bounds_checker.h rename to mojo/public/cpp/bindings/lib/bounds_checker.h index 2ad9bc1973b207..f0520be8182c70 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/lib/bounds_checker.h +++ b/mojo/public/cpp/bindings/lib/bounds_checker.h @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_BOUNDS_CHECKER_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_BOUNDS_CHECKER_H_ +#ifndef MOJO_PUBLIC_CPP_BINDINGS_LIB_BOUNDS_CHECKER_H_ +#define MOJO_PUBLIC_CPP_BINDINGS_LIB_BOUNDS_CHECKER_H_ #include -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/cpp/system/macros.h" namespace mojo { @@ -60,4 +60,4 @@ class BoundsChecker { } // namespace internal } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_BOUNDS_CHECKER_H_ +#endif // MOJO_PUBLIC_CPP_BINDINGS_LIB_BOUNDS_CHECKER_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/lib/buffer.h b/mojo/public/cpp/bindings/lib/buffer.h similarity index 71% rename from third_party/mojo/src/mojo/public/cpp/bindings/lib/buffer.h rename to mojo/public/cpp/bindings/lib/buffer.h index 99197f4ecd54ad..c3b570e7767d5a 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/lib/buffer.h +++ b/mojo/public/cpp/bindings/lib/buffer.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_BUFFER_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_BUFFER_H_ +#ifndef MOJO_PUBLIC_CPP_BINDINGS_LIB_BUFFER_H_ +#define MOJO_PUBLIC_CPP_BINDINGS_LIB_BUFFER_H_ #include @@ -21,4 +21,4 @@ class Buffer { } // namespace internal } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_BUFFER_H_ +#endif // MOJO_PUBLIC_CPP_BINDINGS_LIB_BUFFER_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/lib/callback_internal.h b/mojo/public/cpp/bindings/lib/callback_internal.h similarity index 79% rename from third_party/mojo/src/mojo/public/cpp/bindings/lib/callback_internal.h rename to mojo/public/cpp/bindings/lib/callback_internal.h index a48445ac7b8686..9df5b40a73555e 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/lib/callback_internal.h +++ b/mojo/public/cpp/bindings/lib/callback_internal.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_CALLBACK_INTERNAL_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_CALLBACK_INTERNAL_H_ +#ifndef MOJO_PUBLIC_CPP_BINDINGS_LIB_CALLBACK_INTERNAL_H_ +#define MOJO_PUBLIC_CPP_BINDINGS_LIB_CALLBACK_INTERNAL_H_ -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/template_util.h" +#include "mojo/public/cpp/bindings/lib/template_util.h" namespace mojo { class String; @@ -50,4 +50,4 @@ struct HasCompatibleCallOperator { } // namespace internal } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_CALLBACK_INTERNAL_H_ +#endif // MOJO_PUBLIC_CPP_BINDINGS_LIB_CALLBACK_INTERNAL_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/lib/connector.cc b/mojo/public/cpp/bindings/lib/connector.cc similarity index 98% rename from third_party/mojo/src/mojo/public/cpp/bindings/lib/connector.cc rename to mojo/public/cpp/bindings/lib/connector.cc index 74a1e7d14f10d1..5bd94eb63ae945 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/lib/connector.cc +++ b/mojo/public/cpp/bindings/lib/connector.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/connector.h" +#include "mojo/public/cpp/bindings/lib/connector.h" -#include "third_party/mojo/src/mojo/public/cpp/environment/logging.h" +#include "mojo/public/cpp/environment/logging.h" namespace mojo { namespace internal { diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/lib/connector.h b/mojo/public/cpp/bindings/lib/connector.h similarity index 89% rename from third_party/mojo/src/mojo/public/cpp/bindings/lib/connector.h rename to mojo/public/cpp/bindings/lib/connector.h index e62345ce029647..185a98446d0158 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/lib/connector.h +++ b/mojo/public/cpp/bindings/lib/connector.h @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_CONNECTOR_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_CONNECTOR_H_ +#ifndef MOJO_PUBLIC_CPP_BINDINGS_LIB_CONNECTOR_H_ +#define MOJO_PUBLIC_CPP_BINDINGS_LIB_CONNECTOR_H_ -#include "third_party/mojo/src/mojo/public/c/environment/async_waiter.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/callback.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/message.h" -#include "third_party/mojo/src/mojo/public/cpp/environment/environment.h" -#include "third_party/mojo/src/mojo/public/cpp/system/core.h" +#include "mojo/public/c/environment/async_waiter.h" +#include "mojo/public/cpp/bindings/callback.h" +#include "mojo/public/cpp/bindings/message.h" +#include "mojo/public/cpp/environment/environment.h" +#include "mojo/public/cpp/system/core.h" namespace mojo { class ErrorHandler; @@ -139,4 +139,4 @@ class Connector : public MessageReceiver { } // namespace internal } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_CONNECTOR_H_ +#endif // MOJO_PUBLIC_CPP_BINDINGS_LIB_CONNECTOR_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/lib/control_message_handler.cc b/mojo/public/cpp/bindings/lib/control_message_handler.cc similarity index 87% rename from third_party/mojo/src/mojo/public/cpp/bindings/lib/control_message_handler.cc rename to mojo/public/cpp/bindings/lib/control_message_handler.cc index c3305a4589b192..5113bb0203ad35 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/lib/control_message_handler.cc +++ b/mojo/public/cpp/bindings/lib/control_message_handler.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/control_message_handler.h" +#include "mojo/public/cpp/bindings/lib/control_message_handler.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/message_builder.h" -#include "third_party/mojo/src/mojo/public/cpp/environment/logging.h" -#include "third_party/mojo/src/mojo/public/interfaces/bindings/interface_control_messages.mojom.h" +#include "mojo/public/cpp/bindings/lib/message_builder.h" +#include "mojo/public/cpp/environment/logging.h" +#include "mojo/public/interfaces/bindings/interface_control_messages.mojom.h" namespace mojo { namespace internal { diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/lib/control_message_handler.h b/mojo/public/cpp/bindings/lib/control_message_handler.h similarity index 73% rename from third_party/mojo/src/mojo/public/cpp/bindings/lib/control_message_handler.h rename to mojo/public/cpp/bindings/lib/control_message_handler.h index 9de4fd7502f746..4a2fed5e51f529 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/lib/control_message_handler.h +++ b/mojo/public/cpp/bindings/lib/control_message_handler.h @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_CONTROL_MESSAGE_HANDLER_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_CONTROL_MESSAGE_HANDLER_H_ +#ifndef MOJO_PUBLIC_CPP_BINDINGS_LIB_CONTROL_MESSAGE_HANDLER_H_ +#define MOJO_PUBLIC_CPP_BINDINGS_LIB_CONTROL_MESSAGE_HANDLER_H_ #include -#include "third_party/mojo/src/mojo/public/cpp/bindings/message.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/cpp/bindings/message.h" +#include "mojo/public/cpp/system/macros.h" namespace mojo { namespace internal { @@ -39,4 +39,4 @@ class ControlMessageHandler : public MessageReceiverWithResponderStatus { } // namespace internal } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_CONTROL_MESSAGE_HANDLER_H_ +#endif // MOJO_PUBLIC_CPP_BINDINGS_LIB_CONTROL_MESSAGE_HANDLER_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/lib/control_message_proxy.cc b/mojo/public/cpp/bindings/lib/control_message_proxy.cc similarity index 89% rename from third_party/mojo/src/mojo/public/cpp/bindings/lib/control_message_proxy.cc rename to mojo/public/cpp/bindings/lib/control_message_proxy.cc index 0049bfb9bb7260..ad729c5de2ed04 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/lib/control_message_proxy.cc +++ b/mojo/public/cpp/bindings/lib/control_message_proxy.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/control_message_proxy.h" +#include "mojo/public/cpp/bindings/lib/control_message_proxy.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/message_builder.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/message.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" -#include "third_party/mojo/src/mojo/public/interfaces/bindings/interface_control_messages.mojom.h" +#include "mojo/public/cpp/bindings/lib/message_builder.h" +#include "mojo/public/cpp/bindings/message.h" +#include "mojo/public/cpp/system/macros.h" +#include "mojo/public/interfaces/bindings/interface_control_messages.mojom.h" namespace mojo { namespace internal { diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/lib/control_message_proxy.h b/mojo/public/cpp/bindings/lib/control_message_proxy.h similarity index 67% rename from third_party/mojo/src/mojo/public/cpp/bindings/lib/control_message_proxy.h rename to mojo/public/cpp/bindings/lib/control_message_proxy.h index 229ef4c918fe2a..5b0f018d6ccb99 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/lib/control_message_proxy.h +++ b/mojo/public/cpp/bindings/lib/control_message_proxy.h @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_CONTROL_MESSAGE_PROXY_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_CONTROL_MESSAGE_PROXY_H_ +#ifndef MOJO_PUBLIC_CPP_BINDINGS_LIB_CONTROL_MESSAGE_PROXY_H_ +#define MOJO_PUBLIC_CPP_BINDINGS_LIB_CONTROL_MESSAGE_PROXY_H_ #include -#include "third_party/mojo/src/mojo/public/cpp/bindings/callback.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/cpp/bindings/callback.h" +#include "mojo/public/cpp/system/macros.h" namespace mojo { @@ -35,4 +35,4 @@ class ControlMessageProxy { } // namespace internal } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_CONTROL_MESSAGE_PROXY_H_ +#endif // MOJO_PUBLIC_CPP_BINDINGS_LIB_CONTROL_MESSAGE_PROXY_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/lib/filter_chain.cc b/mojo/public/cpp/bindings/lib/filter_chain.cc similarity index 87% rename from third_party/mojo/src/mojo/public/cpp/bindings/lib/filter_chain.cc rename to mojo/public/cpp/bindings/lib/filter_chain.cc index 4194f6900ce7a6..d32eb7860896e3 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/lib/filter_chain.cc +++ b/mojo/public/cpp/bindings/lib/filter_chain.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/filter_chain.h" +#include "mojo/public/cpp/bindings/lib/filter_chain.h" #include -#include "third_party/mojo/src/mojo/public/cpp/environment/logging.h" +#include "mojo/public/cpp/environment/logging.h" namespace mojo { namespace internal { diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/lib/filter_chain.h b/mojo/public/cpp/bindings/lib/filter_chain.h similarity index 77% rename from third_party/mojo/src/mojo/public/cpp/bindings/lib/filter_chain.h rename to mojo/public/cpp/bindings/lib/filter_chain.h index 65c2d630f004bd..bd7f9f54bf0116 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/lib/filter_chain.h +++ b/mojo/public/cpp/bindings/lib/filter_chain.h @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_FILTER_CHAIN_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_FILTER_CHAIN_H_ +#ifndef MOJO_PUBLIC_CPP_BINDINGS_LIB_FILTER_CHAIN_H_ +#define MOJO_PUBLIC_CPP_BINDINGS_LIB_FILTER_CHAIN_H_ #include -#include "third_party/mojo/src/mojo/public/cpp/bindings/message.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/message_filter.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/cpp/bindings/message.h" +#include "mojo/public/cpp/bindings/message_filter.h" +#include "mojo/public/cpp/system/macros.h" namespace mojo { namespace internal { @@ -61,4 +61,4 @@ inline void FilterChain::Append() { } // namespace internal } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_FILTER_CHAIN_H_ +#endif // MOJO_PUBLIC_CPP_BINDINGS_LIB_FILTER_CHAIN_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/lib/fixed_buffer.cc b/mojo/public/cpp/bindings/lib/fixed_buffer.cc similarity index 83% rename from third_party/mojo/src/mojo/public/cpp/bindings/lib/fixed_buffer.cc rename to mojo/public/cpp/bindings/lib/fixed_buffer.cc index 44d0c867e06079..c81fc6e8ed8bf7 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/lib/fixed_buffer.cc +++ b/mojo/public/cpp/bindings/lib/fixed_buffer.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/fixed_buffer.h" +#include "mojo/public/cpp/bindings/lib/fixed_buffer.h" #include #include -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/bindings_serialization.h" -#include "third_party/mojo/src/mojo/public/cpp/environment/logging.h" +#include "mojo/public/cpp/bindings/lib/bindings_serialization.h" +#include "mojo/public/cpp/environment/logging.h" namespace mojo { namespace internal { diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/lib/fixed_buffer.h b/mojo/public/cpp/bindings/lib/fixed_buffer.h similarity index 84% rename from third_party/mojo/src/mojo/public/cpp/bindings/lib/fixed_buffer.h rename to mojo/public/cpp/bindings/lib/fixed_buffer.h index f0c7efd67e9d8f..83eaf97067b37c 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/lib/fixed_buffer.h +++ b/mojo/public/cpp/bindings/lib/fixed_buffer.h @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_FIXED_BUFFER_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_FIXED_BUFFER_H_ +#ifndef MOJO_PUBLIC_CPP_BINDINGS_LIB_FIXED_BUFFER_H_ +#define MOJO_PUBLIC_CPP_BINDINGS_LIB_FIXED_BUFFER_H_ -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/buffer.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/cpp/bindings/lib/buffer.h" +#include "mojo/public/cpp/system/macros.h" namespace mojo { namespace internal { @@ -75,4 +75,4 @@ class FixedBufferForTesting : public FixedBuffer { } // namespace internal } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_FIXED_BUFFER_H_ +#endif // MOJO_PUBLIC_CPP_BINDINGS_LIB_FIXED_BUFFER_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/lib/interface_ptr_internal.h b/mojo/public/cpp/bindings/lib/interface_ptr_internal.h similarity index 84% rename from third_party/mojo/src/mojo/public/cpp/bindings/lib/interface_ptr_internal.h rename to mojo/public/cpp/bindings/lib/interface_ptr_internal.h index b0872fb9695fe2..1c2cad85845eca 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/lib/interface_ptr_internal.h +++ b/mojo/public/cpp/bindings/lib/interface_ptr_internal.h @@ -2,18 +2,18 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_INTERFACE_PTR_INTERNAL_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_INTERFACE_PTR_INTERNAL_H_ +#ifndef MOJO_PUBLIC_CPP_BINDINGS_LIB_INTERFACE_PTR_INTERNAL_H_ +#define MOJO_PUBLIC_CPP_BINDINGS_LIB_INTERFACE_PTR_INTERNAL_H_ #include // For |std::swap()|. -#include "third_party/mojo/src/mojo/public/cpp/bindings/callback.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_ptr_info.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/control_message_proxy.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/filter_chain.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/message_header_validator.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/router.h" -#include "third_party/mojo/src/mojo/public/cpp/environment/logging.h" +#include "mojo/public/cpp/bindings/callback.h" +#include "mojo/public/cpp/bindings/interface_ptr_info.h" +#include "mojo/public/cpp/bindings/lib/control_message_proxy.h" +#include "mojo/public/cpp/bindings/lib/filter_chain.h" +#include "mojo/public/cpp/bindings/lib/message_header_validator.h" +#include "mojo/public/cpp/bindings/lib/router.h" +#include "mojo/public/cpp/environment/logging.h" struct MojoAsyncWaiter; @@ -171,4 +171,4 @@ class InterfacePtrState { } // namespace internal } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_INTERFACE_PTR_INTERNAL_H_ +#endif // MOJO_PUBLIC_CPP_BINDINGS_LIB_INTERFACE_PTR_INTERNAL_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/lib/map_data_internal.h b/mojo/public/cpp/bindings/lib/map_data_internal.h similarity index 88% rename from third_party/mojo/src/mojo/public/cpp/bindings/lib/map_data_internal.h rename to mojo/public/cpp/bindings/lib/map_data_internal.h index a8d7f5015e6f90..8315dbc8e10e61 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/lib/map_data_internal.h +++ b/mojo/public/cpp/bindings/lib/map_data_internal.h @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_MAP_DATA_INTERNAL_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_MAP_DATA_INTERNAL_H_ +#ifndef MOJO_PUBLIC_CPP_BINDINGS_LIB_MAP_DATA_INTERNAL_H_ +#define MOJO_PUBLIC_CPP_BINDINGS_LIB_MAP_DATA_INTERNAL_H_ -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/array_internal.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/validate_params.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/validation_errors.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/validation_util.h" +#include "mojo/public/cpp/bindings/lib/array_internal.h" +#include "mojo/public/cpp/bindings/lib/validate_params.h" +#include "mojo/public/cpp/bindings/lib/validation_errors.h" +#include "mojo/public/cpp/bindings/lib/validation_util.h" namespace mojo { namespace internal { @@ -138,4 +138,4 @@ static_assert(sizeof(Map_Data) == 24, "Bad sizeof(Map_Data)"); } // namespace internal } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_MAP_DATA_INTERNAL_H_ +#endif // MOJO_PUBLIC_CPP_BINDINGS_LIB_MAP_DATA_INTERNAL_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/lib/map_internal.h b/mojo/public/cpp/bindings/lib/map_internal.h similarity index 95% rename from third_party/mojo/src/mojo/public/cpp/bindings/lib/map_internal.h rename to mojo/public/cpp/bindings/lib/map_internal.h index e5bafc1e05b4e8..84f927c9918144 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/lib/map_internal.h +++ b/mojo/public/cpp/bindings/lib/map_internal.h @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_MAP_INTERNAL_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_MAP_INTERNAL_H_ +#ifndef MOJO_PUBLIC_CPP_BINDINGS_LIB_MAP_INTERNAL_H_ +#define MOJO_PUBLIC_CPP_BINDINGS_LIB_MAP_INTERNAL_H_ #include -#include "third_party/mojo/src/mojo/public/cpp/bindings/array.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/template_util.h" +#include "mojo/public/cpp/bindings/array.h" +#include "mojo/public/cpp/bindings/lib/template_util.h" namespace mojo { namespace internal { @@ -217,4 +217,4 @@ struct MapTraits { } // namespace internal } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_MAP_INTERNAL_H_ +#endif // MOJO_PUBLIC_CPP_BINDINGS_LIB_MAP_INTERNAL_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/lib/map_serialization.h b/mojo/public/cpp/bindings/lib/map_serialization.h similarity index 90% rename from third_party/mojo/src/mojo/public/cpp/bindings/lib/map_serialization.h rename to mojo/public/cpp/bindings/lib/map_serialization.h index 4052ae87fe0fe5..6014b36bebec07 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/lib/map_serialization.h +++ b/mojo/public/cpp/bindings/lib/map_serialization.h @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_MAP_SERIALIZATION_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_MAP_SERIALIZATION_H_ +#ifndef MOJO_PUBLIC_CPP_BINDINGS_LIB_MAP_SERIALIZATION_H_ +#define MOJO_PUBLIC_CPP_BINDINGS_LIB_MAP_SERIALIZATION_H_ -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/array_internal.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/map_data_internal.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/map_internal.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/string_serialization.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/map.h" +#include "mojo/public/cpp/bindings/lib/array_internal.h" +#include "mojo/public/cpp/bindings/lib/map_data_internal.h" +#include "mojo/public/cpp/bindings/lib/map_internal.h" +#include "mojo/public/cpp/bindings/lib/string_serialization.h" +#include "mojo/public/cpp/bindings/map.h" namespace mojo { @@ -179,4 +179,4 @@ inline void Deserialize_(internal::Map_Data* input, } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_MAP_SERIALIZATION_H_ +#endif // MOJO_PUBLIC_CPP_BINDINGS_LIB_MAP_SERIALIZATION_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/lib/message.cc b/mojo/public/cpp/bindings/lib/message.cc similarity index 94% rename from third_party/mojo/src/mojo/public/cpp/bindings/lib/message.cc rename to mojo/public/cpp/bindings/lib/message.cc index 26884e40380862..6b563e779aca7d 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/lib/message.cc +++ b/mojo/public/cpp/bindings/lib/message.cc @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "third_party/mojo/src/mojo/public/cpp/bindings/message.h" +#include "mojo/public/cpp/bindings/message.h" #include #include -#include "third_party/mojo/src/mojo/public/cpp/environment/logging.h" +#include "mojo/public/cpp/environment/logging.h" namespace mojo { diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/lib/message_builder.cc b/mojo/public/cpp/bindings/lib/message_builder.cc similarity index 86% rename from third_party/mojo/src/mojo/public/cpp/bindings/lib/message_builder.cc rename to mojo/public/cpp/bindings/lib/message_builder.cc index a96f93f8a08dbd..25f1862e47ea8b 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/lib/message_builder.cc +++ b/mojo/public/cpp/bindings/lib/message_builder.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/message_builder.h" +#include "mojo/public/cpp/bindings/lib/message_builder.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/bindings_serialization.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/message.h" +#include "mojo/public/cpp/bindings/lib/bindings_serialization.h" +#include "mojo/public/cpp/bindings/message.h" namespace mojo { namespace internal { diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/lib/message_builder.h b/mojo/public/cpp/bindings/lib/message_builder.h similarity index 78% rename from third_party/mojo/src/mojo/public/cpp/bindings/lib/message_builder.h rename to mojo/public/cpp/bindings/lib/message_builder.h index 9178eb91c0864e..86ae71db142431 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/lib/message_builder.h +++ b/mojo/public/cpp/bindings/lib/message_builder.h @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_MESSAGE_BUILDER_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_MESSAGE_BUILDER_H_ +#ifndef MOJO_PUBLIC_CPP_BINDINGS_LIB_MESSAGE_BUILDER_H_ +#define MOJO_PUBLIC_CPP_BINDINGS_LIB_MESSAGE_BUILDER_H_ #include -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/fixed_buffer.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/message_internal.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/message.h" +#include "mojo/public/cpp/bindings/lib/fixed_buffer.h" +#include "mojo/public/cpp/bindings/lib/message_internal.h" +#include "mojo/public/cpp/bindings/message.h" namespace mojo { class Message; @@ -65,4 +65,4 @@ class ResponseMessageBuilder : public MessageWithRequestIDBuilder { } // namespace internal } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_MESSAGE_BUILDER_H_ +#endif // MOJO_PUBLIC_CPP_BINDINGS_LIB_MESSAGE_BUILDER_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/lib/message_filter.cc b/mojo/public/cpp/bindings/lib/message_filter.cc similarity index 86% rename from third_party/mojo/src/mojo/public/cpp/bindings/lib/message_filter.cc rename to mojo/public/cpp/bindings/lib/message_filter.cc index f1cb7d273363d7..b09f40d8c5efee 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/lib/message_filter.cc +++ b/mojo/public/cpp/bindings/lib/message_filter.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 "third_party/mojo/src/mojo/public/cpp/bindings/message_filter.h" +#include "mojo/public/cpp/bindings/message_filter.h" namespace mojo { diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/lib/message_header_validator.cc b/mojo/public/cpp/bindings/lib/message_header_validator.cc similarity index 87% rename from third_party/mojo/src/mojo/public/cpp/bindings/lib/message_header_validator.cc rename to mojo/public/cpp/bindings/lib/message_header_validator.cc index 990bbb18d877cc..940b15ccf2c149 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/lib/message_header_validator.cc +++ b/mojo/public/cpp/bindings/lib/message_header_validator.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/message_header_validator.h" +#include "mojo/public/cpp/bindings/lib/message_header_validator.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/bounds_checker.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/validation_errors.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/validation_util.h" +#include "mojo/public/cpp/bindings/lib/bounds_checker.h" +#include "mojo/public/cpp/bindings/lib/validation_errors.h" +#include "mojo/public/cpp/bindings/lib/validation_util.h" namespace mojo { namespace internal { diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/lib/message_header_validator.h b/mojo/public/cpp/bindings/lib/message_header_validator.h similarity index 51% rename from third_party/mojo/src/mojo/public/cpp/bindings/lib/message_header_validator.h rename to mojo/public/cpp/bindings/lib/message_header_validator.h index 71a2c003821f35..bccef1f772a4cf 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/lib/message_header_validator.h +++ b/mojo/public/cpp/bindings/lib/message_header_validator.h @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_MESSAGE_HEADER_VALIDATOR_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_MESSAGE_HEADER_VALIDATOR_H_ +#ifndef MOJO_PUBLIC_CPP_BINDINGS_LIB_MESSAGE_HEADER_VALIDATOR_H_ +#define MOJO_PUBLIC_CPP_BINDINGS_LIB_MESSAGE_HEADER_VALIDATOR_H_ -#include "third_party/mojo/src/mojo/public/cpp/bindings/message.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/message_filter.h" +#include "mojo/public/cpp/bindings/message.h" +#include "mojo/public/cpp/bindings/message_filter.h" namespace mojo { namespace internal { @@ -21,4 +21,4 @@ class MessageHeaderValidator : public MessageFilter { } // namespace internal } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_MESSAGE_HEADER_VALIDATOR_H_ +#endif // MOJO_PUBLIC_CPP_BINDINGS_LIB_MESSAGE_HEADER_VALIDATOR_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/lib/message_internal.h b/mojo/public/cpp/bindings/lib/message_internal.h similarity index 80% rename from third_party/mojo/src/mojo/public/cpp/bindings/lib/message_internal.h rename to mojo/public/cpp/bindings/lib/message_internal.h index 744a2bb8a9a79d..97b96193ff6a2b 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/lib/message_internal.h +++ b/mojo/public/cpp/bindings/lib/message_internal.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_MESSAGE_INTERNAL_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_MESSAGE_INTERNAL_H_ +#ifndef MOJO_PUBLIC_CPP_BINDINGS_LIB_MESSAGE_INTERNAL_H_ +#define MOJO_PUBLIC_CPP_BINDINGS_LIB_MESSAGE_INTERNAL_H_ -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/bindings_internal.h" +#include "mojo/public/cpp/bindings/lib/bindings_internal.h" namespace mojo { namespace internal { @@ -47,4 +47,4 @@ static_assert(sizeof(MessageData) == sizeof(MessageHeader), } // namespace internal } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_MESSAGE_INTERNAL_H_ +#endif // MOJO_PUBLIC_CPP_BINDINGS_LIB_MESSAGE_INTERNAL_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/lib/no_interface.cc b/mojo/public/cpp/bindings/lib/no_interface.cc similarity index 86% rename from third_party/mojo/src/mojo/public/cpp/bindings/lib/no_interface.cc rename to mojo/public/cpp/bindings/lib/no_interface.cc index 703bc8c372e98f..9e0945c83b3b15 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/lib/no_interface.cc +++ b/mojo/public/cpp/bindings/lib/no_interface.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 "third_party/mojo/src/mojo/public/cpp/bindings/no_interface.h" +#include "mojo/public/cpp/bindings/no_interface.h" namespace mojo { diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/lib/router.cc b/mojo/public/cpp/bindings/lib/router.cc similarity index 97% rename from third_party/mojo/src/mojo/public/cpp/bindings/lib/router.cc rename to mojo/public/cpp/bindings/lib/router.cc index b28d2cefeee867..fff72b44b5a977 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/lib/router.cc +++ b/mojo/public/cpp/bindings/lib/router.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/router.h" +#include "mojo/public/cpp/bindings/lib/router.h" -#include "third_party/mojo/src/mojo/public/cpp/environment/logging.h" +#include "mojo/public/cpp/environment/logging.h" namespace mojo { namespace internal { diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/lib/router.h b/mojo/public/cpp/bindings/lib/router.h similarity index 85% rename from third_party/mojo/src/mojo/public/cpp/bindings/lib/router.h rename to mojo/public/cpp/bindings/lib/router.h index 97ce2395392929..1697610d23b28c 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/lib/router.h +++ b/mojo/public/cpp/bindings/lib/router.h @@ -2,18 +2,18 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_ROUTER_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_ROUTER_H_ +#ifndef MOJO_PUBLIC_CPP_BINDINGS_LIB_ROUTER_H_ +#define MOJO_PUBLIC_CPP_BINDINGS_LIB_ROUTER_H_ #include -#include "third_party/mojo/src/mojo/public/cpp/bindings/callback.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/connector.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/filter_chain.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/shared_data.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/thread_checker.h" -#include "third_party/mojo/src/mojo/public/cpp/environment/environment.h" -#include "third_party/mojo/src/mojo/public/cpp/environment/logging.h" +#include "mojo/public/cpp/bindings/callback.h" +#include "mojo/public/cpp/bindings/lib/connector.h" +#include "mojo/public/cpp/bindings/lib/filter_chain.h" +#include "mojo/public/cpp/bindings/lib/shared_data.h" +#include "mojo/public/cpp/bindings/lib/thread_checker.h" +#include "mojo/public/cpp/environment/environment.h" +#include "mojo/public/cpp/environment/logging.h" namespace mojo { namespace internal { @@ -138,4 +138,4 @@ class Router : public MessageReceiverWithResponder { } // namespace internal } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_ROUTER_H_ +#endif // MOJO_PUBLIC_CPP_BINDINGS_LIB_ROUTER_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/lib/shared_data.h b/mojo/public/cpp/bindings/lib/shared_data.h similarity index 82% rename from third_party/mojo/src/mojo/public/cpp/bindings/lib/shared_data.h rename to mojo/public/cpp/bindings/lib/shared_data.h index 1490fc55917e6d..2676224c82e0ca 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/lib/shared_data.h +++ b/mojo/public/cpp/bindings/lib/shared_data.h @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_SHARED_DATA_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_SHARED_DATA_H_ +#ifndef MOJO_PUBLIC_CPP_BINDINGS_LIB_SHARED_DATA_H_ +#define MOJO_PUBLIC_CPP_BINDINGS_LIB_SHARED_DATA_H_ #include -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/thread_checker.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/cpp/bindings/lib/thread_checker.h" +#include "mojo/public/cpp/system/macros.h" namespace mojo { namespace internal { @@ -80,4 +80,4 @@ class SharedData { } // namespace internal } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_SHARED_DATA_H_ +#endif // MOJO_PUBLIC_CPP_BINDINGS_LIB_SHARED_DATA_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/lib/shared_ptr.h b/mojo/public/cpp/bindings/lib/shared_ptr.h similarity index 78% rename from third_party/mojo/src/mojo/public/cpp/bindings/lib/shared_ptr.h rename to mojo/public/cpp/bindings/lib/shared_ptr.h index 3a55a597598344..37c87353364678 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/lib/shared_ptr.h +++ b/mojo/public/cpp/bindings/lib/shared_ptr.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_SHARED_PTR_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_SHARED_PTR_H_ +#ifndef MOJO_PUBLIC_CPP_BINDINGS_LIB_SHARED_PTR_H_ +#define MOJO_PUBLIC_CPP_BINDINGS_LIB_SHARED_PTR_H_ -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/shared_data.h" +#include "mojo/public/cpp/bindings/lib/shared_data.h" namespace mojo { namespace internal { @@ -54,4 +54,4 @@ class SharedPtr { } // namespace mojo } // namespace internal -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_SHARED_PTR_H_ +#endif // MOJO_PUBLIC_CPP_BINDINGS_LIB_SHARED_PTR_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/lib/string_serialization.cc b/mojo/public/cpp/bindings/lib/string_serialization.cc similarity index 91% rename from third_party/mojo/src/mojo/public/cpp/bindings/lib/string_serialization.cc rename to mojo/public/cpp/bindings/lib/string_serialization.cc index e217acdfe78110..e29d6f8c461ba7 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/lib/string_serialization.cc +++ b/mojo/public/cpp/bindings/lib/string_serialization.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 "third_party/mojo/src/mojo/public/cpp/bindings/lib/string_serialization.h" +#include "mojo/public/cpp/bindings/lib/string_serialization.h" #include diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/lib/string_serialization.h b/mojo/public/cpp/bindings/lib/string_serialization.h similarity index 53% rename from third_party/mojo/src/mojo/public/cpp/bindings/lib/string_serialization.h rename to mojo/public/cpp/bindings/lib/string_serialization.h index 5ad904a8203872..01187423b2b101 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/lib/string_serialization.h +++ b/mojo/public/cpp/bindings/lib/string_serialization.h @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_STRING_SERIALIZATION_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_STRING_SERIALIZATION_H_ +#ifndef MOJO_PUBLIC_CPP_BINDINGS_LIB_STRING_SERIALIZATION_H_ +#define MOJO_PUBLIC_CPP_BINDINGS_LIB_STRING_SERIALIZATION_H_ -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/array_internal.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/string.h" +#include "mojo/public/cpp/bindings/lib/array_internal.h" +#include "mojo/public/cpp/bindings/string.h" namespace mojo { @@ -18,4 +18,4 @@ void Deserialize_(internal::String_Data* input, String* output); } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_STRING_SERIALIZATION_H_ +#endif // MOJO_PUBLIC_CPP_BINDINGS_LIB_STRING_SERIALIZATION_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/lib/template_util.h b/mojo/public/cpp/bindings/lib/template_util.h similarity index 93% rename from third_party/mojo/src/mojo/public/cpp/bindings/lib/template_util.h rename to mojo/public/cpp/bindings/lib/template_util.h index 7eb68d47305340..9a5788ce85d653 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/lib/template_util.h +++ b/mojo/public/cpp/bindings/lib/template_util.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_TEMPLATE_UTIL_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_TEMPLATE_UTIL_H_ +#ifndef MOJO_PUBLIC_CPP_BINDINGS_LIB_TEMPLATE_UTIL_H_ +#define MOJO_PUBLIC_CPP_BINDINGS_LIB_TEMPLATE_UTIL_H_ namespace mojo { namespace internal { @@ -127,4 +127,4 @@ struct Conditional { } // namespace internal } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_TEMPLATE_UTIL_H_ +#endif // MOJO_PUBLIC_CPP_BINDINGS_LIB_TEMPLATE_UTIL_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/lib/thread_checker.h b/mojo/public/cpp/bindings/lib/thread_checker.h similarity index 70% rename from third_party/mojo/src/mojo/public/cpp/bindings/lib/thread_checker.h rename to mojo/public/cpp/bindings/lib/thread_checker.h index 30af5941e066ae..da45d0a15f2577 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/lib/thread_checker.h +++ b/mojo/public/cpp/bindings/lib/thread_checker.h @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_THREAD_CHECKER_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_THREAD_CHECKER_H_ +#ifndef MOJO_PUBLIC_CPP_BINDINGS_LIB_THREAD_CHECKER_H_ +#define MOJO_PUBLIC_CPP_BINDINGS_LIB_THREAD_CHECKER_H_ -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/cpp/system/macros.h" #if !defined(_WIN32) -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/thread_checker_posix.h" +#include "mojo/public/cpp/bindings/lib/thread_checker_posix.h" #endif namespace mojo { @@ -34,4 +34,4 @@ using ThreadChecker = ThreadCheckerDoNothing; } // namespace internal } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_THREAD_CHECKER_H_ +#endif // MOJO_PUBLIC_CPP_BINDINGS_LIB_THREAD_CHECKER_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/lib/thread_checker_posix.cc b/mojo/public/cpp/bindings/lib/thread_checker_posix.cc similarity index 86% rename from third_party/mojo/src/mojo/public/cpp/bindings/lib/thread_checker_posix.cc rename to mojo/public/cpp/bindings/lib/thread_checker_posix.cc index 1a31973220a208..c8a16e24655952 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/lib/thread_checker_posix.cc +++ b/mojo/public/cpp/bindings/lib/thread_checker_posix.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 "third_party/mojo/src/mojo/public/cpp/bindings/lib/thread_checker_posix.h" +#include "mojo/public/cpp/bindings/lib/thread_checker_posix.h" #include diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/lib/thread_checker_posix.h b/mojo/public/cpp/bindings/lib/thread_checker_posix.h similarity index 65% rename from third_party/mojo/src/mojo/public/cpp/bindings/lib/thread_checker_posix.h rename to mojo/public/cpp/bindings/lib/thread_checker_posix.h index ea1de5afdd86ca..4701b8898efe9f 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/lib/thread_checker_posix.h +++ b/mojo/public/cpp/bindings/lib/thread_checker_posix.h @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_THREAD_CHECKER_POSIX_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_THREAD_CHECKER_POSIX_H_ +#ifndef MOJO_PUBLIC_CPP_BINDINGS_LIB_THREAD_CHECKER_POSIX_H_ +#define MOJO_PUBLIC_CPP_BINDINGS_LIB_THREAD_CHECKER_POSIX_H_ #include -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/cpp/system/macros.h" namespace mojo { namespace internal { @@ -28,4 +28,4 @@ class ThreadCheckerPosix { } // namespace internal } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_THREAD_CHECKER_POSIX_H_ +#endif // MOJO_PUBLIC_CPP_BINDINGS_LIB_THREAD_CHECKER_POSIX_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/lib/union_accessor.h b/mojo/public/cpp/bindings/lib/union_accessor.h similarity index 78% rename from third_party/mojo/src/mojo/public/cpp/bindings/lib/union_accessor.h rename to mojo/public/cpp/bindings/lib/union_accessor.h index 54ad2f8d92baac..821aede5953c37 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/lib/union_accessor.h +++ b/mojo/public/cpp/bindings/lib/union_accessor.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_UNION_ACCESSOR_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_UNION_ACCESSOR_H_ +#ifndef MOJO_PUBLIC_CPP_BINDINGS_LIB_UNION_ACCESSOR_H_ +#define MOJO_PUBLIC_CPP_BINDINGS_LIB_UNION_ACCESSOR_H_ namespace mojo { namespace internal { @@ -30,4 +30,4 @@ class UnionAccessor { } // namespace internal } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_UNION_ACCESSOR_H_ +#endif // MOJO_PUBLIC_CPP_BINDINGS_LIB_UNION_ACCESSOR_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/lib/validate_params.h b/mojo/public/cpp/bindings/lib/validate_params.h similarity index 82% rename from third_party/mojo/src/mojo/public/cpp/bindings/lib/validate_params.h rename to mojo/public/cpp/bindings/lib/validate_params.h index 9871985d406cb5..274a01233906a5 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/lib/validate_params.h +++ b/mojo/public/cpp/bindings/lib/validate_params.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_VALIDATE_PARAMS_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_VALIDATE_PARAMS_H_ +#ifndef MOJO_PUBLIC_CPP_BINDINGS_LIB_VALIDATE_PARAMS_H_ +#define MOJO_PUBLIC_CPP_BINDINGS_LIB_VALIDATE_PARAMS_H_ -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/cpp/system/macros.h" namespace mojo { namespace internal { @@ -46,4 +46,4 @@ class ArrayValidateParams { } // namespace internal } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_VALIDATE_PARAMS_H_ +#endif // MOJO_PUBLIC_CPP_BINDINGS_LIB_VALIDATE_PARAMS_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/lib/validation_errors.cc b/mojo/public/cpp/bindings/lib/validation_errors.cc similarity index 95% rename from third_party/mojo/src/mojo/public/cpp/bindings/lib/validation_errors.cc rename to mojo/public/cpp/bindings/lib/validation_errors.cc index 11fecbbaef866b..ee58ed9a4721b5 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/lib/validation_errors.cc +++ b/mojo/public/cpp/bindings/lib/validation_errors.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/validation_errors.h" +#include "mojo/public/cpp/bindings/lib/validation_errors.h" -#include "third_party/mojo/src/mojo/public/cpp/environment/logging.h" +#include "mojo/public/cpp/environment/logging.h" namespace mojo { namespace internal { diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/lib/validation_errors.h b/mojo/public/cpp/bindings/lib/validation_errors.h similarity index 94% rename from third_party/mojo/src/mojo/public/cpp/bindings/lib/validation_errors.h rename to mojo/public/cpp/bindings/lib/validation_errors.h index 27084fa8c6b450..1d15bc9acf8565 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/lib/validation_errors.h +++ b/mojo/public/cpp/bindings/lib/validation_errors.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_VALIDATION_ERRORS_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_VALIDATION_ERRORS_H_ +#ifndef MOJO_PUBLIC_CPP_BINDINGS_LIB_VALIDATION_ERRORS_H_ +#define MOJO_PUBLIC_CPP_BINDINGS_LIB_VALIDATION_ERRORS_H_ -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/cpp/system/macros.h" namespace mojo { namespace internal { @@ -119,4 +119,4 @@ class SerializationWarningObserverForTesting { << ValidationErrorToString(error) << " at the receiving side (" \ << description << ")."; -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_VALIDATION_ERRORS_H_ +#endif // MOJO_PUBLIC_CPP_BINDINGS_LIB_VALIDATION_ERRORS_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/lib/validation_util.cc b/mojo/public/cpp/bindings/lib/validation_util.cc similarity index 87% rename from third_party/mojo/src/mojo/public/cpp/bindings/lib/validation_util.cc rename to mojo/public/cpp/bindings/lib/validation_util.cc index f81df0fa0660bf..2268a159edd4ee 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/lib/validation_util.cc +++ b/mojo/public/cpp/bindings/lib/validation_util.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/validation_util.h" +#include "mojo/public/cpp/bindings/lib/validation_util.h" #include -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/bindings_serialization.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/message_internal.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/validation_errors.h" -#include "third_party/mojo/src/mojo/public/interfaces/bindings/interface_control_messages.mojom.h" +#include "mojo/public/cpp/bindings/lib/bindings_serialization.h" +#include "mojo/public/cpp/bindings/lib/message_internal.h" +#include "mojo/public/cpp/bindings/lib/validation_errors.h" +#include "mojo/public/interfaces/bindings/interface_control_messages.mojom.h" namespace mojo { namespace internal { diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/lib/validation_util.h b/mojo/public/cpp/bindings/lib/validation_util.h similarity index 84% rename from third_party/mojo/src/mojo/public/cpp/bindings/lib/validation_util.h rename to mojo/public/cpp/bindings/lib/validation_util.h index b1f61571c5b9e9..6853f457ef1584 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/lib/validation_util.h +++ b/mojo/public/cpp/bindings/lib/validation_util.h @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_VALIDATION_UTIL_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_VALIDATION_UTIL_H_ +#ifndef MOJO_PUBLIC_CPP_BINDINGS_LIB_VALIDATION_UTIL_H_ +#define MOJO_PUBLIC_CPP_BINDINGS_LIB_VALIDATION_UTIL_H_ #include -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/bounds_checker.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/message.h" +#include "mojo/public/cpp/bindings/lib/bounds_checker.h" +#include "mojo/public/cpp/bindings/message.h" namespace mojo { namespace internal { @@ -50,4 +50,4 @@ bool ValidateControlResponse(const Message* message); } // namespace internal } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_VALIDATION_UTIL_H_ +#endif // MOJO_PUBLIC_CPP_BINDINGS_LIB_VALIDATION_UTIL_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/lib/value_traits.h b/mojo/public/cpp/bindings/lib/value_traits.h similarity index 89% rename from third_party/mojo/src/mojo/public/cpp/bindings/lib/value_traits.h rename to mojo/public/cpp/bindings/lib/value_traits.h index a1339cf6315188..d3b295b2e0fbb6 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/lib/value_traits.h +++ b/mojo/public/cpp/bindings/lib/value_traits.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_VALUE_TRAITS_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_VALUE_TRAITS_H_ +#ifndef MOJO_PUBLIC_CPP_BINDINGS_LIB_VALUE_TRAITS_H_ +#define MOJO_PUBLIC_CPP_BINDINGS_LIB_VALUE_TRAITS_H_ -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/template_util.h" +#include "mojo/public/cpp/bindings/lib/template_util.h" namespace mojo { @@ -105,4 +105,4 @@ struct ValueTraits> { } // namespace internal } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_LIB_VALUE_TRAITS_H_ +#endif // MOJO_PUBLIC_CPP_BINDINGS_LIB_VALUE_TRAITS_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/map.h b/mojo/public/cpp/bindings/map.h similarity index 96% rename from third_party/mojo/src/mojo/public/cpp/bindings/map.h rename to mojo/public/cpp/bindings/map.h index c5a77f884f6334..0f08d838bb85e2 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/map.h +++ b/mojo/public/cpp/bindings/map.h @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_MAP_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_MAP_H_ +#ifndef MOJO_PUBLIC_CPP_BINDINGS_MAP_H_ +#define MOJO_PUBLIC_CPP_BINDINGS_MAP_H_ #include -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/map_internal.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/value_traits.h" +#include "mojo/public/cpp/bindings/lib/map_internal.h" +#include "mojo/public/cpp/bindings/lib/value_traits.h" namespace mojo { @@ -293,4 +293,4 @@ struct TypeConverter, Map> { } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_MAP_H_ +#endif // MOJO_PUBLIC_CPP_BINDINGS_MAP_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/message.h b/mojo/public/cpp/bindings/message.h similarity index 94% rename from third_party/mojo/src/mojo/public/cpp/bindings/message.h rename to mojo/public/cpp/bindings/message.h index 979a7b95b33cb0..7e3460643231a7 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/message.h +++ b/mojo/public/cpp/bindings/message.h @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_MESSAGE_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_MESSAGE_H_ +#ifndef MOJO_PUBLIC_CPP_BINDINGS_MESSAGE_H_ +#define MOJO_PUBLIC_CPP_BINDINGS_MESSAGE_H_ #include -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/message_internal.h" -#include "third_party/mojo/src/mojo/public/cpp/environment/logging.h" +#include "mojo/public/cpp/bindings/lib/message_internal.h" +#include "mojo/public/cpp/environment/logging.h" namespace mojo { @@ -156,4 +156,4 @@ MojoResult ReadAndDispatchMessage(MessagePipeHandle handle, } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_MESSAGE_H_ +#endif // MOJO_PUBLIC_CPP_BINDINGS_MESSAGE_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/message_filter.h b/mojo/public/cpp/bindings/message_filter.h similarity index 74% rename from third_party/mojo/src/mojo/public/cpp/bindings/message_filter.h rename to mojo/public/cpp/bindings/message_filter.h index ac46e3e50d6013..8e10f6b0b7de70 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/message_filter.h +++ b/mojo/public/cpp/bindings/message_filter.h @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_MESSAGE_FILTER_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_MESSAGE_FILTER_H_ +#ifndef MOJO_PUBLIC_CPP_BINDINGS_MESSAGE_FILTER_H_ +#define MOJO_PUBLIC_CPP_BINDINGS_MESSAGE_FILTER_H_ -#include "third_party/mojo/src/mojo/public/cpp/bindings/message.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/cpp/bindings/message.h" +#include "mojo/public/cpp/system/macros.h" namespace mojo { @@ -36,4 +36,4 @@ class PassThroughFilter : public MessageFilter { } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_MESSAGE_FILTER_H_ +#endif // MOJO_PUBLIC_CPP_BINDINGS_MESSAGE_FILTER_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/no_interface.h b/mojo/public/cpp/bindings/no_interface.h similarity index 74% rename from third_party/mojo/src/mojo/public/cpp/bindings/no_interface.h rename to mojo/public/cpp/bindings/no_interface.h index aac74713d47283..d8915cdf021933 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/no_interface.h +++ b/mojo/public/cpp/bindings/no_interface.h @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_NO_INTERFACE_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_NO_INTERFACE_H_ +#ifndef MOJO_PUBLIC_CPP_BINDINGS_NO_INTERFACE_H_ +#define MOJO_PUBLIC_CPP_BINDINGS_NO_INTERFACE_H_ -#include "third_party/mojo/src/mojo/public/cpp/bindings/message.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/message_filter.h" -#include "third_party/mojo/src/mojo/public/cpp/system/core.h" +#include "mojo/public/cpp/bindings/message.h" +#include "mojo/public/cpp/bindings/message_filter.h" +#include "mojo/public/cpp/system/core.h" namespace mojo { @@ -49,4 +49,4 @@ typedef NoInterface AnyInterface; } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_NO_INTERFACE_H_ +#endif // MOJO_PUBLIC_CPP_BINDINGS_NO_INTERFACE_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/string.h b/mojo/public/cpp/bindings/string.h similarity index 90% rename from third_party/mojo/src/mojo/public/cpp/bindings/string.h rename to mojo/public/cpp/bindings/string.h index cb9343d62cb1c0..e0ed4ba1d71fc1 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/string.h +++ b/mojo/public/cpp/bindings/string.h @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_STRING_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_STRING_H_ +#ifndef MOJO_PUBLIC_CPP_BINDINGS_STRING_H_ +#define MOJO_PUBLIC_CPP_BINDINGS_STRING_H_ #include -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/array_internal.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/type_converter.h" -#include "third_party/mojo/src/mojo/public/cpp/environment/logging.h" +#include "mojo/public/cpp/bindings/lib/array_internal.h" +#include "mojo/public/cpp/bindings/type_converter.h" +#include "mojo/public/cpp/environment/logging.h" namespace mojo { @@ -172,4 +172,4 @@ struct TypeConverter { } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_STRING_H_ +#endif // MOJO_PUBLIC_CPP_BINDINGS_STRING_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h b/mojo/public/cpp/bindings/strong_binding.h similarity index 79% rename from third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h rename to mojo/public/cpp/bindings/strong_binding.h index 8089fddf53a374..860260ed7d7bea 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h +++ b/mojo/public/cpp/bindings/strong_binding.h @@ -2,20 +2,20 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_STRONG_BINDING_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_STRONG_BINDING_H_ +#ifndef MOJO_PUBLIC_CPP_BINDINGS_STRONG_BINDING_H_ +#define MOJO_PUBLIC_CPP_BINDINGS_STRONG_BINDING_H_ #include -#include "third_party/mojo/src/mojo/public/c/environment/async_waiter.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/callback.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/bindings/lib/filter_chain.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/message_header_validator.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/router.h" -#include "third_party/mojo/src/mojo/public/cpp/system/core.h" +#include "mojo/public/c/environment/async_waiter.h" +#include "mojo/public/cpp/bindings/binding.h" +#include "mojo/public/cpp/bindings/callback.h" +#include "mojo/public/cpp/bindings/interface_ptr.h" +#include "mojo/public/cpp/bindings/interface_request.h" +#include "mojo/public/cpp/bindings/lib/filter_chain.h" +#include "mojo/public/cpp/bindings/lib/message_header_validator.h" +#include "mojo/public/cpp/bindings/lib/router.h" +#include "mojo/public/cpp/system/core.h" namespace mojo { @@ -124,4 +124,4 @@ class StrongBinding { } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_STRONG_BINDING_H_ +#endif // MOJO_PUBLIC_CPP_BINDINGS_STRONG_BINDING_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/struct_ptr.h b/mojo/public/cpp/bindings/struct_ptr.h similarity index 91% rename from third_party/mojo/src/mojo/public/cpp/bindings/struct_ptr.h rename to mojo/public/cpp/bindings/struct_ptr.h index f1199e669d0721..b324e93a523eb4 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/struct_ptr.h +++ b/mojo/public/cpp/bindings/struct_ptr.h @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_STRUCT_PTR_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_STRUCT_PTR_H_ +#ifndef MOJO_PUBLIC_CPP_BINDINGS_STRUCT_PTR_H_ +#define MOJO_PUBLIC_CPP_BINDINGS_STRUCT_PTR_H_ #include -#include "third_party/mojo/src/mojo/public/cpp/bindings/type_converter.h" -#include "third_party/mojo/src/mojo/public/cpp/environment/logging.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/cpp/bindings/type_converter.h" +#include "mojo/public/cpp/environment/logging.h" +#include "mojo/public/cpp/system/macros.h" namespace mojo { namespace internal { @@ -203,4 +203,4 @@ class InlinedStructPtr { } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_STRUCT_PTR_H_ +#endif // MOJO_PUBLIC_CPP_BINDINGS_STRUCT_PTR_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/tests/BUILD.gn b/mojo/public/cpp/bindings/tests/BUILD.gn similarity index 63% rename from third_party/mojo/src/mojo/public/cpp/bindings/tests/BUILD.gn rename to mojo/public/cpp/bindings/tests/BUILD.gn index 4b55bb03d2ebc9..1bc018cbf22073 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/tests/BUILD.gn +++ b/mojo/public/cpp/bindings/tests/BUILD.gn @@ -4,7 +4,6 @@ import("../../../mojo_application.gni") import("../../../mojo_sdk.gni") -import("//mojo/public/mojo.gni") mojo_sdk_source_set("tests") { testonly = true @@ -85,57 +84,3 @@ mojo_sdk_source_set("mojo_public_bindings_test_utils") { mojo_sdk_deps = [ "mojo/public/c/system" ] } - -if (mojo_use_application_in_sdk) { - mojo_native_application("versioning_test_service") { - testonly = true - - deps = [ - ":versioning_test_service_source_set", - ] - } - - mojo_sdk_source_set("versioning_test_service_source_set") { - testonly = true - visibility = [ ":*" ] - - sources = [ - "versioning_test_service.cc", - ] - - mojo_sdk_deps = [ - "mojo/public/cpp/application:standalone", - "mojo/public/cpp/bindings", - "mojo/public/cpp/system", - "mojo/public/interfaces/bindings/tests:versioning_test_service_interfaces", - ] - } - - mojo_native_application("versioning_apptests") { - testonly = true - - deps = [ - ":versioning_apptest_source_set", - ] - data_deps = [ - ":versioning_test_service", - ] - } - - mojo_sdk_source_set("versioning_apptest_source_set") { - testonly = true - visibility = [ ":*" ] - - sources = [ - "versioning_apptest.cc", - ] - - mojo_sdk_deps = [ - "mojo/public/cpp/application:standalone", - "mojo/public/cpp/application:test_support_standalone", - "mojo/public/cpp/bindings", - "mojo/public/cpp/system", - "mojo/public/interfaces/bindings/tests:versioning_test_client_interfaces", - ] - } -} diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/tests/array_unittest.cc b/mojo/public/cpp/bindings/tests/array_unittest.cc similarity index 96% rename from third_party/mojo/src/mojo/public/cpp/bindings/tests/array_unittest.cc rename to mojo/public/cpp/bindings/tests/array_unittest.cc index bccd49e3478bdf..8befe81d0fea6c 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/tests/array_unittest.cc +++ b/mojo/public/cpp/bindings/tests/array_unittest.cc @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "mojo/public/cpp/bindings/array.h" +#include "mojo/public/cpp/bindings/lib/array_internal.h" +#include "mojo/public/cpp/bindings/lib/array_serialization.h" +#include "mojo/public/cpp/bindings/lib/fixed_buffer.h" +#include "mojo/public/cpp/bindings/tests/container_test_util.h" +#include "mojo/public/interfaces/bindings/tests/test_structs.mojom.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/array.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/array_internal.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/array_serialization.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/fixed_buffer.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/tests/container_test_util.h" -#include "third_party/mojo/src/mojo/public/interfaces/bindings/tests/test_structs.mojom.h" namespace mojo { namespace test { diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/tests/binding_callback_unittest.cc b/mojo/public/cpp/bindings/tests/binding_callback_unittest.cc similarity index 95% rename from third_party/mojo/src/mojo/public/cpp/bindings/tests/binding_callback_unittest.cc rename to mojo/public/cpp/bindings/tests/binding_callback_unittest.cc index 79b5f1c64a6118..83d74f9a42a1c4 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/tests/binding_callback_unittest.cc +++ b/mojo/public/cpp/bindings/tests/binding_callback_unittest.cc @@ -5,13 +5,13 @@ #include "base/message_loop/message_loop.h" #include "build/build_config.h" #include "mojo/message_pump/message_pump_mojo.h" +#include "mojo/public/cpp/bindings/binding.h" +#include "mojo/public/cpp/bindings/interface_ptr.h" +#include "mojo/public/cpp/bindings/string.h" +#include "mojo/public/cpp/system/message_pipe.h" +#include "mojo/public/cpp/test_support/test_support.h" +#include "mojo/public/interfaces/bindings/tests/sample_interfaces.mojom.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_ptr.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/string.h" -#include "third_party/mojo/src/mojo/public/cpp/system/message_pipe.h" -#include "third_party/mojo/src/mojo/public/cpp/test_support/test_support.h" -#include "third_party/mojo/src/mojo/public/interfaces/bindings/tests/sample_interfaces.mojom.h" /////////////////////////////////////////////////////////////////////////////// // diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/tests/binding_unittest.cc b/mojo/public/cpp/bindings/tests/binding_unittest.cc similarity index 96% rename from third_party/mojo/src/mojo/public/cpp/bindings/tests/binding_unittest.cc rename to mojo/public/cpp/bindings/tests/binding_unittest.cc index b6b73d4fcd9a3e..1462b339926e79 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/tests/binding_unittest.cc +++ b/mojo/public/cpp/bindings/tests/binding_unittest.cc @@ -7,12 +7,12 @@ #include "base/message_loop/message_loop.h" #include "mojo/message_pump/message_pump_mojo.h" +#include "mojo/public/cpp/bindings/binding.h" +#include "mojo/public/cpp/bindings/strong_binding.h" +#include "mojo/public/cpp/system/macros.h" +#include "mojo/public/interfaces/bindings/tests/sample_interfaces.mojom.h" +#include "mojo/public/interfaces/bindings/tests/sample_service.mojom.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" -#include "third_party/mojo/src/mojo/public/interfaces/bindings/tests/sample_interfaces.mojom.h" -#include "third_party/mojo/src/mojo/public/interfaces/bindings/tests/sample_service.mojom.h" namespace mojo { namespace { diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/tests/bindings_perftest.cc b/mojo/public/cpp/bindings/tests/bindings_perftest.cc similarity index 88% rename from third_party/mojo/src/mojo/public/cpp/bindings/tests/bindings_perftest.cc rename to mojo/public/cpp/bindings/tests/bindings_perftest.cc index 5eb7984622086e..7440acce1e0367 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/tests/bindings_perftest.cc +++ b/mojo/public/cpp/bindings/tests/bindings_perftest.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "mojo/public/cpp/bindings/binding.h" +#include "mojo/public/cpp/test_support/test_support.h" +#include "mojo/public/cpp/test_support/test_utils.h" +#include "mojo/public/cpp/utility/run_loop.h" +#include "mojo/public/interfaces/bindings/tests/ping_service.mojom.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" -#include "third_party/mojo/src/mojo/public/cpp/test_support/test_support.h" -#include "third_party/mojo/src/mojo/public/cpp/test_support/test_utils.h" -#include "third_party/mojo/src/mojo/public/cpp/utility/run_loop.h" -#include "third_party/mojo/src/mojo/public/interfaces/bindings/tests/ping_service.mojom.h" namespace mojo { namespace { diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/tests/bounds_checker_unittest.cc b/mojo/public/cpp/bindings/tests/bounds_checker_unittest.cc similarity index 96% rename from third_party/mojo/src/mojo/public/cpp/bindings/tests/bounds_checker_unittest.cc rename to mojo/public/cpp/bindings/tests/bounds_checker_unittest.cc index 000d39cefee30b..c1ec7b3fcc41b2 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/tests/bounds_checker_unittest.cc +++ b/mojo/public/cpp/bindings/tests/bounds_checker_unittest.cc @@ -4,10 +4,10 @@ #include +#include "mojo/public/cpp/bindings/lib/bindings_serialization.h" +#include "mojo/public/cpp/bindings/lib/bounds_checker.h" +#include "mojo/public/cpp/system/core.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/bindings_serialization.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/bounds_checker.h" -#include "third_party/mojo/src/mojo/public/cpp/system/core.h" namespace mojo { namespace test { diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/tests/buffer_unittest.cc b/mojo/public/cpp/bindings/tests/buffer_unittest.cc similarity index 93% rename from third_party/mojo/src/mojo/public/cpp/bindings/tests/buffer_unittest.cc rename to mojo/public/cpp/bindings/tests/buffer_unittest.cc index 9858e5d00a414a..317a2a516025a2 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/tests/buffer_unittest.cc +++ b/mojo/public/cpp/bindings/tests/buffer_unittest.cc @@ -4,9 +4,9 @@ #include +#include "mojo/public/cpp/bindings/lib/bindings_serialization.h" +#include "mojo/public/cpp/bindings/lib/fixed_buffer.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/bindings_serialization.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/fixed_buffer.h" namespace mojo { namespace test { diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/tests/callback_unittest.cc b/mojo/public/cpp/bindings/tests/callback_unittest.cc similarity index 96% rename from third_party/mojo/src/mojo/public/cpp/bindings/tests/callback_unittest.cc rename to mojo/public/cpp/bindings/tests/callback_unittest.cc index a2ad1064c90a2e..158b21e512c9e9 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/tests/callback_unittest.cc +++ b/mojo/public/cpp/bindings/tests/callback_unittest.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "mojo/public/cpp/bindings/callback.h" +#include "mojo/public/cpp/bindings/map.h" +#include "mojo/public/cpp/bindings/string.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/callback.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/map.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/string.h" namespace mojo { namespace test { diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/tests/connector_unittest.cc b/mojo/public/cpp/bindings/tests/connector_unittest.cc similarity index 97% rename from third_party/mojo/src/mojo/public/cpp/bindings/tests/connector_unittest.cc rename to mojo/public/cpp/bindings/tests/connector_unittest.cc index 158c8c8e5ed9fb..febc72e90ef30a 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/tests/connector_unittest.cc +++ b/mojo/public/cpp/bindings/tests/connector_unittest.cc @@ -7,11 +7,11 @@ #include "base/message_loop/message_loop.h" #include "mojo/message_pump/message_pump_mojo.h" +#include "mojo/public/cpp/bindings/lib/connector.h" +#include "mojo/public/cpp/bindings/lib/message_builder.h" +#include "mojo/public/cpp/bindings/tests/message_queue.h" +#include "mojo/public/cpp/system/macros.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/connector.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/message_builder.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/tests/message_queue.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace test { diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/tests/constant_unittest.cc b/mojo/public/cpp/bindings/tests/constant_unittest.cc similarity index 93% rename from third_party/mojo/src/mojo/public/cpp/bindings/tests/constant_unittest.cc rename to mojo/public/cpp/bindings/tests/constant_unittest.cc index ec6ccfcc9d1411..f6394f3a644dc9 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/tests/constant_unittest.cc +++ b/mojo/public/cpp/bindings/tests/constant_unittest.cc @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "mojo/public/interfaces/bindings/tests/test_constants.mojom.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/interfaces/bindings/tests/test_constants.mojom.h" namespace mojo { namespace test { diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/tests/container_test_util.cc b/mojo/public/cpp/bindings/tests/container_test_util.cc similarity index 92% rename from third_party/mojo/src/mojo/public/cpp/bindings/tests/container_test_util.cc rename to mojo/public/cpp/bindings/tests/container_test_util.cc index 7bbe1d7274325b..e8377c4ce510be 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/tests/container_test_util.cc +++ b/mojo/public/cpp/bindings/tests/container_test_util.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 "third_party/mojo/src/mojo/public/cpp/bindings/tests/container_test_util.h" +#include "mojo/public/cpp/bindings/tests/container_test_util.h" namespace mojo { diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/tests/container_test_util.h b/mojo/public/cpp/bindings/tests/container_test_util.h similarity index 78% rename from third_party/mojo/src/mojo/public/cpp/bindings/tests/container_test_util.h rename to mojo/public/cpp/bindings/tests/container_test_util.h index 5155cb9606998b..1e29d225cd70ad 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/tests/container_test_util.h +++ b/mojo/public/cpp/bindings/tests/container_test_util.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_TESTS_CONTAINER_TEST_UTIL_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_TESTS_CONTAINER_TEST_UTIL_H_ +#ifndef MOJO_PUBLIC_CPP_BINDINGS_TESTS_CONTAINER_TEST_UTIL_H_ +#define MOJO_PUBLIC_CPP_BINDINGS_TESTS_CONTAINER_TEST_UTIL_H_ -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/cpp/system/macros.h" namespace mojo { @@ -49,4 +49,4 @@ class MoveOnlyType { } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_TESTS_CONTAINER_TEST_UTIL_H_ +#endif // MOJO_PUBLIC_CPP_BINDINGS_TESTS_CONTAINER_TEST_UTIL_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/tests/equals_unittest.cc b/mojo/public/cpp/bindings/tests/equals_unittest.cc similarity index 95% rename from third_party/mojo/src/mojo/public/cpp/bindings/tests/equals_unittest.cc rename to mojo/public/cpp/bindings/tests/equals_unittest.cc index 7b2449357066ca..5306f1f6cc4ab9 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/tests/equals_unittest.cc +++ b/mojo/public/cpp/bindings/tests/equals_unittest.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "mojo/public/cpp/bindings/lib/value_traits.h" +#include "mojo/public/interfaces/bindings/tests/test_structs.mojom.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/value_traits.h" -#include "third_party/mojo/src/mojo/public/interfaces/bindings/tests/test_structs.mojom.h" namespace mojo { namespace test { diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/tests/handle_passing_unittest.cc b/mojo/public/cpp/bindings/tests/handle_passing_unittest.cc similarity index 97% rename from third_party/mojo/src/mojo/public/cpp/bindings/tests/handle_passing_unittest.cc rename to mojo/public/cpp/bindings/tests/handle_passing_unittest.cc index b7e78b4a864068..8487d0a94fd1a8 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/tests/handle_passing_unittest.cc +++ b/mojo/public/cpp/bindings/tests/handle_passing_unittest.cc @@ -4,11 +4,11 @@ #include "base/message_loop/message_loop.h" #include "mojo/message_pump/message_pump_mojo.h" +#include "mojo/public/cpp/bindings/binding.h" +#include "mojo/public/cpp/bindings/strong_binding.h" +#include "mojo/public/cpp/test_support/test_utils.h" +#include "mojo/public/interfaces/bindings/tests/sample_factory.mojom.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" -#include "third_party/mojo/src/mojo/public/cpp/test_support/test_utils.h" -#include "third_party/mojo/src/mojo/public/interfaces/bindings/tests/sample_factory.mojom.h" namespace mojo { namespace test { diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/tests/interface_ptr_unittest.cc b/mojo/public/cpp/bindings/tests/interface_ptr_unittest.cc similarity index 97% rename from third_party/mojo/src/mojo/public/cpp/bindings/tests/interface_ptr_unittest.cc rename to mojo/public/cpp/bindings/tests/interface_ptr_unittest.cc index 1cabeb9314306b..508787a50d2f02 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/tests/interface_ptr_unittest.cc +++ b/mojo/public/cpp/bindings/tests/interface_ptr_unittest.cc @@ -4,13 +4,13 @@ #include "base/message_loop/message_loop.h" #include "mojo/message_pump/message_pump_mojo.h" +#include "mojo/public/cpp/bindings/binding.h" +#include "mojo/public/cpp/bindings/strong_binding.h" +#include "mojo/public/interfaces/bindings/tests/math_calculator.mojom.h" +#include "mojo/public/interfaces/bindings/tests/sample_interfaces.mojom.h" +#include "mojo/public/interfaces/bindings/tests/sample_service.mojom.h" +#include "mojo/public/interfaces/bindings/tests/scoping.mojom.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" -#include "third_party/mojo/src/mojo/public/interfaces/bindings/tests/math_calculator.mojom.h" -#include "third_party/mojo/src/mojo/public/interfaces/bindings/tests/sample_interfaces.mojom.h" -#include "third_party/mojo/src/mojo/public/interfaces/bindings/tests/sample_service.mojom.h" -#include "third_party/mojo/src/mojo/public/interfaces/bindings/tests/scoping.mojom.h" namespace mojo { namespace test { diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/tests/map_unittest.cc b/mojo/public/cpp/bindings/tests/map_unittest.cc similarity index 94% rename from third_party/mojo/src/mojo/public/cpp/bindings/tests/map_unittest.cc rename to mojo/public/cpp/bindings/tests/map_unittest.cc index 078eebdcb226ef..5b049a87a02fdd 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/tests/map_unittest.cc +++ b/mojo/public/cpp/bindings/tests/map_unittest.cc @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "mojo/public/cpp/bindings/array.h" +#include "mojo/public/cpp/bindings/lib/array_serialization.h" +#include "mojo/public/cpp/bindings/lib/bindings_internal.h" +#include "mojo/public/cpp/bindings/lib/fixed_buffer.h" +#include "mojo/public/cpp/bindings/lib/validate_params.h" +#include "mojo/public/cpp/bindings/map.h" +#include "mojo/public/cpp/bindings/string.h" +#include "mojo/public/cpp/bindings/tests/container_test_util.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/array.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/array_serialization.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/bindings_internal.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/fixed_buffer.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/validate_params.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/map.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/string.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/tests/container_test_util.h" namespace mojo { namespace test { diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/tests/message_queue.cc b/mojo/public/cpp/bindings/tests/message_queue.cc similarity index 77% rename from third_party/mojo/src/mojo/public/cpp/bindings/tests/message_queue.cc rename to mojo/public/cpp/bindings/tests/message_queue.cc index b1ef19cb4de53d..71cb49055be36e 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/tests/message_queue.cc +++ b/mojo/public/cpp/bindings/tests/message_queue.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "third_party/mojo/src/mojo/public/cpp/bindings/tests/message_queue.h" +#include "mojo/public/cpp/bindings/tests/message_queue.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/message.h" -#include "third_party/mojo/src/mojo/public/cpp/environment/logging.h" +#include "mojo/public/cpp/bindings/message.h" +#include "mojo/public/cpp/environment/logging.h" namespace mojo { namespace test { diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/tests/message_queue.h b/mojo/public/cpp/bindings/tests/message_queue.h similarity index 72% rename from third_party/mojo/src/mojo/public/cpp/bindings/tests/message_queue.h rename to mojo/public/cpp/bindings/tests/message_queue.h index 4070bafddd8b16..c3091db4d7b664 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/tests/message_queue.h +++ b/mojo/public/cpp/bindings/tests/message_queue.h @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_TESTS_MESSAGE_QUEUE_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_TESTS_MESSAGE_QUEUE_H_ +#ifndef MOJO_PUBLIC_CPP_BINDINGS_TESTS_MESSAGE_QUEUE_H_ +#define MOJO_PUBLIC_CPP_BINDINGS_TESTS_MESSAGE_QUEUE_H_ #include -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/cpp/system/macros.h" namespace mojo { class Message; @@ -40,4 +40,4 @@ class MessageQueue { } // namespace test } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_TESTS_MESSAGE_QUEUE_H_ +#endif // MOJO_PUBLIC_CPP_BINDINGS_TESTS_MESSAGE_QUEUE_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/tests/request_response_unittest.cc b/mojo/public/cpp/bindings/tests/request_response_unittest.cc similarity index 91% rename from third_party/mojo/src/mojo/public/cpp/bindings/tests/request_response_unittest.cc rename to mojo/public/cpp/bindings/tests/request_response_unittest.cc index f9130e8c688ca4..1e85d4a383dbaf 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/tests/request_response_unittest.cc +++ b/mojo/public/cpp/bindings/tests/request_response_unittest.cc @@ -4,11 +4,11 @@ #include "base/message_loop/message_loop.h" #include "mojo/message_pump/message_pump_mojo.h" +#include "mojo/public/cpp/bindings/binding.h" +#include "mojo/public/cpp/test_support/test_utils.h" +#include "mojo/public/interfaces/bindings/tests/sample_import.mojom.h" +#include "mojo/public/interfaces/bindings/tests/sample_interfaces.mojom.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" -#include "third_party/mojo/src/mojo/public/cpp/test_support/test_utils.h" -#include "third_party/mojo/src/mojo/public/interfaces/bindings/tests/sample_import.mojom.h" -#include "third_party/mojo/src/mojo/public/interfaces/bindings/tests/sample_interfaces.mojom.h" namespace mojo { namespace test { diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/tests/router_unittest.cc b/mojo/public/cpp/bindings/tests/router_unittest.cc similarity index 97% rename from third_party/mojo/src/mojo/public/cpp/bindings/tests/router_unittest.cc rename to mojo/public/cpp/bindings/tests/router_unittest.cc index df659c27e2d6c6..c9c9f01813af76 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/tests/router_unittest.cc +++ b/mojo/public/cpp/bindings/tests/router_unittest.cc @@ -7,11 +7,11 @@ #include "base/message_loop/message_loop.h" #include "mojo/message_pump/message_pump_mojo.h" +#include "mojo/public/cpp/bindings/lib/message_builder.h" +#include "mojo/public/cpp/bindings/lib/router.h" +#include "mojo/public/cpp/bindings/tests/message_queue.h" +#include "mojo/public/cpp/system/macros.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/message_builder.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/router.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/tests/message_queue.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace test { diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/tests/sample_service_unittest.cc b/mojo/public/cpp/bindings/tests/sample_service_unittest.cc similarity index 99% rename from third_party/mojo/src/mojo/public/cpp/bindings/tests/sample_service_unittest.cc rename to mojo/public/cpp/bindings/tests/sample_service_unittest.cc index 041d4821ecac78..58878a7f0d33c7 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/tests/sample_service_unittest.cc +++ b/mojo/public/cpp/bindings/tests/sample_service_unittest.cc @@ -6,8 +6,8 @@ #include #include +#include "mojo/public/interfaces/bindings/tests/sample_service.mojom.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/interfaces/bindings/tests/sample_service.mojom.h" namespace mojo { diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/tests/serialization_warning_unittest.cc b/mojo/public/cpp/bindings/tests/serialization_warning_unittest.cc similarity index 92% rename from third_party/mojo/src/mojo/public/cpp/bindings/tests/serialization_warning_unittest.cc rename to mojo/public/cpp/bindings/tests/serialization_warning_unittest.cc index 5dc07694beb98a..15da0516f08c0b 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/tests/serialization_warning_unittest.cc +++ b/mojo/public/cpp/bindings/tests/serialization_warning_unittest.cc @@ -5,15 +5,15 @@ // Serialization warnings are only recorded in debug build. #ifndef NDEBUG +#include "mojo/public/cpp/bindings/array.h" +#include "mojo/public/cpp/bindings/lib/array_internal.h" +#include "mojo/public/cpp/bindings/lib/array_serialization.h" +#include "mojo/public/cpp/bindings/lib/fixed_buffer.h" +#include "mojo/public/cpp/bindings/lib/validation_errors.h" +#include "mojo/public/cpp/bindings/string.h" +#include "mojo/public/cpp/system/message_pipe.h" +#include "mojo/public/interfaces/bindings/tests/serialization_test_structs.mojom.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/array.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/array_internal.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/array_serialization.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/fixed_buffer.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/validation_errors.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/string.h" -#include "third_party/mojo/src/mojo/public/cpp/system/message_pipe.h" -#include "third_party/mojo/src/mojo/public/interfaces/bindings/tests/serialization_test_structs.mojom.h" namespace mojo { namespace test { diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/tests/string_unittest.cc b/mojo/public/cpp/bindings/tests/string_unittest.cc similarity index 96% rename from third_party/mojo/src/mojo/public/cpp/bindings/tests/string_unittest.cc rename to mojo/public/cpp/bindings/tests/string_unittest.cc index 3a5d2df8f796c3..f6bc424a4d88b9 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/tests/string_unittest.cc +++ b/mojo/public/cpp/bindings/tests/string_unittest.cc @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "mojo/public/cpp/bindings/string.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/string.h" namespace mojo { namespace test { diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/tests/struct_unittest.cc b/mojo/public/cpp/bindings/tests/struct_unittest.cc similarity index 98% rename from third_party/mojo/src/mojo/public/cpp/bindings/tests/struct_unittest.cc rename to mojo/public/cpp/bindings/tests/struct_unittest.cc index c7d9f4374b9403..24173e58e54a5f 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/tests/struct_unittest.cc +++ b/mojo/public/cpp/bindings/tests/struct_unittest.cc @@ -4,10 +4,10 @@ #include +#include "mojo/public/cpp/bindings/lib/fixed_buffer.h" +#include "mojo/public/cpp/system/message_pipe.h" +#include "mojo/public/interfaces/bindings/tests/test_structs.mojom.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/fixed_buffer.h" -#include "third_party/mojo/src/mojo/public/cpp/system/message_pipe.h" -#include "third_party/mojo/src/mojo/public/interfaces/bindings/tests/test_structs.mojom.h" namespace mojo { namespace test { diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/tests/type_conversion_unittest.cc b/mojo/public/cpp/bindings/tests/type_conversion_unittest.cc similarity index 98% rename from third_party/mojo/src/mojo/public/cpp/bindings/tests/type_conversion_unittest.cc rename to mojo/public/cpp/bindings/tests/type_conversion_unittest.cc index ef9ea71760a7a9..704110a5ea26ed 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/tests/type_conversion_unittest.cc +++ b/mojo/public/cpp/bindings/tests/type_conversion_unittest.cc @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "mojo/public/interfaces/bindings/tests/test_structs.mojom.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/interfaces/bindings/tests/test_structs.mojom.h" namespace mojo { namespace { diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/tests/union_unittest.cc b/mojo/public/cpp/bindings/tests/union_unittest.cc similarity index 97% rename from third_party/mojo/src/mojo/public/cpp/bindings/tests/union_unittest.cc rename to mojo/public/cpp/bindings/tests/union_unittest.cc index 46254d6e8fa4b9..e6fddb783c7ecd 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/tests/union_unittest.cc +++ b/mojo/public/cpp/bindings/tests/union_unittest.cc @@ -6,17 +6,17 @@ #include "base/message_loop/message_loop.h" #include "mojo/message_pump/message_pump_mojo.h" +#include "mojo/public/cpp/bindings/array.h" +#include "mojo/public/cpp/bindings/binding.h" +#include "mojo/public/cpp/bindings/lib/array_internal.h" +#include "mojo/public/cpp/bindings/lib/array_serialization.h" +#include "mojo/public/cpp/bindings/lib/bounds_checker.h" +#include "mojo/public/cpp/bindings/lib/fixed_buffer.h" +#include "mojo/public/cpp/bindings/string.h" +#include "mojo/public/cpp/test_support/test_utils.h" +#include "mojo/public/interfaces/bindings/tests/test_structs.mojom.h" +#include "mojo/public/interfaces/bindings/tests/test_unions.mojom.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/array.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/array_internal.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/array_serialization.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/bounds_checker.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/fixed_buffer.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/string.h" -#include "third_party/mojo/src/mojo/public/cpp/test_support/test_utils.h" -#include "third_party/mojo/src/mojo/public/interfaces/bindings/tests/test_structs.mojom.h" -#include "third_party/mojo/src/mojo/public/interfaces/bindings/tests/test_unions.mojom.h" namespace mojo { namespace test { diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/tests/validation_test_input_parser.cc b/mojo/public/cpp/bindings/tests/validation_test_input_parser.cc similarity index 98% rename from third_party/mojo/src/mojo/public/cpp/bindings/tests/validation_test_input_parser.cc rename to mojo/public/cpp/bindings/tests/validation_test_input_parser.cc index 7cf0a939f4b9de..9d2607d0ad4b07 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/tests/validation_test_input_parser.cc +++ b/mojo/public/cpp/bindings/tests/validation_test_input_parser.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 "third_party/mojo/src/mojo/public/cpp/bindings/tests/validation_test_input_parser.h" +#include "mojo/public/cpp/bindings/tests/validation_test_input_parser.h" #include #include @@ -13,7 +13,7 @@ #include #include -#include "third_party/mojo/src/mojo/public/c/system/macros.h" +#include "mojo/public/c/system/macros.h" namespace mojo { namespace test { diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/tests/validation_test_input_parser.h b/mojo/public/cpp/bindings/tests/validation_test_input_parser.h similarity index 93% rename from third_party/mojo/src/mojo/public/cpp/bindings/tests/validation_test_input_parser.h rename to mojo/public/cpp/bindings/tests/validation_test_input_parser.h index 33662fe3a90c9a..d5f8c81c52c260 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/tests/validation_test_input_parser.h +++ b/mojo/public/cpp/bindings/tests/validation_test_input_parser.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_TESTS_VALIDATION_TEST_INPUT_PARSER_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_TESTS_VALIDATION_TEST_INPUT_PARSER_H_ +#ifndef MOJO_PUBLIC_CPP_BINDINGS_TESTS_VALIDATION_TEST_INPUT_PARSER_H_ +#define MOJO_PUBLIC_CPP_BINDINGS_TESTS_VALIDATION_TEST_INPUT_PARSER_H_ #include @@ -117,4 +117,4 @@ bool ParseValidationTestInput(const std::string& input, } // namespace test } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_TESTS_VALIDATION_TEST_INPUT_PARSER_H_ +#endif // MOJO_PUBLIC_CPP_BINDINGS_TESTS_VALIDATION_TEST_INPUT_PARSER_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/tests/validation_unittest.cc b/mojo/public/cpp/bindings/tests/validation_unittest.cc similarity index 94% rename from third_party/mojo/src/mojo/public/cpp/bindings/tests/validation_unittest.cc rename to mojo/public/cpp/bindings/tests/validation_unittest.cc index 69213a57a71a1a..fc536c2af5022a 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/tests/validation_unittest.cc +++ b/mojo/public/cpp/bindings/tests/validation_unittest.cc @@ -10,20 +10,20 @@ #include "base/message_loop/message_loop.h" #include "mojo/message_pump/message_pump_mojo.h" +#include "mojo/public/c/system/macros.h" +#include "mojo/public/cpp/bindings/binding.h" +#include "mojo/public/cpp/bindings/interface_ptr.h" +#include "mojo/public/cpp/bindings/lib/connector.h" +#include "mojo/public/cpp/bindings/lib/filter_chain.h" +#include "mojo/public/cpp/bindings/lib/message_header_validator.h" +#include "mojo/public/cpp/bindings/lib/router.h" +#include "mojo/public/cpp/bindings/lib/validation_errors.h" +#include "mojo/public/cpp/bindings/message.h" +#include "mojo/public/cpp/bindings/tests/validation_test_input_parser.h" +#include "mojo/public/cpp/system/core.h" +#include "mojo/public/cpp/test_support/test_support.h" +#include "mojo/public/interfaces/bindings/tests/validation_test_interfaces.mojom.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/c/system/macros.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_ptr.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/connector.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/filter_chain.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/message_header_validator.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/router.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/validation_errors.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/message.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/tests/validation_test_input_parser.h" -#include "third_party/mojo/src/mojo/public/cpp/system/core.h" -#include "third_party/mojo/src/mojo/public/cpp/test_support/test_support.h" -#include "third_party/mojo/src/mojo/public/interfaces/bindings/tests/validation_test_interfaces.mojom.h" namespace mojo { namespace test { diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/tests/versioning_apptest.cc b/mojo/public/cpp/bindings/tests/versioning_apptest.cc similarity index 96% rename from third_party/mojo/src/mojo/public/cpp/bindings/tests/versioning_apptest.cc rename to mojo/public/cpp/bindings/tests/versioning_apptest.cc index 97cfd817210430..a1cb37f0e2250d 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/tests/versioning_apptest.cc +++ b/mojo/public/cpp/bindings/tests/versioning_apptest.cc @@ -4,8 +4,8 @@ #include "mojo/application/public/cpp/application_impl.h" #include "mojo/application/public/cpp/application_test_base.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" -#include "third_party/mojo/src/mojo/public/interfaces/bindings/tests/versioning_test_client.mojom.h" +#include "mojo/public/cpp/system/macros.h" +#include "mojo/public/interfaces/bindings/tests/versioning_test_client.mojom.h" namespace mojo { namespace test { diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/tests/versioning_test_service.cc b/mojo/public/cpp/bindings/tests/versioning_test_service.cc similarity index 92% rename from third_party/mojo/src/mojo/public/cpp/bindings/tests/versioning_test_service.cc rename to mojo/public/cpp/bindings/tests/versioning_test_service.cc index 48e1b4a735cd2b..cc52595e2a7aee 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/tests/versioning_test_service.cc +++ b/mojo/public/cpp/bindings/tests/versioning_test_service.cc @@ -8,10 +8,10 @@ #include "mojo/application/public/cpp/application_delegate.h" #include "mojo/application/public/cpp/application_runner.h" #include "mojo/application/public/cpp/interface_factory.h" -#include "third_party/mojo/src/mojo/public/c/system/main.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" -#include "third_party/mojo/src/mojo/public/interfaces/bindings/tests/versioning_test_service.mojom.h" +#include "mojo/public/c/system/main.h" +#include "mojo/public/cpp/bindings/strong_binding.h" +#include "mojo/public/cpp/system/macros.h" +#include "mojo/public/interfaces/bindings/tests/versioning_test_service.mojom.h" namespace mojo { namespace test { diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/type_converter.h b/mojo/public/cpp/bindings/type_converter.h similarity index 92% rename from third_party/mojo/src/mojo/public/cpp/bindings/type_converter.h rename to mojo/public/cpp/bindings/type_converter.h index 431a4da5770941..ff94cdadd3a463 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/type_converter.h +++ b/mojo/public/cpp/bindings/type_converter.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_TYPE_CONVERTER_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_TYPE_CONVERTER_H_ +#ifndef MOJO_PUBLIC_CPP_BINDINGS_TYPE_CONVERTER_H_ +#define MOJO_PUBLIC_CPP_BINDINGS_TYPE_CONVERTER_H_ namespace mojo { @@ -89,4 +89,4 @@ inline T ConvertTo(const U& obj) { } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_BINDINGS_TYPE_CONVERTER_H_ +#endif // MOJO_PUBLIC_CPP_BINDINGS_TYPE_CONVERTER_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/environment/BUILD.gn b/mojo/public/cpp/environment/BUILD.gn similarity index 100% rename from third_party/mojo/src/mojo/public/cpp/environment/BUILD.gn rename to mojo/public/cpp/environment/BUILD.gn diff --git a/third_party/mojo/src/mojo/public/cpp/environment/async_waiter.h b/mojo/public/cpp/environment/async_waiter.h similarity index 63% rename from third_party/mojo/src/mojo/public/cpp/environment/async_waiter.h rename to mojo/public/cpp/environment/async_waiter.h index d48bbcf4606fe3..83b7c8a7c5d7d8 100644 --- a/third_party/mojo/src/mojo/public/cpp/environment/async_waiter.h +++ b/mojo/public/cpp/environment/async_waiter.h @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_ENVIRONMENT_ASYNC_WAITER_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_ENVIRONMENT_ASYNC_WAITER_H_ +#ifndef MOJO_PUBLIC_CPP_ENVIRONMENT_ASYNC_WAITER_H_ +#define MOJO_PUBLIC_CPP_ENVIRONMENT_ASYNC_WAITER_H_ -#include "third_party/mojo/src/mojo/public/c/environment/async_waiter.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/callback.h" -#include "third_party/mojo/src/mojo/public/cpp/environment/environment.h" -#include "third_party/mojo/src/mojo/public/cpp/system/handle.h" +#include "mojo/public/c/environment/async_waiter.h" +#include "mojo/public/cpp/bindings/callback.h" +#include "mojo/public/cpp/environment/environment.h" +#include "mojo/public/cpp/system/handle.h" namespace mojo { @@ -37,4 +37,4 @@ class AsyncWaiter { } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_ENVIRONMENT_ASYNC_WAITER_H_ +#endif // MOJO_PUBLIC_CPP_ENVIRONMENT_ASYNC_WAITER_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/environment/environment.h b/mojo/public/cpp/environment/environment.h similarity index 85% rename from third_party/mojo/src/mojo/public/cpp/environment/environment.h rename to mojo/public/cpp/environment/environment.h index c6ecbf7a2c9981..3a544286de354a 100644 --- a/third_party/mojo/src/mojo/public/cpp/environment/environment.h +++ b/mojo/public/cpp/environment/environment.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_ENVIRONMENT_ENVIRONMENT_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_ENVIRONMENT_ENVIRONMENT_H_ +#ifndef MOJO_PUBLIC_CPP_ENVIRONMENT_ENVIRONMENT_H_ +#define MOJO_PUBLIC_CPP_ENVIRONMENT_ENVIRONMENT_H_ -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/cpp/system/macros.h" struct MojoAsyncWaiter; struct MojoLogger; @@ -50,4 +50,4 @@ class Environment { } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_ENVIRONMENT_ENVIRONMENT_H_ +#endif // MOJO_PUBLIC_CPP_ENVIRONMENT_ENVIRONMENT_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/environment/lib/async_waiter.cc b/mojo/public/cpp/environment/lib/async_waiter.cc similarity index 92% rename from third_party/mojo/src/mojo/public/cpp/environment/lib/async_waiter.cc rename to mojo/public/cpp/environment/lib/async_waiter.cc index f4acd048b29682..599a6493424c84 100644 --- a/third_party/mojo/src/mojo/public/cpp/environment/lib/async_waiter.cc +++ b/mojo/public/cpp/environment/lib/async_waiter.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 "third_party/mojo/src/mojo/public/cpp/environment/async_waiter.h" +#include "mojo/public/cpp/environment/async_waiter.h" namespace mojo { diff --git a/third_party/mojo/src/mojo/public/cpp/environment/lib/default_async_waiter.cc b/mojo/public/cpp/environment/lib/default_async_waiter.cc similarity index 88% rename from third_party/mojo/src/mojo/public/cpp/environment/lib/default_async_waiter.cc rename to mojo/public/cpp/environment/lib/default_async_waiter.cc index 3261c140ee633b..4a588a991f4b35 100644 --- a/third_party/mojo/src/mojo/public/cpp/environment/lib/default_async_waiter.cc +++ b/mojo/public/cpp/environment/lib/default_async_waiter.cc @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "third_party/mojo/src/mojo/public/cpp/environment/lib/default_async_waiter.h" +#include "mojo/public/cpp/environment/lib/default_async_waiter.h" #include -#include "third_party/mojo/src/mojo/public/c/environment/async_waiter.h" -#include "third_party/mojo/src/mojo/public/cpp/utility/run_loop.h" -#include "third_party/mojo/src/mojo/public/cpp/utility/run_loop_handler.h" +#include "mojo/public/c/environment/async_waiter.h" +#include "mojo/public/cpp/utility/run_loop.h" +#include "mojo/public/cpp/utility/run_loop_handler.h" namespace mojo { diff --git a/third_party/mojo/src/mojo/public/cpp/environment/lib/default_async_waiter.h b/mojo/public/cpp/environment/lib/default_async_waiter.h similarity index 56% rename from third_party/mojo/src/mojo/public/cpp/environment/lib/default_async_waiter.h rename to mojo/public/cpp/environment/lib/default_async_waiter.h index 936a0574ef2d87..49ce233490ca12 100644 --- a/third_party/mojo/src/mojo/public/cpp/environment/lib/default_async_waiter.h +++ b/mojo/public/cpp/environment/lib/default_async_waiter.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_ENVIRONMENT_LIB_DEFAULT_ASYNC_WAITER_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_ENVIRONMENT_LIB_DEFAULT_ASYNC_WAITER_H_ +#ifndef MOJO_PUBLIC_CPP_ENVIRONMENT_LIB_DEFAULT_ASYNC_WAITER_H_ +#define MOJO_PUBLIC_CPP_ENVIRONMENT_LIB_DEFAULT_ASYNC_WAITER_H_ struct MojoAsyncWaiter; @@ -15,4 +15,4 @@ extern const MojoAsyncWaiter kDefaultAsyncWaiter; } // namespace internal } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_ENVIRONMENT_LIB_DEFAULT_ASYNC_WAITER_H_ +#endif // MOJO_PUBLIC_CPP_ENVIRONMENT_LIB_DEFAULT_ASYNC_WAITER_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/environment/lib/default_logger.cc b/mojo/public/cpp/environment/lib/default_logger.cc similarity index 92% rename from third_party/mojo/src/mojo/public/cpp/environment/lib/default_logger.cc rename to mojo/public/cpp/environment/lib/default_logger.cc index 67a67c549c8f9b..ba787d13529b2f 100644 --- a/third_party/mojo/src/mojo/public/cpp/environment/lib/default_logger.cc +++ b/mojo/public/cpp/environment/lib/default_logger.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "third_party/mojo/src/mojo/public/cpp/environment/lib/default_logger.h" +#include "mojo/public/cpp/environment/lib/default_logger.h" #include #include // For |abort()|. #include -#include "third_party/mojo/src/mojo/public/c/environment/logger.h" +#include "mojo/public/c/environment/logger.h" namespace mojo { diff --git a/third_party/mojo/src/mojo/public/cpp/environment/lib/default_logger.h b/mojo/public/cpp/environment/lib/default_logger.h similarity index 56% rename from third_party/mojo/src/mojo/public/cpp/environment/lib/default_logger.h rename to mojo/public/cpp/environment/lib/default_logger.h index 70aa9f7bb253fa..4db32336811001 100644 --- a/third_party/mojo/src/mojo/public/cpp/environment/lib/default_logger.h +++ b/mojo/public/cpp/environment/lib/default_logger.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_ENVIRONMENT_LIB_DEFAULT_LOGGER_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_ENVIRONMENT_LIB_DEFAULT_LOGGER_H_ +#ifndef MOJO_PUBLIC_CPP_ENVIRONMENT_LIB_DEFAULT_LOGGER_H_ +#define MOJO_PUBLIC_CPP_ENVIRONMENT_LIB_DEFAULT_LOGGER_H_ struct MojoLogger; @@ -15,4 +15,4 @@ extern const MojoLogger kDefaultLogger; } // namespace internal } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_ENVIRONMENT_LIB_DEFAULT_LOGGER_H_ +#endif // MOJO_PUBLIC_CPP_ENVIRONMENT_LIB_DEFAULT_LOGGER_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/environment/lib/default_task_tracker.cc b/mojo/public/cpp/environment/lib/default_task_tracker.cc similarity index 83% rename from third_party/mojo/src/mojo/public/cpp/environment/lib/default_task_tracker.cc rename to mojo/public/cpp/environment/lib/default_task_tracker.cc index e63220bd534b93..a99f1c74e9332d 100644 --- a/third_party/mojo/src/mojo/public/cpp/environment/lib/default_task_tracker.cc +++ b/mojo/public/cpp/environment/lib/default_task_tracker.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "third_party/mojo/src/mojo/public/cpp/environment/lib/default_task_tracker.h" +#include "mojo/public/cpp/environment/lib/default_task_tracker.h" -#include "third_party/mojo/src/mojo/public/cpp/environment/task_tracker.h" +#include "mojo/public/cpp/environment/task_tracker.h" namespace mojo { diff --git a/third_party/mojo/src/mojo/public/cpp/environment/lib/default_task_tracker.h b/mojo/public/cpp/environment/lib/default_task_tracker.h similarity index 55% rename from third_party/mojo/src/mojo/public/cpp/environment/lib/default_task_tracker.h rename to mojo/public/cpp/environment/lib/default_task_tracker.h index 2e0123d102361f..7a0c06478c6fe0 100644 --- a/third_party/mojo/src/mojo/public/cpp/environment/lib/default_task_tracker.h +++ b/mojo/public/cpp/environment/lib/default_task_tracker.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_ENVIRONMENT_LIB_DEFAULT_TASK_TRACKER_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_ENVIRONMENT_LIB_DEFAULT_TASK_TRACKER_H_ +#ifndef MOJO_PUBLIC_CPP_ENVIRONMENT_LIB_DEFAULT_TASK_TRACKER_H_ +#define MOJO_PUBLIC_CPP_ENVIRONMENT_LIB_DEFAULT_TASK_TRACKER_H_ namespace mojo { @@ -16,4 +16,4 @@ extern const TaskTracker kDefaultTaskTracker; } // namespace internal } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_ENVIRONMENT_LIB_DEFAULT_TASK_TRACKER_H_ +#endif // MOJO_PUBLIC_CPP_ENVIRONMENT_LIB_DEFAULT_TASK_TRACKER_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/environment/lib/environment.cc b/mojo/public/cpp/environment/lib/environment.cc similarity index 84% rename from third_party/mojo/src/mojo/public/cpp/environment/lib/environment.cc rename to mojo/public/cpp/environment/lib/environment.cc index d80b3959175802..8c7c930671d825 100644 --- a/third_party/mojo/src/mojo/public/cpp/environment/lib/environment.cc +++ b/mojo/public/cpp/environment/lib/environment.cc @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "third_party/mojo/src/mojo/public/cpp/environment/environment.h" +#include "mojo/public/cpp/environment/environment.h" #include -#include "third_party/mojo/src/mojo/public/c/environment/logger.h" -#include "third_party/mojo/src/mojo/public/cpp/environment/lib/default_async_waiter.h" -#include "third_party/mojo/src/mojo/public/cpp/environment/lib/default_logger.h" -#include "third_party/mojo/src/mojo/public/cpp/environment/lib/default_task_tracker.h" -#include "third_party/mojo/src/mojo/public/cpp/utility/run_loop.h" +#include "mojo/public/c/environment/logger.h" +#include "mojo/public/cpp/environment/lib/default_async_waiter.h" +#include "mojo/public/cpp/environment/lib/default_logger.h" +#include "mojo/public/cpp/environment/lib/default_task_tracker.h" +#include "mojo/public/cpp/utility/run_loop.h" namespace mojo { diff --git a/third_party/mojo/src/mojo/public/cpp/environment/lib/logging.cc b/mojo/public/cpp/environment/lib/logging.cc similarity index 89% rename from third_party/mojo/src/mojo/public/cpp/environment/lib/logging.cc rename to mojo/public/cpp/environment/lib/logging.cc index 86b059465cb621..57f18924820ebe 100644 --- a/third_party/mojo/src/mojo/public/cpp/environment/lib/logging.cc +++ b/mojo/public/cpp/environment/lib/logging.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "third_party/mojo/src/mojo/public/cpp/environment/logging.h" +#include "mojo/public/cpp/environment/logging.h" -#include "third_party/mojo/src/mojo/public/cpp/environment/environment.h" +#include "mojo/public/cpp/environment/environment.h" namespace mojo { namespace internal { diff --git a/third_party/mojo/src/mojo/public/cpp/environment/lib/scoped_task_tracking.cc b/mojo/public/cpp/environment/lib/scoped_task_tracking.cc similarity index 88% rename from third_party/mojo/src/mojo/public/cpp/environment/lib/scoped_task_tracking.cc rename to mojo/public/cpp/environment/lib/scoped_task_tracking.cc index d132b09e2c4819..9e253d5bd80e4e 100644 --- a/third_party/mojo/src/mojo/public/cpp/environment/lib/scoped_task_tracking.cc +++ b/mojo/public/cpp/environment/lib/scoped_task_tracking.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "third_party/mojo/src/mojo/public/cpp/environment/lib/scoped_task_tracking.h" +#include "mojo/public/cpp/environment/lib/scoped_task_tracking.h" -#include "third_party/mojo/src/mojo/public/cpp/environment/environment.h" +#include "mojo/public/cpp/environment/environment.h" namespace mojo { namespace internal { diff --git a/third_party/mojo/src/mojo/public/cpp/environment/lib/scoped_task_tracking.h b/mojo/public/cpp/environment/lib/scoped_task_tracking.h similarity index 65% rename from third_party/mojo/src/mojo/public/cpp/environment/lib/scoped_task_tracking.h rename to mojo/public/cpp/environment/lib/scoped_task_tracking.h index 370e9672227170..b6e32c1760ad5c 100644 --- a/third_party/mojo/src/mojo/public/cpp/environment/lib/scoped_task_tracking.h +++ b/mojo/public/cpp/environment/lib/scoped_task_tracking.h @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_ENVIRONMENT_LIB_SCOPED_TASK_TRACKING_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_ENVIRONMENT_LIB_SCOPED_TASK_TRACKING_H_ +#ifndef MOJO_PUBLIC_CPP_ENVIRONMENT_LIB_SCOPED_TASK_TRACKING_H_ +#define MOJO_PUBLIC_CPP_ENVIRONMENT_LIB_SCOPED_TASK_TRACKING_H_ -#include "third_party/mojo/src/mojo/public/cpp/environment/task_tracker.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/cpp/environment/task_tracker.h" +#include "mojo/public/cpp/system/macros.h" namespace mojo { namespace internal { @@ -31,4 +31,4 @@ class ScopedTaskTracking { } // namespace internal } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_ENVIRONMENT_LIB_SCOPED_TASK_TRACKING_H_ +#endif // MOJO_PUBLIC_CPP_ENVIRONMENT_LIB_SCOPED_TASK_TRACKING_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/environment/logging.h b/mojo/public/cpp/environment/logging.h similarity index 87% rename from third_party/mojo/src/mojo/public/cpp/environment/logging.h rename to mojo/public/cpp/environment/logging.h index 97796f36d2aa87..bfc5c13f6c2e4b 100644 --- a/third_party/mojo/src/mojo/public/cpp/environment/logging.h +++ b/mojo/public/cpp/environment/logging.h @@ -9,14 +9,14 @@ // implementation (in environment/lib) is meant to be used by any implementation // of the environment. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_ENVIRONMENT_LOGGING_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_ENVIRONMENT_LOGGING_H_ +#ifndef MOJO_PUBLIC_CPP_ENVIRONMENT_LOGGING_H_ +#define MOJO_PUBLIC_CPP_ENVIRONMENT_LOGGING_H_ #include -#include "third_party/mojo/src/mojo/public/c/environment/logger.h" -#include "third_party/mojo/src/mojo/public/cpp/environment/environment.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/c/environment/logger.h" +#include "mojo/public/cpp/environment/environment.h" +#include "mojo/public/cpp/system/macros.h" #define MOJO_LOG_STREAM(level) \ ::mojo::internal::LogMessage(MOJO_LOG_LEVEL_##level, __FILE__, __LINE__) \ @@ -87,4 +87,4 @@ struct VoidifyOstream { } // namespace internal } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_ENVIRONMENT_LOGGING_H_ +#endif // MOJO_PUBLIC_CPP_ENVIRONMENT_LOGGING_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/environment/task_tracker.h b/mojo/public/cpp/environment/task_tracker.h similarity index 80% rename from third_party/mojo/src/mojo/public/cpp/environment/task_tracker.h rename to mojo/public/cpp/environment/task_tracker.h index 9d399b3cc5a599..d6d3020d975fff 100644 --- a/third_party/mojo/src/mojo/public/cpp/environment/task_tracker.h +++ b/mojo/public/cpp/environment/task_tracker.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_ENVIRONMENT_TASK_TRACKER_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_ENVIRONMENT_TASK_TRACKER_H_ +#ifndef MOJO_PUBLIC_CPP_ENVIRONMENT_TASK_TRACKER_H_ +#define MOJO_PUBLIC_CPP_ENVIRONMENT_TASK_TRACKER_H_ #include @@ -27,4 +27,4 @@ struct TaskTracker { } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_ENVIRONMENT_TASK_TRACKER_H_ +#endif // MOJO_PUBLIC_CPP_ENVIRONMENT_TASK_TRACKER_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/environment/tests/BUILD.gn b/mojo/public/cpp/environment/tests/BUILD.gn similarity index 100% rename from third_party/mojo/src/mojo/public/cpp/environment/tests/BUILD.gn rename to mojo/public/cpp/environment/tests/BUILD.gn diff --git a/third_party/mojo/src/mojo/public/cpp/environment/tests/async_wait_unittest.cc b/mojo/public/cpp/environment/tests/async_wait_unittest.cc similarity index 88% rename from third_party/mojo/src/mojo/public/cpp/environment/tests/async_wait_unittest.cc rename to mojo/public/cpp/environment/tests/async_wait_unittest.cc index 5230412f927edb..83c5ca05bc7456 100644 --- a/third_party/mojo/src/mojo/public/cpp/environment/tests/async_wait_unittest.cc +++ b/mojo/public/cpp/environment/tests/async_wait_unittest.cc @@ -4,13 +4,13 @@ #include +#include "mojo/public/c/environment/async_waiter.h" +#include "mojo/public/cpp/environment/environment.h" +#include "mojo/public/cpp/system/core.h" +#include "mojo/public/cpp/system/macros.h" +#include "mojo/public/cpp/test_support/test_utils.h" +#include "mojo/public/cpp/utility/run_loop.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/c/environment/async_waiter.h" -#include "third_party/mojo/src/mojo/public/cpp/environment/environment.h" -#include "third_party/mojo/src/mojo/public/cpp/system/core.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" -#include "third_party/mojo/src/mojo/public/cpp/test_support/test_utils.h" -#include "third_party/mojo/src/mojo/public/cpp/utility/run_loop.h" namespace mojo { namespace { diff --git a/third_party/mojo/src/mojo/public/cpp/environment/tests/async_waiter_unittest.cc b/mojo/public/cpp/environment/tests/async_waiter_unittest.cc similarity index 91% rename from third_party/mojo/src/mojo/public/cpp/environment/tests/async_waiter_unittest.cc rename to mojo/public/cpp/environment/tests/async_waiter_unittest.cc index 74356122617247..1c1c2bf9d049fe 100644 --- a/third_party/mojo/src/mojo/public/cpp/environment/tests/async_waiter_unittest.cc +++ b/mojo/public/cpp/environment/tests/async_waiter_unittest.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "mojo/public/cpp/bindings/callback.h" +#include "mojo/public/cpp/environment/async_waiter.h" +#include "mojo/public/cpp/test_support/test_utils.h" +#include "mojo/public/cpp/utility/run_loop.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/callback.h" -#include "third_party/mojo/src/mojo/public/cpp/environment/async_waiter.h" -#include "third_party/mojo/src/mojo/public/cpp/test_support/test_utils.h" -#include "third_party/mojo/src/mojo/public/cpp/utility/run_loop.h" namespace mojo { namespace { diff --git a/third_party/mojo/src/mojo/public/cpp/environment/tests/logger_unittest.cc b/mojo/public/cpp/environment/tests/logger_unittest.cc similarity index 95% rename from third_party/mojo/src/mojo/public/cpp/environment/tests/logger_unittest.cc rename to mojo/public/cpp/environment/tests/logger_unittest.cc index ca0371e239afbf..8ca5538571c81c 100644 --- a/third_party/mojo/src/mojo/public/cpp/environment/tests/logger_unittest.cc +++ b/mojo/public/cpp/environment/tests/logger_unittest.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "mojo/public/c/environment/logger.h" +#include "mojo/public/cpp/environment/environment.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/c/environment/logger.h" -#include "third_party/mojo/src/mojo/public/cpp/environment/environment.h" namespace mojo { namespace { diff --git a/third_party/mojo/src/mojo/public/cpp/environment/tests/logging_unittest.cc b/mojo/public/cpp/environment/tests/logging_unittest.cc similarity index 98% rename from third_party/mojo/src/mojo/public/cpp/environment/tests/logging_unittest.cc rename to mojo/public/cpp/environment/tests/logging_unittest.cc index b62f77b15cc243..489888c5a95799 100644 --- a/third_party/mojo/src/mojo/public/cpp/environment/tests/logging_unittest.cc +++ b/mojo/public/cpp/environment/tests/logging_unittest.cc @@ -7,10 +7,10 @@ #include #include +#include "mojo/public/cpp/environment/environment.h" +#include "mojo/public/cpp/environment/logging.h" +#include "mojo/public/cpp/system/macros.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/cpp/environment/environment.h" -#include "third_party/mojo/src/mojo/public/cpp/environment/logging.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace { diff --git a/third_party/mojo/src/mojo/public/cpp/system/BUILD.gn b/mojo/public/cpp/system/BUILD.gn similarity index 100% rename from third_party/mojo/src/mojo/public/cpp/system/BUILD.gn rename to mojo/public/cpp/system/BUILD.gn diff --git a/third_party/mojo/src/mojo/public/cpp/system/buffer.h b/mojo/public/cpp/system/buffer.h similarity index 89% rename from third_party/mojo/src/mojo/public/cpp/system/buffer.h rename to mojo/public/cpp/system/buffer.h index 2b5bb50324f07c..9458c0aec7bd80 100644 --- a/third_party/mojo/src/mojo/public/cpp/system/buffer.h +++ b/mojo/public/cpp/system/buffer.h @@ -6,17 +6,17 @@ // replacing the prefix of "Mojo" with a "mojo" namespace, and using more // strongly-typed representations of |MojoHandle|s. // -// Please see "third_party/mojo/src/mojo/public/c/system/buffer.h" for complete documentation of the +// Please see "mojo/public/c/system/buffer.h" for complete documentation of the // API. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_SYSTEM_BUFFER_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_SYSTEM_BUFFER_H_ +#ifndef MOJO_PUBLIC_CPP_SYSTEM_BUFFER_H_ +#define MOJO_PUBLIC_CPP_SYSTEM_BUFFER_H_ #include -#include "third_party/mojo/src/mojo/public/c/system/buffer.h" -#include "third_party/mojo/src/mojo/public/cpp/system/handle.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/c/system/buffer.h" +#include "mojo/public/cpp/system/handle.h" +#include "mojo/public/cpp/system/macros.h" namespace mojo { @@ -129,4 +129,4 @@ inline SharedBuffer::~SharedBuffer() { } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_SYSTEM_BUFFER_H_ +#endif // MOJO_PUBLIC_CPP_SYSTEM_BUFFER_H_ diff --git a/mojo/public/cpp/system/core.h b/mojo/public/cpp/system/core.h new file mode 100644 index 00000000000000..b08a5a6abe1d7f --- /dev/null +++ b/mojo/public/cpp/system/core.h @@ -0,0 +1,15 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef MOJO_PUBLIC_CPP_SYSTEM_CORE_H_ +#define MOJO_PUBLIC_CPP_SYSTEM_CORE_H_ + +#include "mojo/public/cpp/system/buffer.h" +#include "mojo/public/cpp/system/data_pipe.h" +#include "mojo/public/cpp/system/functions.h" +#include "mojo/public/cpp/system/handle.h" +#include "mojo/public/cpp/system/macros.h" +#include "mojo/public/cpp/system/message_pipe.h" + +#endif // MOJO_PUBLIC_CPP_SYSTEM_CORE_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/system/data_pipe.h b/mojo/public/cpp/system/data_pipe.h similarity index 92% rename from third_party/mojo/src/mojo/public/cpp/system/data_pipe.h rename to mojo/public/cpp/system/data_pipe.h index 3b2599f1693ac8..c451cffc75982c 100644 --- a/third_party/mojo/src/mojo/public/cpp/system/data_pipe.h +++ b/mojo/public/cpp/system/data_pipe.h @@ -6,17 +6,17 @@ // replacing the prefix of "Mojo" with a "mojo" namespace, and using more // strongly-typed representations of |MojoHandle|s. // -// Please see "third_party/mojo/src/mojo/public/c/system/data_pipe.h" for complete documentation of +// Please see "mojo/public/c/system/data_pipe.h" for complete documentation of // the API. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_SYSTEM_DATA_PIPE_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_SYSTEM_DATA_PIPE_H_ +#ifndef MOJO_PUBLIC_CPP_SYSTEM_DATA_PIPE_H_ +#define MOJO_PUBLIC_CPP_SYSTEM_DATA_PIPE_H_ #include -#include "third_party/mojo/src/mojo/public/c/system/data_pipe.h" -#include "third_party/mojo/src/mojo/public/cpp/system/handle.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/c/system/data_pipe.h" +#include "mojo/public/cpp/system/handle.h" +#include "mojo/public/cpp/system/macros.h" namespace mojo { @@ -159,4 +159,4 @@ inline DataPipe::~DataPipe() { } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_SYSTEM_DATA_PIPE_H_ +#endif // MOJO_PUBLIC_CPP_SYSTEM_DATA_PIPE_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/system/functions.h b/mojo/public/cpp/system/functions.h similarity index 70% rename from third_party/mojo/src/mojo/public/cpp/system/functions.h rename to mojo/public/cpp/system/functions.h index 87ea2c81b70350..9cfe316739d7db 100644 --- a/third_party/mojo/src/mojo/public/cpp/system/functions.h +++ b/mojo/public/cpp/system/functions.h @@ -5,13 +5,13 @@ // This file provides a C++ wrapping around the standalone functions of the Mojo // C API, replacing the prefix of "Mojo" with a "mojo" namespace. // -// Please see "third_party/mojo/src/mojo/public/c/system/functions.h" for complete documentation of +// Please see "mojo/public/c/system/functions.h" for complete documentation of // the API. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_SYSTEM_FUNCTIONS_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_SYSTEM_FUNCTIONS_H_ +#ifndef MOJO_PUBLIC_CPP_SYSTEM_FUNCTIONS_H_ +#define MOJO_PUBLIC_CPP_SYSTEM_FUNCTIONS_H_ -#include "third_party/mojo/src/mojo/public/c/system/functions.h" +#include "mojo/public/c/system/functions.h" namespace mojo { @@ -29,4 +29,4 @@ inline MojoTimeTicks GetTimeTicksNow() { } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_SYSTEM_FUNCTIONS_H_ +#endif // MOJO_PUBLIC_CPP_SYSTEM_FUNCTIONS_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/system/handle.h b/mojo/public/cpp/system/handle.h similarity index 95% rename from third_party/mojo/src/mojo/public/cpp/system/handle.h rename to mojo/public/cpp/system/handle.h index 9065dc042f72ae..45624bc66d80c2 100644 --- a/third_party/mojo/src/mojo/public/cpp/system/handle.h +++ b/mojo/public/cpp/system/handle.h @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_SYSTEM_HANDLE_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_SYSTEM_HANDLE_H_ +#ifndef MOJO_PUBLIC_CPP_SYSTEM_HANDLE_H_ +#define MOJO_PUBLIC_CPP_SYSTEM_HANDLE_H_ #include #include -#include "third_party/mojo/src/mojo/public/c/system/functions.h" -#include "third_party/mojo/src/mojo/public/c/system/types.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/c/system/functions.h" +#include "mojo/public/c/system/types.h" +#include "mojo/public/cpp/system/macros.h" namespace mojo { @@ -48,7 +48,7 @@ namespace mojo { // Wrapper functions: // // We provide simple wrappers for the |Mojo...()| functions (in -// third_party/mojo/src/mojo/public/c/system/core.h -- see that file for details on individual +// mojo/public/c/system/core.h -- see that file for details on individual // functions). // // The general guideline is functions that imply ownership transfer of a handle @@ -287,4 +287,4 @@ inline bool operator<(const Handle a, const Handle b) { } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_SYSTEM_HANDLE_H_ +#endif // MOJO_PUBLIC_CPP_SYSTEM_HANDLE_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/system/macros.h b/mojo/public/cpp/system/macros.h similarity index 87% rename from third_party/mojo/src/mojo/public/cpp/system/macros.h rename to mojo/public/cpp/system/macros.h index 3fc51cff38ebbc..7f0fcd7751f60a 100644 --- a/third_party/mojo/src/mojo/public/cpp/system/macros.h +++ b/mojo/public/cpp/system/macros.h @@ -3,13 +3,13 @@ // found in the LICENSE file. // Define a set of C++ specific macros. -// Mojo C++ API users can assume that third_party/mojo/src/mojo/public/cpp/system/macros.h -// includes third_party/mojo/src/mojo/public/c/system/macros.h. +// Mojo C++ API users can assume that mojo/public/cpp/system/macros.h +// includes mojo/public/c/system/macros.h. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_SYSTEM_MACROS_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_SYSTEM_MACROS_H_ +#ifndef MOJO_PUBLIC_CPP_SYSTEM_MACROS_H_ +#define MOJO_PUBLIC_CPP_SYSTEM_MACROS_H_ -#include "third_party/mojo/src/mojo/public/c/system/macros.h" // Symbols exposed. +#include "mojo/public/c/system/macros.h" // Symbols exposed. // A macro to disallow the copy constructor and operator= functions. #define MOJO_DISALLOW_COPY_AND_ASSIGN(TypeName) \ @@ -78,4 +78,4 @@ inline void ignore_result(const T&) { } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_SYSTEM_MACROS_H_ +#endif // MOJO_PUBLIC_CPP_SYSTEM_MACROS_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/system/message_pipe.h b/mojo/public/cpp/system/message_pipe.h similarity index 89% rename from third_party/mojo/src/mojo/public/cpp/system/message_pipe.h rename to mojo/public/cpp/system/message_pipe.h index 3cb24fbf84eaa7..e7a1e353c46e7b 100644 --- a/third_party/mojo/src/mojo/public/cpp/system/message_pipe.h +++ b/mojo/public/cpp/system/message_pipe.h @@ -6,17 +6,17 @@ // replacing the prefix of "Mojo" with a "mojo" namespace, and using more // strongly-typed representations of |MojoHandle|s. // -// Please see "third_party/mojo/src/mojo/public/c/system/message_pipe.h" for complete documentation +// Please see "mojo/public/c/system/message_pipe.h" for complete documentation // of the API. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_SYSTEM_MESSAGE_PIPE_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_SYSTEM_MESSAGE_PIPE_H_ +#ifndef MOJO_PUBLIC_CPP_SYSTEM_MESSAGE_PIPE_H_ +#define MOJO_PUBLIC_CPP_SYSTEM_MESSAGE_PIPE_H_ #include -#include "third_party/mojo/src/mojo/public/c/system/message_pipe.h" -#include "third_party/mojo/src/mojo/public/cpp/system/handle.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/c/system/message_pipe.h" +#include "mojo/public/cpp/system/handle.h" +#include "mojo/public/cpp/system/macros.h" namespace mojo { @@ -116,4 +116,4 @@ inline MessagePipe::~MessagePipe() { } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_SYSTEM_MESSAGE_PIPE_H_ +#endif // MOJO_PUBLIC_CPP_SYSTEM_MESSAGE_PIPE_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/system/tests/BUILD.gn b/mojo/public/cpp/system/tests/BUILD.gn similarity index 100% rename from third_party/mojo/src/mojo/public/cpp/system/tests/BUILD.gn rename to mojo/public/cpp/system/tests/BUILD.gn diff --git a/third_party/mojo/src/mojo/public/cpp/system/tests/core_unittest.cc b/mojo/public/cpp/system/tests/core_unittest.cc similarity index 99% rename from third_party/mojo/src/mojo/public/cpp/system/tests/core_unittest.cc rename to mojo/public/cpp/system/tests/core_unittest.cc index 63bfb05df553d4..4dcad4332bd7e9 100644 --- a/third_party/mojo/src/mojo/public/cpp/system/tests/core_unittest.cc +++ b/mojo/public/cpp/system/tests/core_unittest.cc @@ -6,14 +6,14 @@ // TODO(vtl): Maybe rename "CoreCppTest" -> "CoreTest" if/when this gets // compiled into a different binary from the C API tests. -#include "third_party/mojo/src/mojo/public/cpp/system/core.h" +#include "mojo/public/cpp/system/core.h" #include #include +#include "mojo/public/cpp/system/macros.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace { diff --git a/third_party/mojo/src/mojo/public/cpp/system/tests/macros_unittest.cc b/mojo/public/cpp/system/tests/macros_unittest.cc similarity index 98% rename from third_party/mojo/src/mojo/public/cpp/system/tests/macros_unittest.cc rename to mojo/public/cpp/system/tests/macros_unittest.cc index 088e944c1a9b58..72a9b242776e52 100644 --- a/third_party/mojo/src/mojo/public/cpp/system/tests/macros_unittest.cc +++ b/mojo/public/cpp/system/tests/macros_unittest.cc @@ -10,7 +10,7 @@ // TODO(vtl): Fix no-compile tests (which are all disabled; crbug.com/105388) // and write some "negative" tests. -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/cpp/system/macros.h" #include #include diff --git a/third_party/mojo/src/mojo/public/cpp/test_support/BUILD.gn b/mojo/public/cpp/test_support/BUILD.gn similarity index 100% rename from third_party/mojo/src/mojo/public/cpp/test_support/BUILD.gn rename to mojo/public/cpp/test_support/BUILD.gn diff --git a/third_party/mojo/src/mojo/public/cpp/test_support/lib/test_support.cc b/mojo/public/cpp/test_support/lib/test_support.cc similarity index 89% rename from third_party/mojo/src/mojo/public/cpp/test_support/lib/test_support.cc rename to mojo/public/cpp/test_support/lib/test_support.cc index fbb7e616ab3fba..0b6035b9c2dec8 100644 --- a/third_party/mojo/src/mojo/public/cpp/test_support/lib/test_support.cc +++ b/mojo/public/cpp/test_support/lib/test_support.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 "third_party/mojo/src/mojo/public/cpp/test_support/test_support.h" +#include "mojo/public/cpp/test_support/test_support.h" #include diff --git a/third_party/mojo/src/mojo/public/cpp/test_support/lib/test_utils.cc b/mojo/public/cpp/test_support/lib/test_utils.cc similarity index 93% rename from third_party/mojo/src/mojo/public/cpp/test_support/lib/test_utils.cc rename to mojo/public/cpp/test_support/lib/test_utils.cc index 17bbc6a0877b42..210c6b10cab5df 100644 --- a/third_party/mojo/src/mojo/public/cpp/test_support/lib/test_utils.cc +++ b/mojo/public/cpp/test_support/lib/test_utils.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "third_party/mojo/src/mojo/public/cpp/test_support/test_utils.h" +#include "mojo/public/cpp/test_support/test_utils.h" -#include "third_party/mojo/src/mojo/public/cpp/system/core.h" -#include "third_party/mojo/src/mojo/public/cpp/test_support/test_support.h" +#include "mojo/public/cpp/system/core.h" +#include "mojo/public/cpp/test_support/test_support.h" namespace mojo { namespace test { diff --git a/third_party/mojo/src/mojo/public/cpp/test_support/test_support.h b/mojo/public/cpp/test_support/test_support.h similarity index 75% rename from third_party/mojo/src/mojo/public/cpp/test_support/test_support.h rename to mojo/public/cpp/test_support/test_support.h index c7979914135359..9a536e649f848f 100644 --- a/third_party/mojo/src/mojo/public/cpp/test_support/test_support.h +++ b/mojo/public/cpp/test_support/test_support.h @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_TEST_SUPPORT_TEST_SUPPORT_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_TEST_SUPPORT_TEST_SUPPORT_H_ +#ifndef MOJO_PUBLIC_CPP_TEST_SUPPORT_TEST_SUPPORT_H_ +#define MOJO_PUBLIC_CPP_TEST_SUPPORT_TEST_SUPPORT_H_ #include #include -#include "third_party/mojo/src/mojo/public/c/test_support/test_support.h" +#include "mojo/public/c/test_support/test_support.h" namespace mojo { namespace test { @@ -32,4 +32,4 @@ std::vector EnumerateSourceRootRelativeDirectory( } // namespace test } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_TEST_SUPPORT_TEST_SUPPORT_H_ +#endif // MOJO_PUBLIC_CPP_TEST_SUPPORT_TEST_SUPPORT_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/test_support/test_utils.h b/mojo/public/cpp/test_support/test_utils.h similarity index 83% rename from third_party/mojo/src/mojo/public/cpp/test_support/test_utils.h rename to mojo/public/cpp/test_support/test_utils.h index 7a4f8ae9347506..6fd5a9ea2583c9 100644 --- a/third_party/mojo/src/mojo/public/cpp/test_support/test_utils.h +++ b/mojo/public/cpp/test_support/test_utils.h @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_TEST_SUPPORT_TEST_UTILS_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_TEST_SUPPORT_TEST_UTILS_H_ +#ifndef MOJO_PUBLIC_CPP_TEST_SUPPORT_TEST_UTILS_H_ +#define MOJO_PUBLIC_CPP_TEST_SUPPORT_TEST_UTILS_H_ #include -#include "third_party/mojo/src/mojo/public/cpp/system/core.h" +#include "mojo/public/cpp/system/core.h" namespace mojo { namespace test { @@ -37,4 +37,4 @@ void IterateAndReportPerf(const char* test_name, } // namespace test } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_TEST_SUPPORT_TEST_UTILS_H_ +#endif // MOJO_PUBLIC_CPP_TEST_SUPPORT_TEST_UTILS_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/utility/BUILD.gn b/mojo/public/cpp/utility/BUILD.gn similarity index 100% rename from third_party/mojo/src/mojo/public/cpp/utility/BUILD.gn rename to mojo/public/cpp/utility/BUILD.gn diff --git a/third_party/mojo/src/mojo/public/cpp/utility/lib/mutex.cc b/mojo/public/cpp/utility/lib/mutex.cc similarity index 94% rename from third_party/mojo/src/mojo/public/cpp/utility/lib/mutex.cc rename to mojo/public/cpp/utility/lib/mutex.cc index c4680c1637de41..23370e1c023185 100644 --- a/third_party/mojo/src/mojo/public/cpp/utility/lib/mutex.cc +++ b/mojo/public/cpp/utility/lib/mutex.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 "third_party/mojo/src/mojo/public/cpp/utility/mutex.h" +#include "mojo/public/cpp/utility/mutex.h" #include #include diff --git a/third_party/mojo/src/mojo/public/cpp/utility/lib/run_loop.cc b/mojo/public/cpp/utility/lib/run_loop.cc similarity index 97% rename from third_party/mojo/src/mojo/public/cpp/utility/lib/run_loop.cc rename to mojo/public/cpp/utility/lib/run_loop.cc index 872e4a14f3ad6f..7faf748f757808 100644 --- a/third_party/mojo/src/mojo/public/cpp/utility/lib/run_loop.cc +++ b/mojo/public/cpp/utility/lib/run_loop.cc @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "third_party/mojo/src/mojo/public/cpp/utility/run_loop.h" +#include "mojo/public/cpp/utility/run_loop.h" #include #include #include -#include "third_party/mojo/src/mojo/public/cpp/utility/lib/thread_local.h" -#include "third_party/mojo/src/mojo/public/cpp/utility/run_loop_handler.h" +#include "mojo/public/cpp/utility/lib/thread_local.h" +#include "mojo/public/cpp/utility/run_loop_handler.h" namespace mojo { namespace { diff --git a/third_party/mojo/src/mojo/public/cpp/utility/lib/thread.cc b/mojo/public/cpp/utility/lib/thread.cc similarity index 95% rename from third_party/mojo/src/mojo/public/cpp/utility/lib/thread.cc rename to mojo/public/cpp/utility/lib/thread.cc index 007d4732f88a2b..40f0bdd680c508 100644 --- a/third_party/mojo/src/mojo/public/cpp/utility/lib/thread.cc +++ b/mojo/public/cpp/utility/lib/thread.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 "third_party/mojo/src/mojo/public/cpp/utility/thread.h" +#include "mojo/public/cpp/utility/thread.h" #include diff --git a/third_party/mojo/src/mojo/public/cpp/utility/lib/thread_local.h b/mojo/public/cpp/utility/lib/thread_local.h similarity index 80% rename from third_party/mojo/src/mojo/public/cpp/utility/lib/thread_local.h rename to mojo/public/cpp/utility/lib/thread_local.h index 3f6a1d1207fd02..f5461eea556792 100644 --- a/third_party/mojo/src/mojo/public/cpp/utility/lib/thread_local.h +++ b/mojo/public/cpp/utility/lib/thread_local.h @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_UTILITY_LIB_THREAD_LOCAL_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_UTILITY_LIB_THREAD_LOCAL_H_ +#ifndef MOJO_PUBLIC_CPP_UTILITY_LIB_THREAD_LOCAL_H_ +#define MOJO_PUBLIC_CPP_UTILITY_LIB_THREAD_LOCAL_H_ #ifndef _WIN32 #include #endif -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/cpp/system/macros.h" namespace mojo { namespace internal { @@ -51,4 +51,4 @@ class ThreadLocalPointer { } // namespace internal } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_UTILITY_LIB_THREAD_LOCAL_H_ +#endif // MOJO_PUBLIC_CPP_UTILITY_LIB_THREAD_LOCAL_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/utility/lib/thread_local_posix.cc b/mojo/public/cpp/utility/lib/thread_local_posix.cc similarity index 91% rename from third_party/mojo/src/mojo/public/cpp/utility/lib/thread_local_posix.cc rename to mojo/public/cpp/utility/lib/thread_local_posix.cc index 2286f38873984a..ea7343e5e69aca 100644 --- a/third_party/mojo/src/mojo/public/cpp/utility/lib/thread_local_posix.cc +++ b/mojo/public/cpp/utility/lib/thread_local_posix.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 "third_party/mojo/src/mojo/public/cpp/utility/lib/thread_local.h" +#include "mojo/public/cpp/utility/lib/thread_local.h" #include diff --git a/third_party/mojo/src/mojo/public/cpp/utility/lib/thread_local_win.cc b/mojo/public/cpp/utility/lib/thread_local_win.cc similarity index 91% rename from third_party/mojo/src/mojo/public/cpp/utility/lib/thread_local_win.cc rename to mojo/public/cpp/utility/lib/thread_local_win.cc index baa88cbb089b81..b8239cb772ee31 100644 --- a/third_party/mojo/src/mojo/public/cpp/utility/lib/thread_local_win.cc +++ b/mojo/public/cpp/utility/lib/thread_local_win.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 "third_party/mojo/src/mojo/public/cpp/utility/lib/thread_local.h" +#include "mojo/public/cpp/utility/lib/thread_local.h" #include #include diff --git a/third_party/mojo/src/mojo/public/cpp/utility/mutex.h b/mojo/public/cpp/utility/mutex.h similarity index 85% rename from third_party/mojo/src/mojo/public/cpp/utility/mutex.h rename to mojo/public/cpp/utility/mutex.h index a9dae450949154..4dc4aeecf49104 100644 --- a/third_party/mojo/src/mojo/public/cpp/utility/mutex.h +++ b/mojo/public/cpp/utility/mutex.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_UTILITY_MUTEX_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_UTILITY_MUTEX_H_ +#ifndef MOJO_PUBLIC_CPP_UTILITY_MUTEX_H_ +#define MOJO_PUBLIC_CPP_UTILITY_MUTEX_H_ #ifdef _WIN32 #error "Not implemented: See crbug.com/342893." @@ -11,7 +11,7 @@ #include -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/cpp/system/macros.h" namespace mojo { @@ -67,4 +67,4 @@ class MutexLock { } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_UTILITY_MUTEX_H_ +#endif // MOJO_PUBLIC_CPP_UTILITY_MUTEX_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/utility/run_loop.h b/mojo/public/cpp/utility/run_loop.h similarity index 94% rename from third_party/mojo/src/mojo/public/cpp/utility/run_loop.h rename to mojo/public/cpp/utility/run_loop.h index 79e5c6dd214f2b..4673eaa874a72e 100644 --- a/third_party/mojo/src/mojo/public/cpp/utility/run_loop.h +++ b/mojo/public/cpp/utility/run_loop.h @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_UTILITY_RUN_LOOP_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_UTILITY_RUN_LOOP_H_ +#ifndef MOJO_PUBLIC_CPP_UTILITY_RUN_LOOP_H_ +#define MOJO_PUBLIC_CPP_UTILITY_RUN_LOOP_H_ #include #include -#include "third_party/mojo/src/mojo/public/cpp/bindings/callback.h" -#include "third_party/mojo/src/mojo/public/cpp/system/core.h" +#include "mojo/public/cpp/bindings/callback.h" +#include "mojo/public/cpp/system/core.h" namespace mojo { @@ -153,4 +153,4 @@ class RunLoop { } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_UTILITY_RUN_LOOP_H_ +#endif // MOJO_PUBLIC_CPP_UTILITY_RUN_LOOP_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/utility/run_loop_handler.h b/mojo/public/cpp/utility/run_loop_handler.h similarity index 63% rename from third_party/mojo/src/mojo/public/cpp/utility/run_loop_handler.h rename to mojo/public/cpp/utility/run_loop_handler.h index d68af747d3fefb..69838d5e57c311 100644 --- a/third_party/mojo/src/mojo/public/cpp/utility/run_loop_handler.h +++ b/mojo/public/cpp/utility/run_loop_handler.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_UTILITY_RUN_LOOP_HANDLER_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_UTILITY_RUN_LOOP_HANDLER_H_ +#ifndef MOJO_PUBLIC_CPP_UTILITY_RUN_LOOP_HANDLER_H_ +#define MOJO_PUBLIC_CPP_UTILITY_RUN_LOOP_HANDLER_H_ -#include "third_party/mojo/src/mojo/public/cpp/system/core.h" +#include "mojo/public/cpp/system/core.h" namespace mojo { @@ -22,4 +22,4 @@ class RunLoopHandler { } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_UTILITY_RUN_LOOP_HANDLER_H_ +#endif // MOJO_PUBLIC_CPP_UTILITY_RUN_LOOP_HANDLER_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/utility/tests/BUILD.gn b/mojo/public/cpp/utility/tests/BUILD.gn similarity index 100% rename from third_party/mojo/src/mojo/public/cpp/utility/tests/BUILD.gn rename to mojo/public/cpp/utility/tests/BUILD.gn diff --git a/third_party/mojo/src/mojo/public/cpp/utility/tests/mutex_unittest.cc b/mojo/public/cpp/utility/tests/mutex_unittest.cc similarity index 96% rename from third_party/mojo/src/mojo/public/cpp/utility/tests/mutex_unittest.cc rename to mojo/public/cpp/utility/tests/mutex_unittest.cc index 69d5df621a3590..78e95c532c51ff 100644 --- a/third_party/mojo/src/mojo/public/cpp/utility/tests/mutex_unittest.cc +++ b/mojo/public/cpp/utility/tests/mutex_unittest.cc @@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "third_party/mojo/src/mojo/public/cpp/utility/mutex.h" +#include "mojo/public/cpp/utility/mutex.h" #include // For |rand()|. #include // For |nanosleep()| (defined by POSIX). #include +#include "mojo/public/cpp/system/macros.h" +#include "mojo/public/cpp/utility/thread.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" -#include "third_party/mojo/src/mojo/public/cpp/utility/thread.h" namespace mojo { namespace { diff --git a/third_party/mojo/src/mojo/public/cpp/utility/tests/run_loop_unittest.cc b/mojo/public/cpp/utility/tests/run_loop_unittest.cc similarity index 97% rename from third_party/mojo/src/mojo/public/cpp/utility/tests/run_loop_unittest.cc rename to mojo/public/cpp/utility/tests/run_loop_unittest.cc index 5e3bf80eaaa658..4ab4876eec6418 100644 --- a/third_party/mojo/src/mojo/public/cpp/utility/tests/run_loop_unittest.cc +++ b/mojo/public/cpp/utility/tests/run_loop_unittest.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "third_party/mojo/src/mojo/public/cpp/utility/run_loop.h" +#include "mojo/public/cpp/utility/run_loop.h" #include +#include "mojo/public/cpp/system/core.h" +#include "mojo/public/cpp/test_support/test_utils.h" +#include "mojo/public/cpp/utility/run_loop_handler.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" -#include "third_party/mojo/src/mojo/public/cpp/utility/run_loop_handler.h" namespace mojo { namespace { diff --git a/third_party/mojo/src/mojo/public/cpp/utility/tests/thread_unittest.cc b/mojo/public/cpp/utility/tests/thread_unittest.cc similarity index 94% rename from third_party/mojo/src/mojo/public/cpp/utility/tests/thread_unittest.cc rename to mojo/public/cpp/utility/tests/thread_unittest.cc index e9dea6b4d22484..57c4ad9b19244b 100644 --- a/third_party/mojo/src/mojo/public/cpp/utility/tests/thread_unittest.cc +++ b/mojo/public/cpp/utility/tests/thread_unittest.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "third_party/mojo/src/mojo/public/cpp/utility/thread.h" +#include "mojo/public/cpp/utility/thread.h" +#include "mojo/public/cpp/system/macros.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace { diff --git a/third_party/mojo/src/mojo/public/cpp/utility/thread.h b/mojo/public/cpp/utility/thread.h similarity index 82% rename from third_party/mojo/src/mojo/public/cpp/utility/thread.h rename to mojo/public/cpp/utility/thread.h index d010819e260892..b7d10ee7037e4e 100644 --- a/third_party/mojo/src/mojo/public/cpp/utility/thread.h +++ b/mojo/public/cpp/utility/thread.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_UTILITY_THREAD_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_UTILITY_THREAD_H_ +#ifndef MOJO_PUBLIC_CPP_UTILITY_THREAD_H_ +#define MOJO_PUBLIC_CPP_UTILITY_THREAD_H_ #ifdef _WIN32 #error "Not implemented: See crbug.com/342893." @@ -12,7 +12,7 @@ #include #include -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/cpp/system/macros.h" namespace mojo { @@ -59,4 +59,4 @@ class Thread { } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_UTILITY_THREAD_H_ +#endif // MOJO_PUBLIC_CPP_UTILITY_THREAD_H_ diff --git a/third_party/mojo/src/mojo/public/gles2/BUILD.gn b/mojo/public/gles2/BUILD.gn similarity index 86% rename from third_party/mojo/src/mojo/public/gles2/BUILD.gn rename to mojo/public/gles2/BUILD.gn index c502f346e65ddc..c62ba12cd289ae 100644 --- a/third_party/mojo/src/mojo/public/gles2/BUILD.gn +++ b/mojo/public/gles2/BUILD.gn @@ -17,7 +17,7 @@ group("for_shared_library") { public_configs = [ "//third_party/khronos:khronos_headers" ] public_deps = [ - "//third_party/mojo/src/mojo/public/c/gles2", + "//mojo/public/c/gles2", ] if (is_component_build) { @@ -26,7 +26,7 @@ group("for_shared_library") { ] } else { deps = [ - "//third_party/mojo/src/mojo/public/platform/native:gles2", + "//mojo/public/platform/native:gles2", ] } } @@ -34,7 +34,7 @@ group("for_shared_library") { group("for_component") { public_configs = [ "//third_party/khronos:khronos_headers" ] public_deps = [ - "//third_party/mojo/src/mojo/public/c/gles2", + "//mojo/public/c/gles2", ] if (is_component_build) { diff --git a/third_party/mojo/src/mojo/public/interfaces/BUILD.gn b/mojo/public/interfaces/BUILD.gn similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/BUILD.gn rename to mojo/public/interfaces/BUILD.gn diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/BUILD.gn b/mojo/public/interfaces/bindings/BUILD.gn similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/BUILD.gn rename to mojo/public/interfaces/bindings/BUILD.gn diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/interface_control_messages.mojom b/mojo/public/interfaces/bindings/interface_control_messages.mojom similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/interface_control_messages.mojom rename to mojo/public/interfaces/bindings/interface_control_messages.mojom diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/BUILD.gn b/mojo/public/interfaces/bindings/tests/BUILD.gn similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/BUILD.gn rename to mojo/public/interfaces/bindings/tests/BUILD.gn diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/message_data b/mojo/public/interfaces/bindings/tests/data/message_data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/message_data rename to mojo/public/interfaces/bindings/tests/data/message_data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/boundscheck_msghdr_no_such_method.data b/mojo/public/interfaces/bindings/tests/data/validation/boundscheck_msghdr_no_such_method.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/boundscheck_msghdr_no_such_method.data rename to mojo/public/interfaces/bindings/tests/data/validation/boundscheck_msghdr_no_such_method.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/boundscheck_msghdr_no_such_method.expected b/mojo/public/interfaces/bindings/tests/data/validation/boundscheck_msghdr_no_such_method.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/boundscheck_msghdr_no_such_method.expected rename to mojo/public/interfaces/bindings/tests/data/validation/boundscheck_msghdr_no_such_method.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_empty.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_empty.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_empty.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_empty.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_empty.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_empty.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_empty.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_empty.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_incomplete_struct.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_incomplete_struct.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_incomplete_struct.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_incomplete_struct.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_incomplete_struct.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_incomplete_struct.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_incomplete_struct.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_incomplete_struct.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_incomplete_struct_header.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_incomplete_struct_header.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_incomplete_struct_header.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_incomplete_struct_header.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_incomplete_struct_header.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_incomplete_struct_header.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_incomplete_struct_header.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_incomplete_struct_header.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_invalid_flag_combo.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_invalid_flag_combo.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_invalid_flag_combo.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_invalid_flag_combo.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_invalid_flag_combo.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_invalid_flag_combo.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_invalid_flag_combo.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_invalid_flag_combo.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_missing_request_id.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_missing_request_id.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_missing_request_id.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_missing_request_id.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_missing_request_id.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_missing_request_id.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_missing_request_id.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_missing_request_id.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_no_such_method.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_no_such_method.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_no_such_method.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_no_such_method.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_no_such_method.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_no_such_method.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_no_such_method.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_no_such_method.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_huge.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_huge.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_huge.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_huge.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_huge.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_huge.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_huge.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_huge.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_less_than_min_requirement.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_less_than_min_requirement.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_less_than_min_requirement.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_less_than_min_requirement.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_less_than_min_requirement.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_less_than_min_requirement.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_less_than_min_requirement.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_less_than_min_requirement.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_less_than_struct_header.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_less_than_struct_header.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_less_than_struct_header.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_less_than_struct_header.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_less_than_struct_header.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_less_than_struct_header.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_less_than_struct_header.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_less_than_struct_header.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_version_mismatch_1.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_version_mismatch_1.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_version_mismatch_1.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_version_mismatch_1.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_version_mismatch_1.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_version_mismatch_1.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_version_mismatch_1.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_version_mismatch_1.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_version_mismatch_2.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_version_mismatch_2.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_version_mismatch_2.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_version_mismatch_2.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_version_mismatch_2.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_version_mismatch_2.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_version_mismatch_2.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_version_mismatch_2.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_version_mismatch_3.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_version_mismatch_3.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_version_mismatch_3.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_version_mismatch_3.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_version_mismatch_3.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_version_mismatch_3.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_version_mismatch_3.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_version_mismatch_3.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_good.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_good.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_good.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_good.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_good.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_good.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_good.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_good.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_incomplete_struct.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_incomplete_struct.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_incomplete_struct.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_incomplete_struct.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_incomplete_struct.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_incomplete_struct.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_incomplete_struct.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_incomplete_struct.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_incomplete_struct_header.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_incomplete_struct_header.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_incomplete_struct_header.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_incomplete_struct_header.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_incomplete_struct_header.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_incomplete_struct_header.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_incomplete_struct_header.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_incomplete_struct_header.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_invalid_request_flags.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_invalid_request_flags.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_invalid_request_flags.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_invalid_request_flags.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_invalid_request_flags.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_invalid_request_flags.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_invalid_request_flags.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_invalid_request_flags.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_invalid_request_flags2.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_invalid_request_flags2.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_invalid_request_flags2.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_invalid_request_flags2.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_invalid_request_flags2.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_invalid_request_flags2.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_invalid_request_flags2.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_invalid_request_flags2.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_struct_num_bytes_huge.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_struct_num_bytes_huge.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_struct_num_bytes_huge.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_struct_num_bytes_huge.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_struct_num_bytes_huge.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_struct_num_bytes_huge.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_struct_num_bytes_huge.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_struct_num_bytes_huge.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_struct_num_bytes_less_than_min_requirement.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_struct_num_bytes_less_than_min_requirement.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_struct_num_bytes_less_than_min_requirement.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_struct_num_bytes_less_than_min_requirement.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_struct_num_bytes_less_than_min_requirement.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_struct_num_bytes_less_than_min_requirement.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_struct_num_bytes_less_than_min_requirement.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_struct_num_bytes_less_than_min_requirement.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_struct_num_bytes_less_than_struct_header.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_struct_num_bytes_less_than_struct_header.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_struct_num_bytes_less_than_struct_header.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_struct_num_bytes_less_than_struct_header.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_struct_num_bytes_less_than_struct_header.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_struct_num_bytes_less_than_struct_header.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_struct_num_bytes_less_than_struct_header.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_struct_num_bytes_less_than_struct_header.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_good.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_good.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_good.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_good.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_good.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_good.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_good.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_good.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_good_non_unique_keys.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_good_non_unique_keys.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_good_non_unique_keys.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_good_non_unique_keys.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_good_non_unique_keys.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_good_non_unique_keys.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_good_non_unique_keys.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_good_non_unique_keys.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_null_keys.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_null_keys.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_null_keys.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_null_keys.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_null_keys.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_null_keys.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_null_keys.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_null_keys.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_null_values.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_null_values.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_null_values.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_null_values.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_null_values.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_null_values.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_null_values.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_null_values.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_one_null_key.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_one_null_key.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_one_null_key.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_one_null_key.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_one_null_key.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_one_null_key.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_one_null_key.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_one_null_key.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_unequal_array_size.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_unequal_array_size.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_unequal_array_size.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_unequal_array_size.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_unequal_array_size.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_unequal_array_size.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_unequal_array_size.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_unequal_array_size.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd11_good_version0.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd11_good_version0.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd11_good_version0.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd11_good_version0.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd11_good_version0.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd11_good_version0.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd11_good_version0.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd11_good_version0.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd11_good_version1.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd11_good_version1.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd11_good_version1.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd11_good_version1.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd11_good_version1.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd11_good_version1.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd11_good_version1.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd11_good_version1.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd11_good_version2.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd11_good_version2.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd11_good_version2.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd11_good_version2.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd11_good_version2.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd11_good_version2.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd11_good_version2.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd11_good_version2.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd11_good_version3.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd11_good_version3.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd11_good_version3.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd11_good_version3.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd11_good_version3.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd11_good_version3.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd11_good_version3.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd11_good_version3.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd11_good_version_newer_than_known_1.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd11_good_version_newer_than_known_1.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd11_good_version_newer_than_known_1.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd11_good_version_newer_than_known_1.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd11_good_version_newer_than_known_1.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd11_good_version_newer_than_known_1.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd11_good_version_newer_than_known_1.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd11_good_version_newer_than_known_1.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd11_good_version_newer_than_known_2.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd11_good_version_newer_than_known_2.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd11_good_version_newer_than_known_2.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd11_good_version_newer_than_known_2.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd11_good_version_newer_than_known_2.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd11_good_version_newer_than_known_2.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd11_good_version_newer_than_known_2.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd11_good_version_newer_than_known_2.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd11_num_bytes_version_mismatch_1.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd11_num_bytes_version_mismatch_1.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd11_num_bytes_version_mismatch_1.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd11_num_bytes_version_mismatch_1.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd11_num_bytes_version_mismatch_1.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd11_num_bytes_version_mismatch_1.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd11_num_bytes_version_mismatch_1.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd11_num_bytes_version_mismatch_1.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd11_num_bytes_version_mismatch_2.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd11_num_bytes_version_mismatch_2.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd11_num_bytes_version_mismatch_2.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd11_num_bytes_version_mismatch_2.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd11_num_bytes_version_mismatch_2.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd11_num_bytes_version_mismatch_2.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd11_num_bytes_version_mismatch_2.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd11_num_bytes_version_mismatch_2.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd12_invalid_request_flags.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd12_invalid_request_flags.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd12_invalid_request_flags.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd12_invalid_request_flags.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd12_invalid_request_flags.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd12_invalid_request_flags.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd12_invalid_request_flags.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd12_invalid_request_flags.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd13_good_1.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd13_good_1.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd13_good_1.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd13_good_1.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd13_good_1.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd13_good_1.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd13_good_1.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd13_good_1.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd13_good_2.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd13_good_2.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd13_good_2.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd13_good_2.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd13_good_2.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd13_good_2.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd13_good_2.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd13_good_2.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd1_good.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd1_good.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd1_good.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd1_good.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd1_good.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd1_good.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd1_good.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd1_good.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd1_misaligned_struct.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd1_misaligned_struct.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd1_misaligned_struct.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd1_misaligned_struct.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd1_misaligned_struct.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd1_misaligned_struct.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd1_misaligned_struct.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd1_misaligned_struct.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd1_struct_pointer_overflow.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd1_struct_pointer_overflow.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd1_struct_pointer_overflow.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd1_struct_pointer_overflow.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd1_struct_pointer_overflow.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd1_struct_pointer_overflow.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd1_struct_pointer_overflow.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd1_struct_pointer_overflow.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd1_unexpected_null_struct.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd1_unexpected_null_struct.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd1_unexpected_null_struct.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd1_unexpected_null_struct.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd1_unexpected_null_struct.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd1_unexpected_null_struct.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd1_unexpected_null_struct.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd1_unexpected_null_struct.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd2_good.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd2_good.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd2_good.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd2_good.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd2_good.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd2_good.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd2_good.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd2_good.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd2_multiple_pointers_to_same_struct.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd2_multiple_pointers_to_same_struct.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd2_multiple_pointers_to_same_struct.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd2_multiple_pointers_to_same_struct.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd2_multiple_pointers_to_same_struct.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd2_multiple_pointers_to_same_struct.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd2_multiple_pointers_to_same_struct.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd2_multiple_pointers_to_same_struct.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd2_overlapped_objects.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd2_overlapped_objects.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd2_overlapped_objects.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd2_overlapped_objects.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd2_overlapped_objects.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd2_overlapped_objects.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd2_overlapped_objects.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd2_overlapped_objects.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd2_wrong_layout_order.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd2_wrong_layout_order.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd2_wrong_layout_order.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd2_wrong_layout_order.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd2_wrong_layout_order.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd2_wrong_layout_order.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd2_wrong_layout_order.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd2_wrong_layout_order.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_num_bytes_huge.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_num_bytes_huge.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_num_bytes_huge.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_num_bytes_huge.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_num_bytes_huge.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_num_bytes_huge.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_num_bytes_huge.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_num_bytes_huge.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_num_bytes_less_than_array_header.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_num_bytes_less_than_array_header.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_num_bytes_less_than_array_header.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_num_bytes_less_than_array_header.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_num_bytes_less_than_array_header.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_num_bytes_less_than_array_header.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_num_bytes_less_than_array_header.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_num_bytes_less_than_array_header.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_num_bytes_less_than_necessary_size.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_num_bytes_less_than_necessary_size.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_num_bytes_less_than_necessary_size.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_num_bytes_less_than_necessary_size.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_num_bytes_less_than_necessary_size.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_num_bytes_less_than_necessary_size.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_num_bytes_less_than_necessary_size.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_num_bytes_less_than_necessary_size.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_pointer_overflow.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_pointer_overflow.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_pointer_overflow.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_pointer_overflow.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_pointer_overflow.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_pointer_overflow.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_pointer_overflow.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_pointer_overflow.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_good.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_good.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_good.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_good.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_good.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_good.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_good.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_good.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_incomplete_array.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_incomplete_array.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_incomplete_array.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_incomplete_array.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_incomplete_array.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_incomplete_array.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_incomplete_array.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_incomplete_array.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_incomplete_array_header.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_incomplete_array_header.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_incomplete_array_header.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_incomplete_array_header.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_incomplete_array_header.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_incomplete_array_header.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_incomplete_array_header.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_incomplete_array_header.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_misaligned_array.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_misaligned_array.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_misaligned_array.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_misaligned_array.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_misaligned_array.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_misaligned_array.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_misaligned_array.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_misaligned_array.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_unexpected_null_array.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_unexpected_null_array.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_unexpected_null_array.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_unexpected_null_array.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_unexpected_null_array.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_unexpected_null_array.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_unexpected_null_array.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_unexpected_null_array.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd4_good.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd4_good.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd4_good.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd4_good.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd4_good.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd4_good.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd4_good.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd4_good.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd4_multiple_pointers_to_same_array.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd4_multiple_pointers_to_same_array.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd4_multiple_pointers_to_same_array.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd4_multiple_pointers_to_same_array.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd4_multiple_pointers_to_same_array.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd4_multiple_pointers_to_same_array.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd4_multiple_pointers_to_same_array.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd4_multiple_pointers_to_same_array.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd4_overlapped_objects.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd4_overlapped_objects.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd4_overlapped_objects.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd4_overlapped_objects.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd4_overlapped_objects.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd4_overlapped_objects.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd4_overlapped_objects.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd4_overlapped_objects.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd4_wrong_layout_order.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd4_wrong_layout_order.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd4_wrong_layout_order.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd4_wrong_layout_order.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd4_wrong_layout_order.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd4_wrong_layout_order.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd4_wrong_layout_order.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd4_wrong_layout_order.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_good.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_good.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_good.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_good.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_good.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_good.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_good.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_good.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_handle_out_of_range.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_handle_out_of_range.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_handle_out_of_range.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_handle_out_of_range.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_handle_out_of_range.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_handle_out_of_range.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_handle_out_of_range.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_handle_out_of_range.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_multiple_handles_with_same_value_1.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_multiple_handles_with_same_value_1.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_multiple_handles_with_same_value_1.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_multiple_handles_with_same_value_1.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_multiple_handles_with_same_value_1.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_multiple_handles_with_same_value_1.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_multiple_handles_with_same_value_1.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_multiple_handles_with_same_value_1.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_multiple_handles_with_same_value_2.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_multiple_handles_with_same_value_2.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_multiple_handles_with_same_value_2.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_multiple_handles_with_same_value_2.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_multiple_handles_with_same_value_2.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_multiple_handles_with_same_value_2.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_multiple_handles_with_same_value_2.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_multiple_handles_with_same_value_2.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_unexpected_invalid_handle.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_unexpected_invalid_handle.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_unexpected_invalid_handle.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_unexpected_invalid_handle.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_unexpected_invalid_handle.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_unexpected_invalid_handle.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_unexpected_invalid_handle.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_unexpected_invalid_handle.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_wrong_handle_order.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_wrong_handle_order.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_wrong_handle_order.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_wrong_handle_order.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_wrong_handle_order.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_wrong_handle_order.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_wrong_handle_order.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_wrong_handle_order.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd6_good.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd6_good.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd6_good.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd6_good.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd6_good.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd6_good.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd6_good.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd6_good.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd6_nested_array_num_bytes_less_than_necessary_size.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd6_nested_array_num_bytes_less_than_necessary_size.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd6_nested_array_num_bytes_less_than_necessary_size.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd6_nested_array_num_bytes_less_than_necessary_size.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd6_nested_array_num_bytes_less_than_necessary_size.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd6_nested_array_num_bytes_less_than_necessary_size.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd6_nested_array_num_bytes_less_than_necessary_size.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd6_nested_array_num_bytes_less_than_necessary_size.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd7_good.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd7_good.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd7_good.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd7_good.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd7_good.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd7_good.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd7_good.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd7_good.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd7_unexpected_null_fixed_array.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd7_unexpected_null_fixed_array.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd7_unexpected_null_fixed_array.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd7_unexpected_null_fixed_array.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd7_unexpected_null_fixed_array.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd7_unexpected_null_fixed_array.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd7_unexpected_null_fixed_array.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd7_unexpected_null_fixed_array.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd7_unmatched_array_elements.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd7_unmatched_array_elements.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd7_unmatched_array_elements.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd7_unmatched_array_elements.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd7_unmatched_array_elements.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd7_unmatched_array_elements.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd7_unmatched_array_elements.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd7_unmatched_array_elements.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd7_unmatched_array_elements_nested.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd7_unmatched_array_elements_nested.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd7_unmatched_array_elements_nested.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd7_unmatched_array_elements_nested.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd7_unmatched_array_elements_nested.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd7_unmatched_array_elements_nested.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd7_unmatched_array_elements_nested.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd7_unmatched_array_elements_nested.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd8_array_num_bytes_overflow.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd8_array_num_bytes_overflow.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd8_array_num_bytes_overflow.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd8_array_num_bytes_overflow.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd8_array_num_bytes_overflow.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd8_array_num_bytes_overflow.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd8_array_num_bytes_overflow.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd8_array_num_bytes_overflow.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd8_good.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd8_good.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd8_good.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd8_good.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd8_good.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd8_good.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd8_good.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd8_good.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd8_unexpected_null_array.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd8_unexpected_null_array.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd8_unexpected_null_array.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd8_unexpected_null_array.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd8_unexpected_null_array.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd8_unexpected_null_array.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd8_unexpected_null_array.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd8_unexpected_null_array.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd8_unexpected_null_string.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd8_unexpected_null_string.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd8_unexpected_null_string.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd8_unexpected_null_string.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd8_unexpected_null_string.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd8_unexpected_null_string.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd8_unexpected_null_string.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd8_unexpected_null_string.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd9_good.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd9_good.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd9_good.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd9_good.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd9_good.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd9_good.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd9_good.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd9_good.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd9_good_null_array.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd9_good_null_array.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd9_good_null_array.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd9_good_null_array.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd9_good_null_array.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd9_good_null_array.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd9_good_null_array.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd9_good_null_array.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd9_unexpected_null_array.data b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd9_unexpected_null_array.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd9_unexpected_null_array.data rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd9_unexpected_null_array.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd9_unexpected_null_array.expected b/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd9_unexpected_null_array.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd9_unexpected_null_array.expected rename to mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd9_unexpected_null_array.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/integration_intf_resp_mthd0_good.data b/mojo/public/interfaces/bindings/tests/data/validation/integration_intf_resp_mthd0_good.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/integration_intf_resp_mthd0_good.data rename to mojo/public/interfaces/bindings/tests/data/validation/integration_intf_resp_mthd0_good.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/integration_intf_resp_mthd0_good.expected b/mojo/public/interfaces/bindings/tests/data/validation/integration_intf_resp_mthd0_good.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/integration_intf_resp_mthd0_good.expected rename to mojo/public/interfaces/bindings/tests/data/validation/integration_intf_resp_mthd0_good.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/integration_intf_resp_mthd0_unexpected_array_header.data b/mojo/public/interfaces/bindings/tests/data/validation/integration_intf_resp_mthd0_unexpected_array_header.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/integration_intf_resp_mthd0_unexpected_array_header.data rename to mojo/public/interfaces/bindings/tests/data/validation/integration_intf_resp_mthd0_unexpected_array_header.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/integration_intf_resp_mthd0_unexpected_array_header.expected b/mojo/public/interfaces/bindings/tests/data/validation/integration_intf_resp_mthd0_unexpected_array_header.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/integration_intf_resp_mthd0_unexpected_array_header.expected rename to mojo/public/interfaces/bindings/tests/data/validation/integration_intf_resp_mthd0_unexpected_array_header.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/integration_intf_rqst_mthd0_good.data b/mojo/public/interfaces/bindings/tests/data/validation/integration_intf_rqst_mthd0_good.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/integration_intf_rqst_mthd0_good.data rename to mojo/public/interfaces/bindings/tests/data/validation/integration_intf_rqst_mthd0_good.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/integration_intf_rqst_mthd0_good.expected b/mojo/public/interfaces/bindings/tests/data/validation/integration_intf_rqst_mthd0_good.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/integration_intf_rqst_mthd0_good.expected rename to mojo/public/interfaces/bindings/tests/data/validation/integration_intf_rqst_mthd0_good.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/integration_intf_rqst_mthd0_unexpected_struct_header.data b/mojo/public/interfaces/bindings/tests/data/validation/integration_intf_rqst_mthd0_unexpected_struct_header.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/integration_intf_rqst_mthd0_unexpected_struct_header.data rename to mojo/public/interfaces/bindings/tests/data/validation/integration_intf_rqst_mthd0_unexpected_struct_header.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/integration_intf_rqst_mthd0_unexpected_struct_header.expected b/mojo/public/interfaces/bindings/tests/data/validation/integration_intf_rqst_mthd0_unexpected_struct_header.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/integration_intf_rqst_mthd0_unexpected_struct_header.expected rename to mojo/public/interfaces/bindings/tests/data/validation/integration_intf_rqst_mthd0_unexpected_struct_header.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/integration_msghdr_invalid_flags.data b/mojo/public/interfaces/bindings/tests/data/validation/integration_msghdr_invalid_flags.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/integration_msghdr_invalid_flags.data rename to mojo/public/interfaces/bindings/tests/data/validation/integration_msghdr_invalid_flags.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/integration_msghdr_invalid_flags.expected b/mojo/public/interfaces/bindings/tests/data/validation/integration_msghdr_invalid_flags.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/integration_msghdr_invalid_flags.expected rename to mojo/public/interfaces/bindings/tests/data/validation/integration_msghdr_invalid_flags.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/resp_boundscheck_msghdr_no_such_method.data b/mojo/public/interfaces/bindings/tests/data/validation/resp_boundscheck_msghdr_no_such_method.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/resp_boundscheck_msghdr_no_such_method.data rename to mojo/public/interfaces/bindings/tests/data/validation/resp_boundscheck_msghdr_no_such_method.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/resp_boundscheck_msghdr_no_such_method.expected b/mojo/public/interfaces/bindings/tests/data/validation/resp_boundscheck_msghdr_no_such_method.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/resp_boundscheck_msghdr_no_such_method.expected rename to mojo/public/interfaces/bindings/tests/data/validation/resp_boundscheck_msghdr_no_such_method.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/resp_conformance_msghdr_invalid_response_flags1.data b/mojo/public/interfaces/bindings/tests/data/validation/resp_conformance_msghdr_invalid_response_flags1.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/resp_conformance_msghdr_invalid_response_flags1.data rename to mojo/public/interfaces/bindings/tests/data/validation/resp_conformance_msghdr_invalid_response_flags1.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/resp_conformance_msghdr_invalid_response_flags1.expected b/mojo/public/interfaces/bindings/tests/data/validation/resp_conformance_msghdr_invalid_response_flags1.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/resp_conformance_msghdr_invalid_response_flags1.expected rename to mojo/public/interfaces/bindings/tests/data/validation/resp_conformance_msghdr_invalid_response_flags1.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/resp_conformance_msghdr_invalid_response_flags2.data b/mojo/public/interfaces/bindings/tests/data/validation/resp_conformance_msghdr_invalid_response_flags2.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/resp_conformance_msghdr_invalid_response_flags2.data rename to mojo/public/interfaces/bindings/tests/data/validation/resp_conformance_msghdr_invalid_response_flags2.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/resp_conformance_msghdr_invalid_response_flags2.expected b/mojo/public/interfaces/bindings/tests/data/validation/resp_conformance_msghdr_invalid_response_flags2.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/resp_conformance_msghdr_invalid_response_flags2.expected rename to mojo/public/interfaces/bindings/tests/data/validation/resp_conformance_msghdr_invalid_response_flags2.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/resp_conformance_msghdr_no_such_method.data b/mojo/public/interfaces/bindings/tests/data/validation/resp_conformance_msghdr_no_such_method.data similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/resp_conformance_msghdr_no_such_method.data rename to mojo/public/interfaces/bindings/tests/data/validation/resp_conformance_msghdr_no_such_method.data diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/resp_conformance_msghdr_no_such_method.expected b/mojo/public/interfaces/bindings/tests/data/validation/resp_conformance_msghdr_no_such_method.expected similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/resp_conformance_msghdr_no_such_method.expected rename to mojo/public/interfaces/bindings/tests/data/validation/resp_conformance_msghdr_no_such_method.expected diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/math_calculator.mojom b/mojo/public/interfaces/bindings/tests/math_calculator.mojom similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/math_calculator.mojom rename to mojo/public/interfaces/bindings/tests/math_calculator.mojom diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/no_module.mojom b/mojo/public/interfaces/bindings/tests/no_module.mojom similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/no_module.mojom rename to mojo/public/interfaces/bindings/tests/no_module.mojom diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/ping_service.mojom b/mojo/public/interfaces/bindings/tests/ping_service.mojom similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/ping_service.mojom rename to mojo/public/interfaces/bindings/tests/ping_service.mojom diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/rect.mojom b/mojo/public/interfaces/bindings/tests/rect.mojom similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/rect.mojom rename to mojo/public/interfaces/bindings/tests/rect.mojom diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/regression_tests.mojom b/mojo/public/interfaces/bindings/tests/regression_tests.mojom similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/regression_tests.mojom rename to mojo/public/interfaces/bindings/tests/regression_tests.mojom diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/sample_factory.mojom b/mojo/public/interfaces/bindings/tests/sample_factory.mojom similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/sample_factory.mojom rename to mojo/public/interfaces/bindings/tests/sample_factory.mojom diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/sample_import.mojom b/mojo/public/interfaces/bindings/tests/sample_import.mojom similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/sample_import.mojom rename to mojo/public/interfaces/bindings/tests/sample_import.mojom diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/sample_import2.mojom b/mojo/public/interfaces/bindings/tests/sample_import2.mojom similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/sample_import2.mojom rename to mojo/public/interfaces/bindings/tests/sample_import2.mojom diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/sample_interfaces.mojom b/mojo/public/interfaces/bindings/tests/sample_interfaces.mojom similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/sample_interfaces.mojom rename to mojo/public/interfaces/bindings/tests/sample_interfaces.mojom diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/sample_service.mojom b/mojo/public/interfaces/bindings/tests/sample_service.mojom similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/sample_service.mojom rename to mojo/public/interfaces/bindings/tests/sample_service.mojom diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/scoping.mojom b/mojo/public/interfaces/bindings/tests/scoping.mojom similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/scoping.mojom rename to mojo/public/interfaces/bindings/tests/scoping.mojom diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/serialization_test_structs.mojom b/mojo/public/interfaces/bindings/tests/serialization_test_structs.mojom similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/serialization_test_structs.mojom rename to mojo/public/interfaces/bindings/tests/serialization_test_structs.mojom diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/test_associated_interfaces.mojom b/mojo/public/interfaces/bindings/tests/test_associated_interfaces.mojom similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/test_associated_interfaces.mojom rename to mojo/public/interfaces/bindings/tests/test_associated_interfaces.mojom diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/test_constants.mojom b/mojo/public/interfaces/bindings/tests/test_constants.mojom similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/test_constants.mojom rename to mojo/public/interfaces/bindings/tests/test_constants.mojom diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/test_structs.mojom b/mojo/public/interfaces/bindings/tests/test_structs.mojom similarity index 99% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/test_structs.mojom rename to mojo/public/interfaces/bindings/tests/test_structs.mojom index 6b297fb4874f06..b62df5b1f5c972 100644 --- a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/test_structs.mojom +++ b/mojo/public/interfaces/bindings/tests/test_structs.mojom @@ -5,7 +5,7 @@ [JavaPackage="org.chromium.mojo.bindings.test.mojom.test_structs"] module mojo.test; -import "third_party/mojo/src/mojo/public/interfaces/bindings/tests/rect.mojom"; +import "mojo/public/interfaces/bindings/tests/rect.mojom"; struct NamedRegion { string? name; diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/test_unions.mojom b/mojo/public/interfaces/bindings/tests/test_unions.mojom similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/test_unions.mojom rename to mojo/public/interfaces/bindings/tests/test_unions.mojom diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/validation_test_interfaces.mojom b/mojo/public/interfaces/bindings/tests/validation_test_interfaces.mojom similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/validation_test_interfaces.mojom rename to mojo/public/interfaces/bindings/tests/validation_test_interfaces.mojom diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/versioning_test_client.mojom b/mojo/public/interfaces/bindings/tests/versioning_test_client.mojom similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/versioning_test_client.mojom rename to mojo/public/interfaces/bindings/tests/versioning_test_client.mojom diff --git a/third_party/mojo/src/mojo/public/interfaces/bindings/tests/versioning_test_service.mojom b/mojo/public/interfaces/bindings/tests/versioning_test_service.mojom similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/bindings/tests/versioning_test_service.mojom rename to mojo/public/interfaces/bindings/tests/versioning_test_service.mojom diff --git a/third_party/mojo/src/mojo/public/java/BUILD.gn b/mojo/public/java/BUILD.gn similarity index 80% rename from third_party/mojo/src/mojo/public/java/BUILD.gn rename to mojo/public/java/BUILD.gn index 69ae769887120c..d543394ad0c5ec 100644 --- a/third_party/mojo/src/mojo/public/java/BUILD.gn +++ b/mojo/public/java/BUILD.gn @@ -3,7 +3,6 @@ # found in the LICENSE file. import("//build/config/android/rules.gni") -import("//mojo/public/mojo.gni") android_library("system") { java_files = [ @@ -60,21 +59,3 @@ android_library("bindings") { srcjar_deps = [ "../interfaces/bindings:bindings_java_sources" ] } - -if (mojo_use_application_in_sdk) { - android_library("application") { - java_files = [ - "application/src/org/chromium/mojo/application/ApplicationConnection.java", - "application/src/org/chromium/mojo/application/ApplicationDelegate.java", - "application/src/org/chromium/mojo/application/ApplicationImpl.java", - "application/src/org/chromium/mojo/application/ApplicationRunner.java", - "application/src/org/chromium/mojo/application/ServiceFactoryBinder.java", - "application/src/org/chromium/mojo/application/ShellHelper.java", - ] - deps = [ - ":bindings", - ":system", - "../interfaces/application:application_java", - ] - } -} diff --git a/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/AutoCloseableRouter.java b/mojo/public/java/bindings/src/org/chromium/mojo/bindings/AutoCloseableRouter.java similarity index 100% rename from third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/AutoCloseableRouter.java rename to mojo/public/java/bindings/src/org/chromium/mojo/bindings/AutoCloseableRouter.java diff --git a/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/BindingsHelper.java b/mojo/public/java/bindings/src/org/chromium/mojo/bindings/BindingsHelper.java similarity index 100% rename from third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/BindingsHelper.java rename to mojo/public/java/bindings/src/org/chromium/mojo/bindings/BindingsHelper.java diff --git a/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Callbacks.java b/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Callbacks.java similarity index 100% rename from third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Callbacks.java rename to mojo/public/java/bindings/src/org/chromium/mojo/bindings/Callbacks.java diff --git a/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/ConnectionErrorHandler.java b/mojo/public/java/bindings/src/org/chromium/mojo/bindings/ConnectionErrorHandler.java similarity index 100% rename from third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/ConnectionErrorHandler.java rename to mojo/public/java/bindings/src/org/chromium/mojo/bindings/ConnectionErrorHandler.java diff --git a/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Connector.java b/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Connector.java similarity index 100% rename from third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Connector.java rename to mojo/public/java/bindings/src/org/chromium/mojo/bindings/Connector.java diff --git a/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/DataHeader.java b/mojo/public/java/bindings/src/org/chromium/mojo/bindings/DataHeader.java similarity index 100% rename from third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/DataHeader.java rename to mojo/public/java/bindings/src/org/chromium/mojo/bindings/DataHeader.java diff --git a/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Decoder.java b/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Decoder.java similarity index 100% rename from third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Decoder.java rename to mojo/public/java/bindings/src/org/chromium/mojo/bindings/Decoder.java diff --git a/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/DelegatingConnectionErrorHandler.java b/mojo/public/java/bindings/src/org/chromium/mojo/bindings/DelegatingConnectionErrorHandler.java similarity index 100% rename from third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/DelegatingConnectionErrorHandler.java rename to mojo/public/java/bindings/src/org/chromium/mojo/bindings/DelegatingConnectionErrorHandler.java diff --git a/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/DeserializationException.java b/mojo/public/java/bindings/src/org/chromium/mojo/bindings/DeserializationException.java similarity index 100% rename from third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/DeserializationException.java rename to mojo/public/java/bindings/src/org/chromium/mojo/bindings/DeserializationException.java diff --git a/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Encoder.java b/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Encoder.java similarity index 100% rename from third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Encoder.java rename to mojo/public/java/bindings/src/org/chromium/mojo/bindings/Encoder.java diff --git a/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/ExecutorFactory.java b/mojo/public/java/bindings/src/org/chromium/mojo/bindings/ExecutorFactory.java similarity index 100% rename from third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/ExecutorFactory.java rename to mojo/public/java/bindings/src/org/chromium/mojo/bindings/ExecutorFactory.java diff --git a/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/HandleOwner.java b/mojo/public/java/bindings/src/org/chromium/mojo/bindings/HandleOwner.java similarity index 100% rename from third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/HandleOwner.java rename to mojo/public/java/bindings/src/org/chromium/mojo/bindings/HandleOwner.java diff --git a/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Interface.java b/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Interface.java similarity index 100% rename from third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Interface.java rename to mojo/public/java/bindings/src/org/chromium/mojo/bindings/Interface.java diff --git a/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/InterfaceControlMessagesHelper.java b/mojo/public/java/bindings/src/org/chromium/mojo/bindings/InterfaceControlMessagesHelper.java similarity index 100% rename from third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/InterfaceControlMessagesHelper.java rename to mojo/public/java/bindings/src/org/chromium/mojo/bindings/InterfaceControlMessagesHelper.java diff --git a/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/InterfaceRequest.java b/mojo/public/java/bindings/src/org/chromium/mojo/bindings/InterfaceRequest.java similarity index 100% rename from third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/InterfaceRequest.java rename to mojo/public/java/bindings/src/org/chromium/mojo/bindings/InterfaceRequest.java diff --git a/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Message.java b/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Message.java similarity index 100% rename from third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Message.java rename to mojo/public/java/bindings/src/org/chromium/mojo/bindings/Message.java diff --git a/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/MessageHeader.java b/mojo/public/java/bindings/src/org/chromium/mojo/bindings/MessageHeader.java similarity index 100% rename from third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/MessageHeader.java rename to mojo/public/java/bindings/src/org/chromium/mojo/bindings/MessageHeader.java diff --git a/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/MessageReceiver.java b/mojo/public/java/bindings/src/org/chromium/mojo/bindings/MessageReceiver.java similarity index 100% rename from third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/MessageReceiver.java rename to mojo/public/java/bindings/src/org/chromium/mojo/bindings/MessageReceiver.java diff --git a/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/MessageReceiverWithResponder.java b/mojo/public/java/bindings/src/org/chromium/mojo/bindings/MessageReceiverWithResponder.java similarity index 100% rename from third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/MessageReceiverWithResponder.java rename to mojo/public/java/bindings/src/org/chromium/mojo/bindings/MessageReceiverWithResponder.java diff --git a/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Router.java b/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Router.java similarity index 100% rename from third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Router.java rename to mojo/public/java/bindings/src/org/chromium/mojo/bindings/Router.java diff --git a/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/RouterImpl.java b/mojo/public/java/bindings/src/org/chromium/mojo/bindings/RouterImpl.java similarity index 100% rename from third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/RouterImpl.java rename to mojo/public/java/bindings/src/org/chromium/mojo/bindings/RouterImpl.java diff --git a/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/SerializationException.java b/mojo/public/java/bindings/src/org/chromium/mojo/bindings/SerializationException.java similarity index 100% rename from third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/SerializationException.java rename to mojo/public/java/bindings/src/org/chromium/mojo/bindings/SerializationException.java diff --git a/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/ServiceMessage.java b/mojo/public/java/bindings/src/org/chromium/mojo/bindings/ServiceMessage.java similarity index 100% rename from third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/ServiceMessage.java rename to mojo/public/java/bindings/src/org/chromium/mojo/bindings/ServiceMessage.java diff --git a/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/SideEffectFreeCloseable.java b/mojo/public/java/bindings/src/org/chromium/mojo/bindings/SideEffectFreeCloseable.java similarity index 100% rename from third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/SideEffectFreeCloseable.java rename to mojo/public/java/bindings/src/org/chromium/mojo/bindings/SideEffectFreeCloseable.java diff --git a/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Struct.java b/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Struct.java similarity index 100% rename from third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Struct.java rename to mojo/public/java/bindings/src/org/chromium/mojo/bindings/Struct.java diff --git a/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Union.java b/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Union.java similarity index 100% rename from third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Union.java rename to mojo/public/java/bindings/src/org/chromium/mojo/bindings/Union.java diff --git a/third_party/mojo/src/mojo/public/java/system/src/org/chromium/mojo/system/AsyncWaiter.java b/mojo/public/java/system/src/org/chromium/mojo/system/AsyncWaiter.java similarity index 100% rename from third_party/mojo/src/mojo/public/java/system/src/org/chromium/mojo/system/AsyncWaiter.java rename to mojo/public/java/system/src/org/chromium/mojo/system/AsyncWaiter.java diff --git a/third_party/mojo/src/mojo/public/java/system/src/org/chromium/mojo/system/Core.java b/mojo/public/java/system/src/org/chromium/mojo/system/Core.java similarity index 100% rename from third_party/mojo/src/mojo/public/java/system/src/org/chromium/mojo/system/Core.java rename to mojo/public/java/system/src/org/chromium/mojo/system/Core.java diff --git a/third_party/mojo/src/mojo/public/java/system/src/org/chromium/mojo/system/DataPipe.java b/mojo/public/java/system/src/org/chromium/mojo/system/DataPipe.java similarity index 100% rename from third_party/mojo/src/mojo/public/java/system/src/org/chromium/mojo/system/DataPipe.java rename to mojo/public/java/system/src/org/chromium/mojo/system/DataPipe.java diff --git a/third_party/mojo/src/mojo/public/java/system/src/org/chromium/mojo/system/Flags.java b/mojo/public/java/system/src/org/chromium/mojo/system/Flags.java similarity index 100% rename from third_party/mojo/src/mojo/public/java/system/src/org/chromium/mojo/system/Flags.java rename to mojo/public/java/system/src/org/chromium/mojo/system/Flags.java diff --git a/third_party/mojo/src/mojo/public/java/system/src/org/chromium/mojo/system/Handle.java b/mojo/public/java/system/src/org/chromium/mojo/system/Handle.java similarity index 100% rename from third_party/mojo/src/mojo/public/java/system/src/org/chromium/mojo/system/Handle.java rename to mojo/public/java/system/src/org/chromium/mojo/system/Handle.java diff --git a/third_party/mojo/src/mojo/public/java/system/src/org/chromium/mojo/system/InvalidHandle.java b/mojo/public/java/system/src/org/chromium/mojo/system/InvalidHandle.java similarity index 100% rename from third_party/mojo/src/mojo/public/java/system/src/org/chromium/mojo/system/InvalidHandle.java rename to mojo/public/java/system/src/org/chromium/mojo/system/InvalidHandle.java diff --git a/third_party/mojo/src/mojo/public/java/system/src/org/chromium/mojo/system/MessagePipeHandle.java b/mojo/public/java/system/src/org/chromium/mojo/system/MessagePipeHandle.java similarity index 100% rename from third_party/mojo/src/mojo/public/java/system/src/org/chromium/mojo/system/MessagePipeHandle.java rename to mojo/public/java/system/src/org/chromium/mojo/system/MessagePipeHandle.java diff --git a/third_party/mojo/src/mojo/public/java/system/src/org/chromium/mojo/system/MojoException.java b/mojo/public/java/system/src/org/chromium/mojo/system/MojoException.java similarity index 100% rename from third_party/mojo/src/mojo/public/java/system/src/org/chromium/mojo/system/MojoException.java rename to mojo/public/java/system/src/org/chromium/mojo/system/MojoException.java diff --git a/third_party/mojo/src/mojo/public/java/system/src/org/chromium/mojo/system/MojoResult.java b/mojo/public/java/system/src/org/chromium/mojo/system/MojoResult.java similarity index 100% rename from third_party/mojo/src/mojo/public/java/system/src/org/chromium/mojo/system/MojoResult.java rename to mojo/public/java/system/src/org/chromium/mojo/system/MojoResult.java diff --git a/third_party/mojo/src/mojo/public/java/system/src/org/chromium/mojo/system/Pair.java b/mojo/public/java/system/src/org/chromium/mojo/system/Pair.java similarity index 100% rename from third_party/mojo/src/mojo/public/java/system/src/org/chromium/mojo/system/Pair.java rename to mojo/public/java/system/src/org/chromium/mojo/system/Pair.java diff --git a/third_party/mojo/src/mojo/public/java/system/src/org/chromium/mojo/system/ResultAnd.java b/mojo/public/java/system/src/org/chromium/mojo/system/ResultAnd.java similarity index 100% rename from third_party/mojo/src/mojo/public/java/system/src/org/chromium/mojo/system/ResultAnd.java rename to mojo/public/java/system/src/org/chromium/mojo/system/ResultAnd.java diff --git a/third_party/mojo/src/mojo/public/java/system/src/org/chromium/mojo/system/RunLoop.java b/mojo/public/java/system/src/org/chromium/mojo/system/RunLoop.java similarity index 100% rename from third_party/mojo/src/mojo/public/java/system/src/org/chromium/mojo/system/RunLoop.java rename to mojo/public/java/system/src/org/chromium/mojo/system/RunLoop.java diff --git a/third_party/mojo/src/mojo/public/java/system/src/org/chromium/mojo/system/SharedBufferHandle.java b/mojo/public/java/system/src/org/chromium/mojo/system/SharedBufferHandle.java similarity index 100% rename from third_party/mojo/src/mojo/public/java/system/src/org/chromium/mojo/system/SharedBufferHandle.java rename to mojo/public/java/system/src/org/chromium/mojo/system/SharedBufferHandle.java diff --git a/third_party/mojo/src/mojo/public/java/system/src/org/chromium/mojo/system/UntypedHandle.java b/mojo/public/java/system/src/org/chromium/mojo/system/UntypedHandle.java similarity index 100% rename from third_party/mojo/src/mojo/public/java/system/src/org/chromium/mojo/system/UntypedHandle.java rename to mojo/public/java/system/src/org/chromium/mojo/system/UntypedHandle.java diff --git a/third_party/mojo/src/mojo/public/js/BUILD.gn b/mojo/public/js/BUILD.gn similarity index 100% rename from third_party/mojo/src/mojo/public/js/BUILD.gn rename to mojo/public/js/BUILD.gn diff --git a/third_party/mojo/src/mojo/public/js/bindings.js b/mojo/public/js/bindings.js similarity index 100% rename from third_party/mojo/src/mojo/public/js/bindings.js rename to mojo/public/js/bindings.js diff --git a/third_party/mojo/src/mojo/public/js/buffer.js b/mojo/public/js/buffer.js similarity index 100% rename from third_party/mojo/src/mojo/public/js/buffer.js rename to mojo/public/js/buffer.js diff --git a/third_party/mojo/src/mojo/public/js/codec.js b/mojo/public/js/codec.js similarity index 100% rename from third_party/mojo/src/mojo/public/js/codec.js rename to mojo/public/js/codec.js diff --git a/third_party/mojo/src/mojo/public/js/codec_unittests.js b/mojo/public/js/codec_unittests.js similarity index 100% rename from third_party/mojo/src/mojo/public/js/codec_unittests.js rename to mojo/public/js/codec_unittests.js diff --git a/third_party/mojo/src/mojo/public/js/connection.js b/mojo/public/js/connection.js similarity index 100% rename from third_party/mojo/src/mojo/public/js/connection.js rename to mojo/public/js/connection.js diff --git a/third_party/mojo/src/mojo/public/js/connector.js b/mojo/public/js/connector.js similarity index 100% rename from third_party/mojo/src/mojo/public/js/connector.js rename to mojo/public/js/connector.js diff --git a/third_party/mojo/src/mojo/public/js/constants.cc b/mojo/public/js/constants.cc similarity index 92% rename from third_party/mojo/src/mojo/public/js/constants.cc rename to mojo/public/js/constants.cc index ab680ef1fa1054..d29f5cb3703ce5 100644 --- a/third_party/mojo/src/mojo/public/js/constants.cc +++ b/mojo/public/js/constants.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 "third_party/mojo/src/mojo/public/js/constants.h" +#include "mojo/public/js/constants.h" namespace mojo { diff --git a/third_party/mojo/src/mojo/public/js/constants.h b/mojo/public/js/constants.h similarity index 100% rename from third_party/mojo/src/mojo/public/js/constants.h rename to mojo/public/js/constants.h diff --git a/third_party/mojo/src/mojo/public/js/core.js b/mojo/public/js/core.js similarity index 100% rename from third_party/mojo/src/mojo/public/js/core.js rename to mojo/public/js/core.js diff --git a/third_party/mojo/src/mojo/public/js/core_unittests.js b/mojo/public/js/core_unittests.js similarity index 100% rename from third_party/mojo/src/mojo/public/js/core_unittests.js rename to mojo/public/js/core_unittests.js diff --git a/third_party/mojo/src/mojo/public/js/router.js b/mojo/public/js/router.js similarity index 100% rename from third_party/mojo/src/mojo/public/js/router.js rename to mojo/public/js/router.js diff --git a/third_party/mojo/src/mojo/public/js/struct_unittests.js b/mojo/public/js/struct_unittests.js similarity index 100% rename from third_party/mojo/src/mojo/public/js/struct_unittests.js rename to mojo/public/js/struct_unittests.js diff --git a/third_party/mojo/src/mojo/public/js/support.js b/mojo/public/js/support.js similarity index 100% rename from third_party/mojo/src/mojo/public/js/support.js rename to mojo/public/js/support.js diff --git a/third_party/mojo/src/mojo/public/js/test/validation_test_input_parser.js b/mojo/public/js/test/validation_test_input_parser.js similarity index 100% rename from third_party/mojo/src/mojo/public/js/test/validation_test_input_parser.js rename to mojo/public/js/test/validation_test_input_parser.js diff --git a/third_party/mojo/src/mojo/public/js/threading.js b/mojo/public/js/threading.js similarity index 100% rename from third_party/mojo/src/mojo/public/js/threading.js rename to mojo/public/js/threading.js diff --git a/third_party/mojo/src/mojo/public/js/unicode.js b/mojo/public/js/unicode.js similarity index 100% rename from third_party/mojo/src/mojo/public/js/unicode.js rename to mojo/public/js/unicode.js diff --git a/third_party/mojo/src/mojo/public/js/union_unittests.js b/mojo/public/js/union_unittests.js similarity index 100% rename from third_party/mojo/src/mojo/public/js/union_unittests.js rename to mojo/public/js/union_unittests.js diff --git a/third_party/mojo/src/mojo/public/js/validation_unittests.js b/mojo/public/js/validation_unittests.js similarity index 100% rename from third_party/mojo/src/mojo/public/js/validation_unittests.js rename to mojo/public/js/validation_unittests.js diff --git a/third_party/mojo/src/mojo/public/js/validator.js b/mojo/public/js/validator.js similarity index 100% rename from third_party/mojo/src/mojo/public/js/validator.js rename to mojo/public/js/validator.js diff --git a/mojo/public/mojo.gni b/mojo/public/mojo.gni deleted file mode 100644 index d7bf744098e954..00000000000000 --- a/mojo/public/mojo.gni +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 2014 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -# TODO(dpranke): Remove all of these variables. - -mojo_sdk_root = "//third_party/mojo/src" -mojo_network_service_root = "//mojo/services" -mojo_use_prebuilt_mojo_shell = false -mojo_use_prebuilt_network_service = false -mojo_use_dart_apptest_framework = false -mojo_use_application_in_sdk = false -mojo_use_network_in_sdk = false -mojo_root = get_path_info("../../third_party/mojo/src/", "abspath") diff --git a/mojo/public/mojo_application.gni b/mojo/public/mojo_application.gni index 1609b0250a3174..72398b758bd415 100644 --- a/mojo/public/mojo_application.gni +++ b/mojo/public/mojo_application.gni @@ -3,7 +3,6 @@ # found in the LICENSE file. import("//build/toolchain/toolchain.gni") -import("mojo.gni") # Generate a binary Mojo application in a self-named directory. # Application resources are copied to a "resources" directory alongside the app. @@ -83,24 +82,11 @@ template("mojo_native_application") { data_deps += invoker.data_deps } - # Copy any necessary prebuilt artifacts. - if (mojo_use_prebuilt_mojo_shell) { - data_deps += - [ rebase_path("mojo/public/tools:copy_mojo_shell", ".", mojo_root) ] - } - if (mojo_use_prebuilt_network_service) { - data_deps += [ rebase_path("mojo/public/tools:copy_network_service", - ".", - mojo_root) ] - } - - deps = rebase_path([ - "mojo/public/gles2:for_shared_library", - "mojo/public/c/system:for_shared_library", - ], - ".", - mojo_root) - deps += [ "//mojo/platform_handle:for_shared_library" ] + deps = [ + "//mojo/platform_handle:for_shared_library", + "//mojo/public/gles2:for_shared_library", + "//mojo/public/c/system:for_shared_library", + ] deps += mojo_deps if (defined(invoker.public_deps)) { @@ -200,23 +186,11 @@ template("mojo_native_application") { data_deps = invoker.data_deps } - # Copy any necessary prebuilt artifacts. - if (mojo_use_prebuilt_mojo_shell) { - data_deps += - [ rebase_path("mojo/public/tools:copy_mojo_shell", ".", mojo_root) ] - } - if (mojo_use_prebuilt_network_service) { - data_deps += [ rebase_path("mojo/public/tools:copy_network_service", - ".", - mojo_root) ] - } + deps = [ + "//mojo/public/c/system", + "//mojo/public/platform/nacl:system", + ] - deps = rebase_path([ - "mojo/public/c/system", - "mojo/public/platform/nacl:system", - ], - ".", - mojo_root) deps += mojo_deps if (defined(invoker.public_deps)) { public_deps = invoker.public_deps @@ -260,7 +234,7 @@ template("mojo_native_application") { visibility = invoker.visibility } - script = rebase_path("mojo/public/tools/prepend.py", ".", mojo_root) + script = "//mojo/public/tools/prepend.py" input_path = "${root_out_dir}/${nexe_name}" inputs = [ @@ -361,7 +335,7 @@ if (is_android) { } action(target_name) { - script = rebase_path("mojo/public/tools/prepend.py", ".", mojo_root) + script = "//mojo/public/tools/prepend.py" base_target_name = target_name if (defined(invoker.output_name)) { diff --git a/third_party/mojo/src/mojo/public/mojo_sdk.gni b/mojo/public/mojo_sdk.gni similarity index 78% rename from third_party/mojo/src/mojo/public/mojo_sdk.gni rename to mojo/public/mojo_sdk.gni index 408c14a16baced..1c5d9d38627f54 100644 --- a/third_party/mojo/src/mojo/public/mojo_sdk.gni +++ b/mojo/public/mojo_sdk.gni @@ -2,12 +2,6 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -# The absolute path to the directory containing the mojo public SDK (i.e., the -# directory containing mojo/public). The build files within the Mojo public -# SDK use this variable to allow themselves to be parameterized by the location -# of the public SDK within a client repo. -mojo_root = get_path_info("../..", "abspath") - # Takes as input a "source_set" that includes dependencies that are relative to # the parent directory of the Mojo public SDK (given in |mojo_sdk_deps|). # Generates a source_set that has the mojo_sdk_deps added as ordinary deps @@ -49,12 +43,12 @@ template("mojo_sdk_source_set") { } else { visibility = [ "*" ] } - if (defined(invoker.mojo_sdk_visibility)) { - foreach(sdk_target, invoker.mojo_sdk_visibility) { - # Check that the SDK target was not mistakenly given as an absolute + if (defined(invoker.mojo_edk_visibility)) { + foreach(edk_target, invoker.mojo_edk_visibility) { + # Check that the EDK target was not mistakenly given as an absolute # path. - assert(get_path_info(sdk_target, "abspath") != sdk_target) - visibility += [ rebase_path(sdk_target, ".", mojo_root) ] + assert(get_path_info(edk_target, "abspath") != edk_target) + visibility += [ rebase_path(edk_target, ".", "//third_party/mojo/src") ] } } @@ -106,11 +100,18 @@ template("mojo_sdk_source_set") { public_deps += [ dep ] } } + if (defined(invoker.mojo_edk_public_deps)) { + foreach(edk_dep, invoker.mojo_edk_public_deps) { + # Check that the EDK dep was not mistakenly given as an absolute path. + assert(get_path_info(edk_dep, "abspath") != edk_dep) + public_deps += [ rebase_path(edk_dep, ".", "//third_party/mojo/src") ] + } + } if (defined(invoker.mojo_sdk_public_deps)) { foreach(sdk_dep, invoker.mojo_sdk_public_deps) { # Check that the SDK dep was not mistakenly given as an absolute path. assert(get_path_info(sdk_dep, "abspath") != sdk_dep) - public_deps += [ rebase_path(sdk_dep, ".", mojo_root) ] + public_deps += [ rebase_path(sdk_dep, ".", "//") ] } } @@ -129,11 +130,18 @@ template("mojo_sdk_source_set") { deps += [ dep ] } } + if (defined(invoker.mojo_edk_deps)) { + foreach(edk_dep, invoker.mojo_edk_deps) { + # Check that the EDK dep was not mistakenly given as an absolute path. + assert(get_path_info(edk_dep, "abspath") != edk_dep) + deps += [ rebase_path(edk_dep, ".", "//third_party/mojo/src") ] + } + } if (defined(invoker.mojo_sdk_deps)) { foreach(sdk_dep, invoker.mojo_sdk_deps) { # Check that the SDK dep was not mistakenly given as an absolute path. assert(get_path_info(sdk_dep, "abspath") != sdk_dep) - deps += [ rebase_path(sdk_dep, ".", mojo_root) ] + deps += [ rebase_path(sdk_dep, ".", "//") ] } } diff --git a/third_party/mojo/src/mojo/public/platform/nacl/BUILD.gn b/mojo/public/platform/nacl/BUILD.gn similarity index 100% rename from third_party/mojo/src/mojo/public/platform/nacl/BUILD.gn rename to mojo/public/platform/nacl/BUILD.gn diff --git a/third_party/mojo/src/mojo/public/platform/nacl/DEPS b/mojo/public/platform/nacl/DEPS similarity index 100% rename from third_party/mojo/src/mojo/public/platform/nacl/DEPS rename to mojo/public/platform/nacl/DEPS diff --git a/third_party/mojo/src/mojo/public/platform/nacl/libmojo.cc b/mojo/public/platform/nacl/libmojo.cc similarity index 98% rename from third_party/mojo/src/mojo/public/platform/nacl/libmojo.cc rename to mojo/public/platform/nacl/libmojo.cc index e4d9f0067ec51f..de0b495f65116e 100644 --- a/third_party/mojo/src/mojo/public/platform/nacl/libmojo.cc +++ b/mojo/public/platform/nacl/libmojo.cc @@ -5,12 +5,12 @@ // WARNING this file was generated by generate_nacl_bindings.py // Do not edit by hand. +#include "mojo/public/c/system/core.h" +#include "mojo/public/platform/nacl/mojo_irt.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 "native_client/src/untrusted/irt/irt.h" -#include "third_party/mojo/src/mojo/public/c/system/core.h" -#include "third_party/mojo/src/mojo/public/platform/nacl/mojo_irt.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/third_party/mojo/src/mojo/public/platform/nacl/mojo_initial_handle.h b/mojo/public/platform/nacl/mojo_initial_handle.h similarity index 54% rename from third_party/mojo/src/mojo/public/platform/nacl/mojo_initial_handle.h rename to mojo/public/platform/nacl/mojo_initial_handle.h index 886f3d7b78064d..e02146cb6bb4f3 100644 --- a/third_party/mojo/src/mojo/public/platform/nacl/mojo_initial_handle.h +++ b/mojo/public/platform/nacl/mojo_initial_handle.h @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_PLATFORM_NACL_MOJO_INITIAL_HANDLE_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_PLATFORM_NACL_MOJO_INITIAL_HANDLE_H_ +#ifndef MOJO_PUBLIC_PLATFORM_NACL_MOJO_INITIAL_HANDLE_H_ +#define MOJO_PUBLIC_PLATFORM_NACL_MOJO_INITIAL_HANDLE_H_ -#include "third_party/mojo/src/mojo/public/c/system/types.h" +#include "mojo/public/c/system/types.h" // Provides a MojoHandle that allows untrusted code to communicate with Mojo // interfaces outside the sandbox or in other processes. MojoResult _MojoGetInitialHandle(MojoHandle* out_handle); -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_PLATFORM_NACL_MOJO_INITIAL_HANDLE_H_ +#endif // MOJO_PUBLIC_PLATFORM_NACL_MOJO_INITIAL_HANDLE_H_ diff --git a/third_party/mojo/src/mojo/public/platform/nacl/mojo_irt.h b/mojo/public/platform/nacl/mojo_irt.h similarity index 89% rename from third_party/mojo/src/mojo/public/platform/nacl/mojo_irt.h rename to mojo/public/platform/nacl/mojo_irt.h index 61aa443b8a0a46..db3a180ffd3337 100644 --- a/third_party/mojo/src/mojo/public/platform/nacl/mojo_irt.h +++ b/mojo/public/platform/nacl/mojo_irt.h @@ -5,13 +5,13 @@ // WARNING this file was generated by generate_nacl_bindings.py // Do not edit by hand. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_PLATFORM_NACL_MOJO_IRT_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_PLATFORM_NACL_MOJO_IRT_H_ +#ifndef MOJO_PUBLIC_PLATFORM_NACL_MOJO_IRT_H_ +#define MOJO_PUBLIC_PLATFORM_NACL_MOJO_IRT_H_ -#include "third_party/mojo/src/mojo/public/c/system/buffer.h" -#include "third_party/mojo/src/mojo/public/c/system/data_pipe.h" -#include "third_party/mojo/src/mojo/public/c/system/message_pipe.h" -#include "third_party/mojo/src/mojo/public/c/system/types.h" +#include "mojo/public/c/system/buffer.h" +#include "mojo/public/c/system/data_pipe.h" +#include "mojo/public/c/system/message_pipe.h" +#include "mojo/public/c/system/types.h" #define NACL_IRT_MOJO_v0_1 "nacl-irt-mojo-0.1" @@ -97,4 +97,4 @@ size_t mojo_irt_query(const char* interface_ident, } #endif -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_PLATFORM_NACL_MOJO_IRT_H_ +#endif // MOJO_PUBLIC_PLATFORM_NACL_MOJO_IRT_H_ diff --git a/third_party/mojo/src/mojo/public/platform/nacl/mojo_main_thunk.cc b/mojo/public/platform/nacl/mojo_main_thunk.cc similarity index 65% rename from third_party/mojo/src/mojo/public/platform/nacl/mojo_main_thunk.cc rename to mojo/public/platform/nacl/mojo_main_thunk.cc index a9d574c306354f..7cb5b52d993b47 100644 --- a/third_party/mojo/src/mojo/public/platform/nacl/mojo_main_thunk.cc +++ b/mojo/public/platform/nacl/mojo_main_thunk.cc @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "third_party/mojo/src/mojo/public/c/system/main.h" -#include "third_party/mojo/src/mojo/public/platform/nacl/mojo_initial_handle.h" +#include "mojo/public/c/system/main.h" +#include "mojo/public/platform/nacl/mojo_initial_handle.h" int main() { MojoHandle handle; diff --git a/third_party/mojo/src/mojo/public/platform/native/BUILD.gn b/mojo/public/platform/native/BUILD.gn similarity index 100% rename from third_party/mojo/src/mojo/public/platform/native/BUILD.gn rename to mojo/public/platform/native/BUILD.gn diff --git a/third_party/mojo/src/mojo/public/platform/native/gles2_impl_chromium_extension_thunks.cc b/mojo/public/platform/native/gles2_impl_chromium_extension_thunks.cc similarity index 78% rename from third_party/mojo/src/mojo/public/platform/native/gles2_impl_chromium_extension_thunks.cc rename to mojo/public/platform/native/gles2_impl_chromium_extension_thunks.cc index 8caddb9621a843..0296d79f319bad 100644 --- a/third_party/mojo/src/mojo/public/platform/native/gles2_impl_chromium_extension_thunks.cc +++ b/mojo/public/platform/native/gles2_impl_chromium_extension_thunks.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "third_party/mojo/src/mojo/public/platform/native/gles2_impl_chromium_extension_thunks.h" +#include "mojo/public/platform/native/gles2_impl_chromium_extension_thunks.h" #include -#include "third_party/mojo/src/mojo/public/platform/native/thunk_export.h" +#include "mojo/public/platform/native/thunk_export.h" extern "C" { static MojoGLES2ImplChromiumExtensionThunks g_impl_chromium_extension_thunks = {0}; @@ -16,7 +16,7 @@ static MojoGLES2ImplChromiumExtensionThunks g_impl_chromium_extension_thunks = { assert(g_impl_chromium_extension_thunks.Function); \ return g_impl_chromium_extension_thunks.Function ARGUMENTS; \ } -#include "third_party/mojo/src/mojo/public/c/gles2/gles2_call_visitor_chromium_extension_autogen.h" +#include "mojo/public/c/gles2/gles2_call_visitor_chromium_extension_autogen.h" #undef VISIT_GL_CALL extern "C" THUNK_EXPORT size_t MojoSetGLES2ImplChromiumExtensionThunks( diff --git a/third_party/mojo/src/mojo/public/platform/native/gles2_impl_chromium_extension_thunks.h b/mojo/public/platform/native/gles2_impl_chromium_extension_thunks.h similarity index 69% rename from third_party/mojo/src/mojo/public/platform/native/gles2_impl_chromium_extension_thunks.h rename to mojo/public/platform/native/gles2_impl_chromium_extension_thunks.h index 5bfa0bab3cc0b5..adac8ea6c8883c 100644 --- a/third_party/mojo/src/mojo/public/platform/native/gles2_impl_chromium_extension_thunks.h +++ b/mojo/public/platform/native/gles2_impl_chromium_extension_thunks.h @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_PLATFORM_NATIVE_GLES2_IMPL_CHROMIUM_EXTENSION_THUNKS_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_PLATFORM_NATIVE_GLES2_IMPL_CHROMIUM_EXTENSION_THUNKS_H_ +#ifndef MOJO_PUBLIC_PLATFORM_NATIVE_GLES2_IMPL_CHROMIUM_EXTENSION_THUNKS_H_ +#define MOJO_PUBLIC_PLATFORM_NATIVE_GLES2_IMPL_CHROMIUM_EXTENSION_THUNKS_H_ #include -#include "third_party/mojo/src/mojo/public/c/gles2/chromium_extension.h" +#include "mojo/public/c/gles2/chromium_extension.h" // Specifies the API for the GLES2 CHROMIUM extension. #pragma pack(push, 8) @@ -16,7 +16,7 @@ struct MojoGLES2ImplChromiumExtensionThunks { #define VISIT_GL_CALL(Function, ReturnType, PARAMETERS, ARGUMENTS) \ ReturnType(GL_APIENTRY *Function) PARAMETERS; -#include "third_party/mojo/src/mojo/public/c/gles2/gles2_call_visitor_chromium_extension_autogen.h" +#include "mojo/public/c/gles2/gles2_call_visitor_chromium_extension_autogen.h" #undef VISIT_GL_CALL }; #pragma pack(pop) @@ -28,7 +28,7 @@ MojoMakeGLES2ImplChromiumExtensionThunks() { MojoGLES2ImplChromiumExtensionThunks gles2_impl_chromium_extension_thunks = { sizeof(MojoGLES2ImplChromiumExtensionThunks), #define VISIT_GL_CALL(Function, ReturnType, PARAMETERS, ARGUMENTS) gl##Function, -#include "third_party/mojo/src/mojo/public/c/gles2/gles2_call_visitor_chromium_extension_autogen.h" +#include "mojo/public/c/gles2/gles2_call_visitor_chromium_extension_autogen.h" #undef VISIT_GL_CALL }; @@ -41,4 +41,4 @@ MojoMakeGLES2ImplChromiumExtensionThunks() { typedef size_t (*MojoSetGLES2ImplChromiumExtensionThunksFn)( const MojoGLES2ImplChromiumExtensionThunks* thunks); -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_PLATFORM_NATIVE_GLES2_IMPL_CHROMIUM_EXTENSION_THUNKS_H_ +#endif // MOJO_PUBLIC_PLATFORM_NATIVE_GLES2_IMPL_CHROMIUM_EXTENSION_THUNKS_H_ diff --git a/third_party/mojo/src/mojo/public/platform/native/gles2_impl_thunks.cc b/mojo/public/platform/native/gles2_impl_thunks.cc similarity index 77% rename from third_party/mojo/src/mojo/public/platform/native/gles2_impl_thunks.cc rename to mojo/public/platform/native/gles2_impl_thunks.cc index a11704254313b1..1acf5a4c7581d2 100644 --- a/third_party/mojo/src/mojo/public/platform/native/gles2_impl_thunks.cc +++ b/mojo/public/platform/native/gles2_impl_thunks.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "third_party/mojo/src/mojo/public/platform/native/gles2_impl_thunks.h" +#include "mojo/public/platform/native/gles2_impl_thunks.h" #include -#include "third_party/mojo/src/mojo/public/platform/native/thunk_export.h" +#include "mojo/public/platform/native/thunk_export.h" extern "C" { static MojoGLES2ImplThunks g_impl_thunks = {0}; @@ -16,7 +16,7 @@ static MojoGLES2ImplThunks g_impl_thunks = {0}; assert(g_impl_thunks.Function); \ return g_impl_thunks.Function ARGUMENTS; \ } -#include "third_party/mojo/src/mojo/public/c/gles2/gles2_call_visitor_autogen.h" +#include "mojo/public/c/gles2/gles2_call_visitor_autogen.h" #undef VISIT_GL_CALL extern "C" THUNK_EXPORT size_t diff --git a/third_party/mojo/src/mojo/public/platform/native/gles2_impl_thunks.h b/mojo/public/platform/native/gles2_impl_thunks.h similarity index 76% rename from third_party/mojo/src/mojo/public/platform/native/gles2_impl_thunks.h rename to mojo/public/platform/native/gles2_impl_thunks.h index 0d6f99a60ae6fc..47765f2ffa24e8 100644 --- a/third_party/mojo/src/mojo/public/platform/native/gles2_impl_thunks.h +++ b/mojo/public/platform/native/gles2_impl_thunks.h @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_PLATFORM_NATIVE_GLES2_IMPL_THUNKS_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_PLATFORM_NATIVE_GLES2_IMPL_THUNKS_H_ +#ifndef MOJO_PUBLIC_PLATFORM_NATIVE_GLES2_IMPL_THUNKS_H_ +#define MOJO_PUBLIC_PLATFORM_NATIVE_GLES2_IMPL_THUNKS_H_ #include -#include "third_party/mojo/src/mojo/public/c/gles2/gles2.h" +#include "mojo/public/c/gles2/gles2.h" // Like MojoGLES2ControlThunks, but specifies the frozen GLES2 API. Separated // out as MojoGLES2ControlThunks may be modified and added to, but this @@ -18,7 +18,7 @@ struct MojoGLES2ImplThunks { #define VISIT_GL_CALL(Function, ReturnType, PARAMETERS, ARGUMENTS) \ ReturnType(GL_APIENTRY *Function) PARAMETERS; -#include "third_party/mojo/src/mojo/public/c/gles2/gles2_call_visitor_autogen.h" +#include "mojo/public/c/gles2/gles2_call_visitor_autogen.h" #undef VISIT_GL_CALL }; #pragma pack(pop) @@ -29,7 +29,7 @@ inline MojoGLES2ImplThunks MojoMakeGLES2ImplThunks() { MojoGLES2ImplThunks gles2_impl_thunks = { sizeof(MojoGLES2ImplThunks), #define VISIT_GL_CALL(Function, ReturnType, PARAMETERS, ARGUMENTS) gl##Function, -#include "third_party/mojo/src/mojo/public/c/gles2/gles2_call_visitor_autogen.h" +#include "mojo/public/c/gles2/gles2_call_visitor_autogen.h" #undef VISIT_GL_CALL }; @@ -46,4 +46,4 @@ inline MojoGLES2ImplThunks MojoMakeGLES2ImplThunks() { typedef size_t (*MojoSetGLES2ImplThunksFn)( const MojoGLES2ImplThunks* gles2_impl_thunks); -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_PLATFORM_NATIVE_GLES2_IMPL_THUNKS_H_ +#endif // MOJO_PUBLIC_PLATFORM_NATIVE_GLES2_IMPL_THUNKS_H_ diff --git a/third_party/mojo/src/mojo/public/platform/native/gles2_thunks.cc b/mojo/public/platform/native/gles2_thunks.cc similarity index 92% rename from third_party/mojo/src/mojo/public/platform/native/gles2_thunks.cc rename to mojo/public/platform/native/gles2_thunks.cc index 86f8ed79e60c66..b51de7686d8484 100644 --- a/third_party/mojo/src/mojo/public/platform/native/gles2_thunks.cc +++ b/mojo/public/platform/native/gles2_thunks.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "third_party/mojo/src/mojo/public/platform/native/gles2_thunks.h" +#include "mojo/public/platform/native/gles2_thunks.h" #include -#include "third_party/mojo/src/mojo/public/platform/native/thunk_export.h" +#include "mojo/public/platform/native/thunk_export.h" extern "C" { diff --git a/third_party/mojo/src/mojo/public/platform/native/gles2_thunks.h b/mojo/public/platform/native/gles2_thunks.h similarity index 89% rename from third_party/mojo/src/mojo/public/platform/native/gles2_thunks.h rename to mojo/public/platform/native/gles2_thunks.h index 995c8c9fb7d997..c9d30f5e75be3b 100644 --- a/third_party/mojo/src/mojo/public/platform/native/gles2_thunks.h +++ b/mojo/public/platform/native/gles2_thunks.h @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_PLATFORM_NATIVE_GLES2_THUNKS_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_PLATFORM_NATIVE_GLES2_THUNKS_H_ +#ifndef MOJO_PUBLIC_PLATFORM_NATIVE_GLES2_THUNKS_H_ +#define MOJO_PUBLIC_PLATFORM_NATIVE_GLES2_THUNKS_H_ #include -#include "third_party/mojo/src/mojo/public/c/gles2/gles2.h" +#include "mojo/public/c/gles2/gles2.h" // Structure used to bind the interface which manipulates GLES2 surfaces to a // DSO to theose of the embedder. @@ -64,4 +64,4 @@ inline MojoGLES2ControlThunks MojoMakeGLES2ControlThunks() { typedef size_t (*MojoSetGLES2ControlThunksFn)( const MojoGLES2ControlThunks* gles2_control_thunks); -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_PLATFORM_NATIVE_GLES2_THUNKS_H_ +#endif // MOJO_PUBLIC_PLATFORM_NATIVE_GLES2_THUNKS_H_ diff --git a/third_party/mojo/src/mojo/public/platform/native/mgl_onscreen_thunks.c b/mojo/public/platform/native/mgl_onscreen_thunks.c similarity index 83% rename from third_party/mojo/src/mojo/public/platform/native/mgl_onscreen_thunks.c rename to mojo/public/platform/native/mgl_onscreen_thunks.c index 5b72fcd8d9703d..c41b583b6358c5 100644 --- a/third_party/mojo/src/mojo/public/platform/native/mgl_onscreen_thunks.c +++ b/mojo/public/platform/native/mgl_onscreen_thunks.c @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "third_party/mojo/src/mojo/public/platform/native/mgl_onscreen_thunks.h" +#include "mojo/public/platform/native/mgl_onscreen_thunks.h" #include -#include "third_party/mojo/src/mojo/public/platform/native/thunk_export.h" +#include "mojo/public/platform/native/thunk_export.h" static struct MGLOnscreenThunks g_onscreen_thunks = {0}; diff --git a/third_party/mojo/src/mojo/public/platform/native/mgl_onscreen_thunks.h b/mojo/public/platform/native/mgl_onscreen_thunks.h similarity index 83% rename from third_party/mojo/src/mojo/public/platform/native/mgl_onscreen_thunks.h rename to mojo/public/platform/native/mgl_onscreen_thunks.h index 74068dfdc44f11..40dcb807d373d8 100644 --- a/third_party/mojo/src/mojo/public/platform/native/mgl_onscreen_thunks.h +++ b/mojo/public/platform/native/mgl_onscreen_thunks.h @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_PLATFORM_NATIVE_MGL_ONSCREEN_THUNKS_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_PLATFORM_NATIVE_MGL_ONSCREEN_THUNKS_H_ +#ifndef MOJO_PUBLIC_PLATFORM_NATIVE_MGL_ONSCREEN_THUNKS_H_ +#define MOJO_PUBLIC_PLATFORM_NATIVE_MGL_ONSCREEN_THUNKS_H_ #include -#include "third_party/mojo/src/mojo/public/c/gpu/MGL/mgl_onscreen.h" +#include "mojo/public/c/gpu/MGL/mgl_onscreen.h" // Structure used to bind the interface which manipulates MGL contexts to a // DSO to theose of the embedder. @@ -43,4 +43,4 @@ inline struct MGLOnscreenThunks MojoMakeMGLOnscreenThunks() { typedef size_t (*MojoSetMGLOnscreenThunksFn)( const struct MGLOnscreenThunks* mgl_thunks); -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_PLATFORM_NATIVE_MGL_ONSCREEN_THUNKS_H_ +#endif // MOJO_PUBLIC_PLATFORM_NATIVE_MGL_ONSCREEN_THUNKS_H_ diff --git a/third_party/mojo/src/mojo/public/platform/native/mgl_thunks.c b/mojo/public/platform/native/mgl_thunks.c similarity index 90% rename from third_party/mojo/src/mojo/public/platform/native/mgl_thunks.c rename to mojo/public/platform/native/mgl_thunks.c index dccabe2ea3e4a2..2e8e9d84c37e3a 100644 --- a/third_party/mojo/src/mojo/public/platform/native/mgl_thunks.c +++ b/mojo/public/platform/native/mgl_thunks.c @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "third_party/mojo/src/mojo/public/platform/native/mgl_thunks.h" +#include "mojo/public/platform/native/mgl_thunks.h" #include -#include "third_party/mojo/src/mojo/public/platform/native/thunk_export.h" +#include "mojo/public/platform/native/thunk_export.h" static struct MGLThunks g_thunks = {0}; diff --git a/third_party/mojo/src/mojo/public/platform/native/mgl_thunks.h b/mojo/public/platform/native/mgl_thunks.h similarity index 87% rename from third_party/mojo/src/mojo/public/platform/native/mgl_thunks.h rename to mojo/public/platform/native/mgl_thunks.h index 48fb75d3b3b653..8a56474ea03227 100644 --- a/third_party/mojo/src/mojo/public/platform/native/mgl_thunks.h +++ b/mojo/public/platform/native/mgl_thunks.h @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_PLATFORM_NATIVE_MGL_THUNKS_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_PLATFORM_NATIVE_MGL_THUNKS_H_ +#ifndef MOJO_PUBLIC_PLATFORM_NATIVE_MGL_THUNKS_H_ +#define MOJO_PUBLIC_PLATFORM_NATIVE_MGL_THUNKS_H_ #include -#include "third_party/mojo/src/mojo/public/c/gpu/MGL/mgl.h" +#include "mojo/public/c/gpu/MGL/mgl.h" // Structure used to bind the interface which manipulates MGL contexts to a // DSO to theose of the embedder. @@ -53,4 +53,4 @@ inline struct MGLThunks MojoMakeMGLThunks() { // The contents of |mgl_thunks| are copied. typedef size_t (*MojoSetMGLThunksFn)(const struct MGLThunks* mgl_thunks); -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_PLATFORM_NATIVE_MGL_THUNKS_H_ +#endif // MOJO_PUBLIC_PLATFORM_NATIVE_MGL_THUNKS_H_ diff --git a/third_party/mojo/src/mojo/public/platform/native/system_thunks.cc b/mojo/public/platform/native/system_thunks.cc similarity index 97% rename from third_party/mojo/src/mojo/public/platform/native/system_thunks.cc rename to mojo/public/platform/native/system_thunks.cc index c1ec839cf4224c..ed3227f0dd2744 100644 --- a/third_party/mojo/src/mojo/public/platform/native/system_thunks.cc +++ b/mojo/public/platform/native/system_thunks.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "third_party/mojo/src/mojo/public/platform/native/system_thunks.h" +#include "mojo/public/platform/native/system_thunks.h" #include -#include "third_party/mojo/src/mojo/public/platform/native/thunk_export.h" +#include "mojo/public/platform/native/thunk_export.h" extern "C" { diff --git a/third_party/mojo/src/mojo/public/platform/native/system_thunks.h b/mojo/public/platform/native/system_thunks.h similarity index 95% rename from third_party/mojo/src/mojo/public/platform/native/system_thunks.h rename to mojo/public/platform/native/system_thunks.h index fcb4ddd8f58423..bb6ca96429ccd7 100644 --- a/third_party/mojo/src/mojo/public/platform/native/system_thunks.h +++ b/mojo/public/platform/native/system_thunks.h @@ -4,12 +4,12 @@ // Note: This header should be compilable as C. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_PLATFORM_NATIVE_SYSTEM_THUNKS_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_PLATFORM_NATIVE_SYSTEM_THUNKS_H_ +#ifndef MOJO_PUBLIC_PLATFORM_NATIVE_SYSTEM_THUNKS_H_ +#define MOJO_PUBLIC_PLATFORM_NATIVE_SYSTEM_THUNKS_H_ #include -#include "third_party/mojo/src/mojo/public/c/system/core.h" +#include "mojo/public/c/system/core.h" // The embedder needs to bind the basic Mojo Core functions of a DSO to those of // the embedder when loading a DSO that is dependent on mojo_system. @@ -143,4 +143,4 @@ inline MojoSystemThunks MojoMakeSystemThunks() { typedef size_t (*MojoSetSystemThunksFn)( const struct MojoSystemThunks* system_thunks); -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_PLATFORM_NATIVE_SYSTEM_THUNKS_H_ +#endif // MOJO_PUBLIC_PLATFORM_NATIVE_SYSTEM_THUNKS_H_ diff --git a/third_party/mojo/src/mojo/public/platform/native/thunk_export.h b/mojo/public/platform/native/thunk_export.h similarity index 66% rename from third_party/mojo/src/mojo/public/platform/native/thunk_export.h rename to mojo/public/platform/native/thunk_export.h index 9946c005355170..4ec7c85b046a19 100644 --- a/third_party/mojo/src/mojo/public/platform/native/thunk_export.h +++ b/mojo/public/platform/native/thunk_export.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_PLATFORM_NATIVE_THUNK_EXPORT_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_PLATFORM_NATIVE_THUNK_EXPORT_H_ +#ifndef MOJO_PUBLIC_PLATFORM_NATIVE_THUNK_EXPORT_H_ +#define MOJO_PUBLIC_PLATFORM_NATIVE_THUNK_EXPORT_H_ // Call this function by looking inside the resulting shared object and // grabbing the symbol manually. @@ -15,4 +15,4 @@ #define THUNK_EXPORT __attribute__((visibility("default"))) #endif -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_PLATFORM_NATIVE_THUNK_EXPORT_H_ +#endif // MOJO_PUBLIC_PLATFORM_NATIVE_THUNK_EXPORT_H_ diff --git a/third_party/mojo/src/mojo/public/tests/test_support_private.cc b/mojo/public/tests/test_support_private.cc similarity index 96% rename from third_party/mojo/src/mojo/public/tests/test_support_private.cc rename to mojo/public/tests/test_support_private.cc index 7035eb7a490eb7..00819846c08168 100644 --- a/third_party/mojo/src/mojo/public/tests/test_support_private.cc +++ b/mojo/public/tests/test_support_private.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 "third_party/mojo/src/mojo/public/tests/test_support_private.h" +#include "mojo/public/tests/test_support_private.h" #include #include diff --git a/third_party/mojo/src/mojo/public/tests/test_support_private.h b/mojo/public/tests/test_support_private.h similarity index 76% rename from third_party/mojo/src/mojo/public/tests/test_support_private.h rename to mojo/public/tests/test_support_private.h index 6a8d1382116d8b..d72e15807810bd 100644 --- a/third_party/mojo/src/mojo/public/tests/test_support_private.h +++ b/mojo/public/tests/test_support_private.h @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_TESTS_TEST_SUPPORT_PRIVATE_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_TESTS_TEST_SUPPORT_PRIVATE_H_ +#ifndef MOJO_PUBLIC_TESTS_TEST_SUPPORT_PRIVATE_H_ +#define MOJO_PUBLIC_TESTS_TEST_SUPPORT_PRIVATE_H_ #include -#include "third_party/mojo/src/mojo/public/c/test_support/test_support.h" +#include "mojo/public/c/test_support/test_support.h" namespace mojo { namespace test { @@ -34,4 +34,4 @@ class MOJO_TEST_SUPPORT_EXPORT TestSupport { } // namespace test } // namespace mojo -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_TESTS_TEST_SUPPORT_PRIVATE_H_ +#endif // MOJO_PUBLIC_TESTS_TEST_SUPPORT_PRIVATE_H_ diff --git a/third_party/mojo/src/mojo/public/third_party/README.txt b/mojo/public/third_party/README.txt similarity index 100% rename from third_party/mojo/src/mojo/public/third_party/README.txt rename to mojo/public/third_party/README.txt diff --git a/third_party/mojo/src/mojo/public/third_party/jinja2/AUTHORS b/mojo/public/third_party/jinja2/AUTHORS similarity index 100% rename from third_party/mojo/src/mojo/public/third_party/jinja2/AUTHORS rename to mojo/public/third_party/jinja2/AUTHORS diff --git a/third_party/mojo/src/mojo/public/third_party/jinja2/Jinja2-2.7.1.tar.gz.md5 b/mojo/public/third_party/jinja2/Jinja2-2.7.1.tar.gz.md5 similarity index 100% rename from third_party/mojo/src/mojo/public/third_party/jinja2/Jinja2-2.7.1.tar.gz.md5 rename to mojo/public/third_party/jinja2/Jinja2-2.7.1.tar.gz.md5 diff --git a/third_party/mojo/src/mojo/public/third_party/jinja2/Jinja2-2.7.1.tar.gz.sha512 b/mojo/public/third_party/jinja2/Jinja2-2.7.1.tar.gz.sha512 similarity index 100% rename from third_party/mojo/src/mojo/public/third_party/jinja2/Jinja2-2.7.1.tar.gz.sha512 rename to mojo/public/third_party/jinja2/Jinja2-2.7.1.tar.gz.sha512 diff --git a/third_party/mojo/src/mojo/public/third_party/jinja2/LICENSE b/mojo/public/third_party/jinja2/LICENSE similarity index 100% rename from third_party/mojo/src/mojo/public/third_party/jinja2/LICENSE rename to mojo/public/third_party/jinja2/LICENSE diff --git a/third_party/mojo/src/mojo/public/third_party/jinja2/OWNERS b/mojo/public/third_party/jinja2/OWNERS similarity index 100% rename from third_party/mojo/src/mojo/public/third_party/jinja2/OWNERS rename to mojo/public/third_party/jinja2/OWNERS diff --git a/third_party/mojo/src/mojo/public/third_party/jinja2/README.chromium b/mojo/public/third_party/jinja2/README.chromium similarity index 100% rename from third_party/mojo/src/mojo/public/third_party/jinja2/README.chromium rename to mojo/public/third_party/jinja2/README.chromium diff --git a/third_party/mojo/src/mojo/public/third_party/jinja2/__init__.py b/mojo/public/third_party/jinja2/__init__.py similarity index 100% rename from third_party/mojo/src/mojo/public/third_party/jinja2/__init__.py rename to mojo/public/third_party/jinja2/__init__.py diff --git a/third_party/mojo/src/mojo/public/third_party/jinja2/_compat.py b/mojo/public/third_party/jinja2/_compat.py similarity index 100% rename from third_party/mojo/src/mojo/public/third_party/jinja2/_compat.py rename to mojo/public/third_party/jinja2/_compat.py diff --git a/third_party/mojo/src/mojo/public/third_party/jinja2/_stringdefs.py b/mojo/public/third_party/jinja2/_stringdefs.py similarity index 100% rename from third_party/mojo/src/mojo/public/third_party/jinja2/_stringdefs.py rename to mojo/public/third_party/jinja2/_stringdefs.py diff --git a/third_party/mojo/src/mojo/public/third_party/jinja2/bccache.py b/mojo/public/third_party/jinja2/bccache.py similarity index 100% rename from third_party/mojo/src/mojo/public/third_party/jinja2/bccache.py rename to mojo/public/third_party/jinja2/bccache.py diff --git a/third_party/mojo/src/mojo/public/third_party/jinja2/compiler.py b/mojo/public/third_party/jinja2/compiler.py similarity index 100% rename from third_party/mojo/src/mojo/public/third_party/jinja2/compiler.py rename to mojo/public/third_party/jinja2/compiler.py diff --git a/third_party/mojo/src/mojo/public/third_party/jinja2/constants.py b/mojo/public/third_party/jinja2/constants.py similarity index 100% rename from third_party/mojo/src/mojo/public/third_party/jinja2/constants.py rename to mojo/public/third_party/jinja2/constants.py diff --git a/third_party/mojo/src/mojo/public/third_party/jinja2/debug.py b/mojo/public/third_party/jinja2/debug.py similarity index 100% rename from third_party/mojo/src/mojo/public/third_party/jinja2/debug.py rename to mojo/public/third_party/jinja2/debug.py diff --git a/third_party/mojo/src/mojo/public/third_party/jinja2/defaults.py b/mojo/public/third_party/jinja2/defaults.py similarity index 100% rename from third_party/mojo/src/mojo/public/third_party/jinja2/defaults.py rename to mojo/public/third_party/jinja2/defaults.py diff --git a/third_party/mojo/src/mojo/public/third_party/jinja2/environment.py b/mojo/public/third_party/jinja2/environment.py similarity index 100% rename from third_party/mojo/src/mojo/public/third_party/jinja2/environment.py rename to mojo/public/third_party/jinja2/environment.py diff --git a/third_party/mojo/src/mojo/public/third_party/jinja2/exceptions.py b/mojo/public/third_party/jinja2/exceptions.py similarity index 100% rename from third_party/mojo/src/mojo/public/third_party/jinja2/exceptions.py rename to mojo/public/third_party/jinja2/exceptions.py diff --git a/third_party/mojo/src/mojo/public/third_party/jinja2/ext.py b/mojo/public/third_party/jinja2/ext.py similarity index 100% rename from third_party/mojo/src/mojo/public/third_party/jinja2/ext.py rename to mojo/public/third_party/jinja2/ext.py diff --git a/third_party/mojo/src/mojo/public/third_party/jinja2/filters.py b/mojo/public/third_party/jinja2/filters.py similarity index 100% rename from third_party/mojo/src/mojo/public/third_party/jinja2/filters.py rename to mojo/public/third_party/jinja2/filters.py diff --git a/third_party/mojo/src/mojo/public/third_party/jinja2/get_jinja2.sh b/mojo/public/third_party/jinja2/get_jinja2.sh similarity index 100% rename from third_party/mojo/src/mojo/public/third_party/jinja2/get_jinja2.sh rename to mojo/public/third_party/jinja2/get_jinja2.sh diff --git a/third_party/mojo/src/mojo/public/third_party/jinja2/lexer.py b/mojo/public/third_party/jinja2/lexer.py similarity index 100% rename from third_party/mojo/src/mojo/public/third_party/jinja2/lexer.py rename to mojo/public/third_party/jinja2/lexer.py diff --git a/third_party/mojo/src/mojo/public/third_party/jinja2/loaders.py b/mojo/public/third_party/jinja2/loaders.py similarity index 100% rename from third_party/mojo/src/mojo/public/third_party/jinja2/loaders.py rename to mojo/public/third_party/jinja2/loaders.py diff --git a/third_party/mojo/src/mojo/public/third_party/jinja2/meta.py b/mojo/public/third_party/jinja2/meta.py similarity index 100% rename from third_party/mojo/src/mojo/public/third_party/jinja2/meta.py rename to mojo/public/third_party/jinja2/meta.py diff --git a/third_party/mojo/src/mojo/public/third_party/jinja2/nodes.py b/mojo/public/third_party/jinja2/nodes.py similarity index 100% rename from third_party/mojo/src/mojo/public/third_party/jinja2/nodes.py rename to mojo/public/third_party/jinja2/nodes.py diff --git a/third_party/mojo/src/mojo/public/third_party/jinja2/optimizer.py b/mojo/public/third_party/jinja2/optimizer.py similarity index 100% rename from third_party/mojo/src/mojo/public/third_party/jinja2/optimizer.py rename to mojo/public/third_party/jinja2/optimizer.py diff --git a/third_party/mojo/src/mojo/public/third_party/jinja2/parser.py b/mojo/public/third_party/jinja2/parser.py similarity index 100% rename from third_party/mojo/src/mojo/public/third_party/jinja2/parser.py rename to mojo/public/third_party/jinja2/parser.py diff --git a/third_party/mojo/src/mojo/public/third_party/jinja2/runtime.py b/mojo/public/third_party/jinja2/runtime.py similarity index 100% rename from third_party/mojo/src/mojo/public/third_party/jinja2/runtime.py rename to mojo/public/third_party/jinja2/runtime.py diff --git a/third_party/mojo/src/mojo/public/third_party/jinja2/sandbox.py b/mojo/public/third_party/jinja2/sandbox.py similarity index 100% rename from third_party/mojo/src/mojo/public/third_party/jinja2/sandbox.py rename to mojo/public/third_party/jinja2/sandbox.py diff --git a/third_party/mojo/src/mojo/public/third_party/jinja2/tests.py b/mojo/public/third_party/jinja2/tests.py similarity index 100% rename from third_party/mojo/src/mojo/public/third_party/jinja2/tests.py rename to mojo/public/third_party/jinja2/tests.py diff --git a/third_party/mojo/src/mojo/public/third_party/jinja2/utils.py b/mojo/public/third_party/jinja2/utils.py similarity index 100% rename from third_party/mojo/src/mojo/public/third_party/jinja2/utils.py rename to mojo/public/third_party/jinja2/utils.py diff --git a/third_party/mojo/src/mojo/public/third_party/jinja2/visitor.py b/mojo/public/third_party/jinja2/visitor.py similarity index 100% rename from third_party/mojo/src/mojo/public/third_party/jinja2/visitor.py rename to mojo/public/third_party/jinja2/visitor.py diff --git a/third_party/mojo/src/mojo/public/third_party/markupsafe/AUTHORS b/mojo/public/third_party/markupsafe/AUTHORS similarity index 100% rename from third_party/mojo/src/mojo/public/third_party/markupsafe/AUTHORS rename to mojo/public/third_party/markupsafe/AUTHORS diff --git a/third_party/mojo/src/mojo/public/third_party/markupsafe/LICENSE b/mojo/public/third_party/markupsafe/LICENSE similarity index 100% rename from third_party/mojo/src/mojo/public/third_party/markupsafe/LICENSE rename to mojo/public/third_party/markupsafe/LICENSE diff --git a/third_party/mojo/src/mojo/public/third_party/markupsafe/MarkupSafe-0.18.tar.gz.md5 b/mojo/public/third_party/markupsafe/MarkupSafe-0.18.tar.gz.md5 similarity index 100% rename from third_party/mojo/src/mojo/public/third_party/markupsafe/MarkupSafe-0.18.tar.gz.md5 rename to mojo/public/third_party/markupsafe/MarkupSafe-0.18.tar.gz.md5 diff --git a/third_party/mojo/src/mojo/public/third_party/markupsafe/MarkupSafe-0.18.tar.gz.sha512 b/mojo/public/third_party/markupsafe/MarkupSafe-0.18.tar.gz.sha512 similarity index 100% rename from third_party/mojo/src/mojo/public/third_party/markupsafe/MarkupSafe-0.18.tar.gz.sha512 rename to mojo/public/third_party/markupsafe/MarkupSafe-0.18.tar.gz.sha512 diff --git a/third_party/mojo/src/mojo/public/third_party/markupsafe/OWNERS b/mojo/public/third_party/markupsafe/OWNERS similarity index 100% rename from third_party/mojo/src/mojo/public/third_party/markupsafe/OWNERS rename to mojo/public/third_party/markupsafe/OWNERS diff --git a/third_party/mojo/src/mojo/public/third_party/markupsafe/README.chromium b/mojo/public/third_party/markupsafe/README.chromium similarity index 100% rename from third_party/mojo/src/mojo/public/third_party/markupsafe/README.chromium rename to mojo/public/third_party/markupsafe/README.chromium diff --git a/third_party/mojo/src/mojo/public/third_party/markupsafe/__init__.py b/mojo/public/third_party/markupsafe/__init__.py similarity index 100% rename from third_party/mojo/src/mojo/public/third_party/markupsafe/__init__.py rename to mojo/public/third_party/markupsafe/__init__.py diff --git a/third_party/mojo/src/mojo/public/third_party/markupsafe/_compat.py b/mojo/public/third_party/markupsafe/_compat.py similarity index 100% rename from third_party/mojo/src/mojo/public/third_party/markupsafe/_compat.py rename to mojo/public/third_party/markupsafe/_compat.py diff --git a/third_party/mojo/src/mojo/public/third_party/markupsafe/_constants.py b/mojo/public/third_party/markupsafe/_constants.py similarity index 100% rename from third_party/mojo/src/mojo/public/third_party/markupsafe/_constants.py rename to mojo/public/third_party/markupsafe/_constants.py diff --git a/third_party/mojo/src/mojo/public/third_party/markupsafe/_native.py b/mojo/public/third_party/markupsafe/_native.py similarity index 100% rename from third_party/mojo/src/mojo/public/third_party/markupsafe/_native.py rename to mojo/public/third_party/markupsafe/_native.py diff --git a/third_party/mojo/src/mojo/public/third_party/markupsafe/_speedups.c b/mojo/public/third_party/markupsafe/_speedups.c similarity index 100% rename from third_party/mojo/src/mojo/public/third_party/markupsafe/_speedups.c rename to mojo/public/third_party/markupsafe/_speedups.c diff --git a/third_party/mojo/src/mojo/public/third_party/markupsafe/get_markupsafe.sh b/mojo/public/third_party/markupsafe/get_markupsafe.sh similarity index 100% rename from third_party/mojo/src/mojo/public/third_party/markupsafe/get_markupsafe.sh rename to mojo/public/third_party/markupsafe/get_markupsafe.sh diff --git a/third_party/mojo/src/mojo/public/third_party/ply/LICENSE b/mojo/public/third_party/ply/LICENSE similarity index 100% rename from third_party/mojo/src/mojo/public/third_party/ply/LICENSE rename to mojo/public/third_party/ply/LICENSE diff --git a/third_party/mojo/src/mojo/public/third_party/ply/README b/mojo/public/third_party/ply/README similarity index 100% rename from third_party/mojo/src/mojo/public/third_party/ply/README rename to mojo/public/third_party/ply/README diff --git a/third_party/mojo/src/mojo/public/third_party/ply/README.chromium b/mojo/public/third_party/ply/README.chromium similarity index 100% rename from third_party/mojo/src/mojo/public/third_party/ply/README.chromium rename to mojo/public/third_party/ply/README.chromium diff --git a/third_party/mojo/src/mojo/public/third_party/ply/__init__.py b/mojo/public/third_party/ply/__init__.py similarity index 100% rename from third_party/mojo/src/mojo/public/third_party/ply/__init__.py rename to mojo/public/third_party/ply/__init__.py diff --git a/third_party/mojo/src/mojo/public/third_party/ply/lex.py b/mojo/public/third_party/ply/lex.py similarity index 100% rename from third_party/mojo/src/mojo/public/third_party/ply/lex.py rename to mojo/public/third_party/ply/lex.py diff --git a/third_party/mojo/src/mojo/public/third_party/ply/license.patch b/mojo/public/third_party/ply/license.patch similarity index 100% rename from third_party/mojo/src/mojo/public/third_party/ply/license.patch rename to mojo/public/third_party/ply/license.patch diff --git a/third_party/mojo/src/mojo/public/third_party/ply/yacc.py b/mojo/public/third_party/ply/yacc.py similarity index 100% rename from third_party/mojo/src/mojo/public/third_party/ply/yacc.py rename to mojo/public/third_party/ply/yacc.py diff --git a/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/enum_macros.tmpl b/mojo/public/tools/bindings/generators/cpp_templates/enum_macros.tmpl similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/enum_macros.tmpl rename to mojo/public/tools/bindings/generators/cpp_templates/enum_macros.tmpl diff --git a/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/interface_declaration.tmpl b/mojo/public/tools/bindings/generators/cpp_templates/interface_declaration.tmpl similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/interface_declaration.tmpl rename to mojo/public/tools/bindings/generators/cpp_templates/interface_declaration.tmpl diff --git a/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/interface_definition.tmpl b/mojo/public/tools/bindings/generators/cpp_templates/interface_definition.tmpl similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/interface_definition.tmpl rename to mojo/public/tools/bindings/generators/cpp_templates/interface_definition.tmpl diff --git a/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/interface_macros.tmpl b/mojo/public/tools/bindings/generators/cpp_templates/interface_macros.tmpl similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/interface_macros.tmpl rename to mojo/public/tools/bindings/generators/cpp_templates/interface_macros.tmpl diff --git a/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/interface_proxy_declaration.tmpl b/mojo/public/tools/bindings/generators/cpp_templates/interface_proxy_declaration.tmpl similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/interface_proxy_declaration.tmpl rename to mojo/public/tools/bindings/generators/cpp_templates/interface_proxy_declaration.tmpl diff --git a/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/interface_request_validator_declaration.tmpl b/mojo/public/tools/bindings/generators/cpp_templates/interface_request_validator_declaration.tmpl similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/interface_request_validator_declaration.tmpl rename to mojo/public/tools/bindings/generators/cpp_templates/interface_request_validator_declaration.tmpl diff --git a/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/interface_response_validator_declaration.tmpl b/mojo/public/tools/bindings/generators/cpp_templates/interface_response_validator_declaration.tmpl similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/interface_response_validator_declaration.tmpl rename to mojo/public/tools/bindings/generators/cpp_templates/interface_response_validator_declaration.tmpl diff --git a/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/interface_stub_declaration.tmpl b/mojo/public/tools/bindings/generators/cpp_templates/interface_stub_declaration.tmpl similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/interface_stub_declaration.tmpl rename to mojo/public/tools/bindings/generators/cpp_templates/interface_stub_declaration.tmpl diff --git a/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/module-internal.h.tmpl b/mojo/public/tools/bindings/generators/cpp_templates/module-internal.h.tmpl similarity index 79% rename from third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/module-internal.h.tmpl rename to mojo/public/tools/bindings/generators/cpp_templates/module-internal.h.tmpl index 59d9420ac6998c..2d748fc95455cd 100644 --- a/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/module-internal.h.tmpl +++ b/mojo/public/tools/bindings/generators/cpp_templates/module-internal.h.tmpl @@ -8,11 +8,11 @@ #ifndef {{header_guard}} #define {{header_guard}} -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/bindings_internal.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/buffer.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/union_accessor.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/value_traits.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/struct_ptr.h" +#include "mojo/public/cpp/bindings/lib/bindings_internal.h" +#include "mojo/public/cpp/bindings/lib/buffer.h" +#include "mojo/public/cpp/bindings/lib/union_accessor.h" +#include "mojo/public/cpp/bindings/lib/value_traits.h" +#include "mojo/public/cpp/bindings/struct_ptr.h" {%- for import in imports %} #include "{{import.module.path}}-internal.h" diff --git a/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/module.cc.tmpl b/mojo/public/tools/bindings/generators/cpp_templates/module.cc.tmpl similarity index 75% rename from third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/module.cc.tmpl rename to mojo/public/tools/bindings/generators/cpp_templates/module.cc.tmpl index 04e8a17ab295bf..dddb6abbecf3d0 100644 --- a/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/module.cc.tmpl +++ b/mojo/public/tools/bindings/generators/cpp_templates/module.cc.tmpl @@ -17,19 +17,19 @@ #include #include "base/trace_event/trace_event.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/array_serialization.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/bindings_serialization.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/bounds_checker.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/map_data_internal.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/map_serialization.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/message_builder.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/string_serialization.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/validate_params.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/validation_errors.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/validation_util.h" -#include "third_party/mojo/src/mojo/public/cpp/environment/lib/scoped_task_tracking.h" -#include "third_party/mojo/src/mojo/public/cpp/environment/logging.h" -#include "third_party/mojo/src/mojo/public/interfaces/bindings/interface_control_messages.mojom.h" +#include "mojo/public/cpp/bindings/lib/array_serialization.h" +#include "mojo/public/cpp/bindings/lib/bindings_serialization.h" +#include "mojo/public/cpp/bindings/lib/bounds_checker.h" +#include "mojo/public/cpp/bindings/lib/map_data_internal.h" +#include "mojo/public/cpp/bindings/lib/map_serialization.h" +#include "mojo/public/cpp/bindings/lib/message_builder.h" +#include "mojo/public/cpp/bindings/lib/string_serialization.h" +#include "mojo/public/cpp/bindings/lib/validate_params.h" +#include "mojo/public/cpp/bindings/lib/validation_errors.h" +#include "mojo/public/cpp/bindings/lib/validation_util.h" +#include "mojo/public/cpp/environment/lib/scoped_task_tracking.h" +#include "mojo/public/cpp/environment/logging.h" +#include "mojo/public/interfaces/bindings/interface_control_messages.mojom.h" {%- for namespace in namespaces_as_array %} namespace {{namespace}} { diff --git a/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/module.h.tmpl b/mojo/public/tools/bindings/generators/cpp_templates/module.h.tmpl similarity index 79% rename from third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/module.h.tmpl rename to mojo/public/tools/bindings/generators/cpp_templates/module.h.tmpl index 05d018a7aa08fb..b6ba1a30f9d790 100644 --- a/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/module.h.tmpl +++ b/mojo/public/tools/bindings/generators/cpp_templates/module.h.tmpl @@ -10,19 +10,19 @@ #include -#include "third_party/mojo/src/mojo/public/cpp/bindings/array.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/associated_interface_ptr_info.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/associated_interface_request.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/callback.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/bindings/lib/control_message_handler.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/control_message_proxy.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/map.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/message_filter.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/no_interface.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/string.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/struct_ptr.h" +#include "mojo/public/cpp/bindings/array.h" +#include "mojo/public/cpp/bindings/associated_interface_ptr_info.h" +#include "mojo/public/cpp/bindings/associated_interface_request.h" +#include "mojo/public/cpp/bindings/callback.h" +#include "mojo/public/cpp/bindings/interface_ptr.h" +#include "mojo/public/cpp/bindings/interface_request.h" +#include "mojo/public/cpp/bindings/lib/control_message_handler.h" +#include "mojo/public/cpp/bindings/lib/control_message_proxy.h" +#include "mojo/public/cpp/bindings/map.h" +#include "mojo/public/cpp/bindings/message_filter.h" +#include "mojo/public/cpp/bindings/no_interface.h" +#include "mojo/public/cpp/bindings/string.h" +#include "mojo/public/cpp/bindings/struct_ptr.h" #include "{{module.path}}-internal.h" {%- for import in imports %} #include "{{import.module.path}}.h" diff --git a/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/struct_declaration.tmpl b/mojo/public/tools/bindings/generators/cpp_templates/struct_declaration.tmpl similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/struct_declaration.tmpl rename to mojo/public/tools/bindings/generators/cpp_templates/struct_declaration.tmpl diff --git a/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/struct_definition.tmpl b/mojo/public/tools/bindings/generators/cpp_templates/struct_definition.tmpl similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/struct_definition.tmpl rename to mojo/public/tools/bindings/generators/cpp_templates/struct_definition.tmpl diff --git a/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/struct_macros.tmpl b/mojo/public/tools/bindings/generators/cpp_templates/struct_macros.tmpl similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/struct_macros.tmpl rename to mojo/public/tools/bindings/generators/cpp_templates/struct_macros.tmpl diff --git a/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/struct_serialization_declaration.tmpl b/mojo/public/tools/bindings/generators/cpp_templates/struct_serialization_declaration.tmpl similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/struct_serialization_declaration.tmpl rename to mojo/public/tools/bindings/generators/cpp_templates/struct_serialization_declaration.tmpl diff --git a/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/struct_serialization_definition.tmpl b/mojo/public/tools/bindings/generators/cpp_templates/struct_serialization_definition.tmpl similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/struct_serialization_definition.tmpl rename to mojo/public/tools/bindings/generators/cpp_templates/struct_serialization_definition.tmpl diff --git a/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/union_declaration.tmpl b/mojo/public/tools/bindings/generators/cpp_templates/union_declaration.tmpl similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/union_declaration.tmpl rename to mojo/public/tools/bindings/generators/cpp_templates/union_declaration.tmpl diff --git a/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/union_definition.tmpl b/mojo/public/tools/bindings/generators/cpp_templates/union_definition.tmpl similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/union_definition.tmpl rename to mojo/public/tools/bindings/generators/cpp_templates/union_definition.tmpl diff --git a/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/union_serialization_declaration.tmpl b/mojo/public/tools/bindings/generators/cpp_templates/union_serialization_declaration.tmpl similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/union_serialization_declaration.tmpl rename to mojo/public/tools/bindings/generators/cpp_templates/union_serialization_declaration.tmpl diff --git a/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/union_serialization_definition.tmpl b/mojo/public/tools/bindings/generators/cpp_templates/union_serialization_definition.tmpl similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/union_serialization_definition.tmpl rename to mojo/public/tools/bindings/generators/cpp_templates/union_serialization_definition.tmpl diff --git a/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/validation_macros.tmpl b/mojo/public/tools/bindings/generators/cpp_templates/validation_macros.tmpl similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/validation_macros.tmpl rename to mojo/public/tools/bindings/generators/cpp_templates/validation_macros.tmpl diff --git a/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/wrapper_class_declaration.tmpl b/mojo/public/tools/bindings/generators/cpp_templates/wrapper_class_declaration.tmpl similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/wrapper_class_declaration.tmpl rename to mojo/public/tools/bindings/generators/cpp_templates/wrapper_class_declaration.tmpl diff --git a/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/wrapper_class_definition.tmpl b/mojo/public/tools/bindings/generators/cpp_templates/wrapper_class_definition.tmpl similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/wrapper_class_definition.tmpl rename to mojo/public/tools/bindings/generators/cpp_templates/wrapper_class_definition.tmpl diff --git a/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/wrapper_union_class_declaration.tmpl b/mojo/public/tools/bindings/generators/cpp_templates/wrapper_union_class_declaration.tmpl similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/wrapper_union_class_declaration.tmpl rename to mojo/public/tools/bindings/generators/cpp_templates/wrapper_union_class_declaration.tmpl diff --git a/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/wrapper_union_class_definition.tmpl b/mojo/public/tools/bindings/generators/cpp_templates/wrapper_union_class_definition.tmpl similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/wrapper_union_class_definition.tmpl rename to mojo/public/tools/bindings/generators/cpp_templates/wrapper_union_class_definition.tmpl diff --git a/third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/constant_definition.tmpl b/mojo/public/tools/bindings/generators/java_templates/constant_definition.tmpl similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/constant_definition.tmpl rename to mojo/public/tools/bindings/generators/java_templates/constant_definition.tmpl diff --git a/third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/constants.java.tmpl b/mojo/public/tools/bindings/generators/java_templates/constants.java.tmpl similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/constants.java.tmpl rename to mojo/public/tools/bindings/generators/java_templates/constants.java.tmpl diff --git a/third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/data_types_definition.tmpl b/mojo/public/tools/bindings/generators/java_templates/data_types_definition.tmpl similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/data_types_definition.tmpl rename to mojo/public/tools/bindings/generators/java_templates/data_types_definition.tmpl diff --git a/third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/enum.java.tmpl b/mojo/public/tools/bindings/generators/java_templates/enum.java.tmpl similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/enum.java.tmpl rename to mojo/public/tools/bindings/generators/java_templates/enum.java.tmpl diff --git a/third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/enum_definition.tmpl b/mojo/public/tools/bindings/generators/java_templates/enum_definition.tmpl similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/enum_definition.tmpl rename to mojo/public/tools/bindings/generators/java_templates/enum_definition.tmpl diff --git a/third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/header.java.tmpl b/mojo/public/tools/bindings/generators/java_templates/header.java.tmpl similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/header.java.tmpl rename to mojo/public/tools/bindings/generators/java_templates/header.java.tmpl diff --git a/third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/interface.java.tmpl b/mojo/public/tools/bindings/generators/java_templates/interface.java.tmpl similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/interface.java.tmpl rename to mojo/public/tools/bindings/generators/java_templates/interface.java.tmpl diff --git a/third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/interface_definition.tmpl b/mojo/public/tools/bindings/generators/java_templates/interface_definition.tmpl similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/interface_definition.tmpl rename to mojo/public/tools/bindings/generators/java_templates/interface_definition.tmpl diff --git a/third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/interface_internal.java.tmpl b/mojo/public/tools/bindings/generators/java_templates/interface_internal.java.tmpl similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/interface_internal.java.tmpl rename to mojo/public/tools/bindings/generators/java_templates/interface_internal.java.tmpl diff --git a/third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/struct.java.tmpl b/mojo/public/tools/bindings/generators/java_templates/struct.java.tmpl similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/struct.java.tmpl rename to mojo/public/tools/bindings/generators/java_templates/struct.java.tmpl diff --git a/third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/union.java.tmpl b/mojo/public/tools/bindings/generators/java_templates/union.java.tmpl similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/union.java.tmpl rename to mojo/public/tools/bindings/generators/java_templates/union.java.tmpl diff --git a/third_party/mojo/src/mojo/public/tools/bindings/generators/js_templates/enum_definition.tmpl b/mojo/public/tools/bindings/generators/js_templates/enum_definition.tmpl similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/generators/js_templates/enum_definition.tmpl rename to mojo/public/tools/bindings/generators/js_templates/enum_definition.tmpl diff --git a/third_party/mojo/src/mojo/public/tools/bindings/generators/js_templates/interface_definition.tmpl b/mojo/public/tools/bindings/generators/js_templates/interface_definition.tmpl similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/generators/js_templates/interface_definition.tmpl rename to mojo/public/tools/bindings/generators/js_templates/interface_definition.tmpl diff --git a/third_party/mojo/src/mojo/public/tools/bindings/generators/js_templates/module.amd.tmpl b/mojo/public/tools/bindings/generators/js_templates/module.amd.tmpl similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/generators/js_templates/module.amd.tmpl rename to mojo/public/tools/bindings/generators/js_templates/module.amd.tmpl diff --git a/third_party/mojo/src/mojo/public/tools/bindings/generators/js_templates/module_definition.tmpl b/mojo/public/tools/bindings/generators/js_templates/module_definition.tmpl similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/generators/js_templates/module_definition.tmpl rename to mojo/public/tools/bindings/generators/js_templates/module_definition.tmpl diff --git a/third_party/mojo/src/mojo/public/tools/bindings/generators/js_templates/struct_definition.tmpl b/mojo/public/tools/bindings/generators/js_templates/struct_definition.tmpl similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/generators/js_templates/struct_definition.tmpl rename to mojo/public/tools/bindings/generators/js_templates/struct_definition.tmpl diff --git a/third_party/mojo/src/mojo/public/tools/bindings/generators/js_templates/union_definition.tmpl b/mojo/public/tools/bindings/generators/js_templates/union_definition.tmpl similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/generators/js_templates/union_definition.tmpl rename to mojo/public/tools/bindings/generators/js_templates/union_definition.tmpl diff --git a/third_party/mojo/src/mojo/public/tools/bindings/generators/js_templates/validation_macros.tmpl b/mojo/public/tools/bindings/generators/js_templates/validation_macros.tmpl similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/generators/js_templates/validation_macros.tmpl rename to mojo/public/tools/bindings/generators/js_templates/validation_macros.tmpl diff --git a/third_party/mojo/src/mojo/public/tools/bindings/generators/mojom_cpp_generator.py b/mojo/public/tools/bindings/generators/mojom_cpp_generator.py similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/generators/mojom_cpp_generator.py rename to mojo/public/tools/bindings/generators/mojom_cpp_generator.py diff --git a/third_party/mojo/src/mojo/public/tools/bindings/generators/mojom_java_generator.py b/mojo/public/tools/bindings/generators/mojom_java_generator.py similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/generators/mojom_java_generator.py rename to mojo/public/tools/bindings/generators/mojom_java_generator.py diff --git a/third_party/mojo/src/mojo/public/tools/bindings/generators/mojom_js_generator.py b/mojo/public/tools/bindings/generators/mojom_js_generator.py similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/generators/mojom_js_generator.py rename to mojo/public/tools/bindings/generators/mojom_js_generator.py diff --git a/third_party/mojo/src/mojo/public/tools/bindings/generators/run_cpp_generator.py b/mojo/public/tools/bindings/generators/run_cpp_generator.py similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/generators/run_cpp_generator.py rename to mojo/public/tools/bindings/generators/run_cpp_generator.py diff --git a/third_party/mojo/src/mojo/public/tools/bindings/mojom.gni b/mojo/public/tools/bindings/mojom.gni similarity index 93% rename from third_party/mojo/src/mojo/public/tools/bindings/mojom.gni rename to mojo/public/tools/bindings/mojom.gni index 9ef3198d89d653..7143ef87d87e76 100644 --- a/third_party/mojo/src/mojo/public/tools/bindings/mojom.gni +++ b/mojo/public/tools/bindings/mojom.gni @@ -56,7 +56,7 @@ template("mojom") { cpp_sources_suffix = "cpp_sources" cpp_sources_target_name = "${target_name}_${cpp_sources_suffix}" if (defined(invoker.sources)) { - generator_root = rebase_path("mojo/public/tools/bindings", ".", mojo_root) + generator_root = "//mojo/public/tools/bindings" generator_script = "$generator_root/mojom_bindings_generator.py" generator_sources = [ generator_script, @@ -137,7 +137,7 @@ template("mojom") { foreach(sdk_dep, invoker.mojo_sdk_public_deps) { # Check that the SDK dep was not mistakenly given as an absolute path. assert(get_path_info(sdk_dep, "abspath") != sdk_dep) - rebased_mojo_sdk_public_deps += [ rebase_path(sdk_dep, ".", mojo_root) ] + rebased_mojo_sdk_public_deps += [ rebase_path(sdk_dep, ".", "//") ] } } @@ -146,7 +146,7 @@ template("mojom") { foreach(sdk_dep, invoker.mojo_sdk_deps) { # Check that the SDK dep was not mistakenly given as an absolute path. assert(get_path_info(sdk_dep, "abspath") != sdk_dep) - rebased_mojo_sdk_deps += [ rebase_path(sdk_dep, ".", mojo_root) ] + rebased_mojo_sdk_deps += [ rebase_path(sdk_dep, ".", "//") ] } } @@ -165,8 +165,6 @@ template("mojom") { rebase_path("//", root_build_dir), "-I", rebase_path("//", root_build_dir), - "-I", - rebase_path(mojo_root, root_build_dir), "-o", rebase_path(root_gen_dir), ] @@ -193,7 +191,9 @@ template("mojom") { data = process_file_template(invoker.sources, generator_js_outputs) } - public_deps = rebase_path([ "mojo/public/cpp/bindings" ], ".", mojo_root) + public_deps = [ + "//mojo/public/cpp/bindings", + ] if (defined(invoker.sources)) { public_deps += [ ":${cpp_sources_target_name}" ] } @@ -214,7 +214,7 @@ template("mojom") { foreach(sdk_dep, invoker.mojo_sdk_deps) { # Check that the SDK dep was not mistakenly given as an absolute path. assert(get_path_info(sdk_dep, "abspath") != sdk_dep) - deps += [ rebase_path(sdk_dep, ".", mojo_root) ] + deps += [ rebase_path(sdk_dep, ".", "//") ] } } } @@ -256,9 +256,7 @@ template("mojom") { deps = [ ":$generator_target_name", "//base", - rebase_path("mojo/public/interfaces/bindings:bindings__generator", - ".", - mojo_root), + "//mojo/public/interfaces/bindings:bindings__generator", ] foreach(d, all_deps) { # Resolve the name, so that a target //mojo/something becomes @@ -278,7 +276,7 @@ template("mojom") { java_srcjar_target_name = target_name + "_java_sources" action(java_srcjar_target_name) { - script = rebase_path("mojo/public/tools/gn/zip.py", ".", mojo_root) + script = "//mojo/public/tools/gn/zip.py" inputs = process_file_template(invoker.sources, generator_java_outputs) output = "$target_gen_dir/$target_name.srcjar" outputs = [ @@ -297,12 +295,10 @@ template("mojom") { java_target_name = target_name + "_java" android_library(java_target_name) { - deps = rebase_path([ - "mojo/public/java:bindings", - "mojo/public/java:system", - ], - ".", - mojo_root) + deps = [ + "//mojo/public/java:bindings", + "//mojo/public/java:system", + ] foreach(d, all_deps) { # Resolve the name, so that a target //mojo/something becomes diff --git a/third_party/mojo/src/mojo/public/tools/bindings/mojom_bindings_generator.py b/mojo/public/tools/bindings/mojom_bindings_generator.py similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/mojom_bindings_generator.py rename to mojo/public/tools/bindings/mojom_bindings_generator.py diff --git a/third_party/mojo/src/mojo/public/tools/bindings/mojom_bindings_generator_unittest.py b/mojo/public/tools/bindings/mojom_bindings_generator_unittest.py similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/mojom_bindings_generator_unittest.py rename to mojo/public/tools/bindings/mojom_bindings_generator_unittest.py diff --git a/third_party/mojo/src/mojo/public/tools/bindings/mojom_list_outputs.py b/mojo/public/tools/bindings/mojom_list_outputs.py similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/mojom_list_outputs.py rename to mojo/public/tools/bindings/mojom_list_outputs.py diff --git a/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/__init__.py b/mojo/public/tools/bindings/pylib/mojom/__init__.py similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/__init__.py rename to mojo/public/tools/bindings/pylib/mojom/__init__.py diff --git a/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/error.py b/mojo/public/tools/bindings/pylib/mojom/error.py similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/error.py rename to mojo/public/tools/bindings/pylib/mojom/error.py diff --git a/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/fileutil.py b/mojo/public/tools/bindings/pylib/mojom/fileutil.py similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/fileutil.py rename to mojo/public/tools/bindings/pylib/mojom/fileutil.py diff --git a/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/__init__.py b/mojo/public/tools/bindings/pylib/mojom/generate/__init__.py similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/__init__.py rename to mojo/public/tools/bindings/pylib/mojom/generate/__init__.py diff --git a/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/constant_resolver.py b/mojo/public/tools/bindings/pylib/mojom/generate/constant_resolver.py similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/constant_resolver.py rename to mojo/public/tools/bindings/pylib/mojom/generate/constant_resolver.py diff --git a/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/data.py b/mojo/public/tools/bindings/pylib/mojom/generate/data.py similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/data.py rename to mojo/public/tools/bindings/pylib/mojom/generate/data.py diff --git a/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/data_tests.py b/mojo/public/tools/bindings/pylib/mojom/generate/data_tests.py similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/data_tests.py rename to mojo/public/tools/bindings/pylib/mojom/generate/data_tests.py diff --git a/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/generator.py b/mojo/public/tools/bindings/pylib/mojom/generate/generator.py similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/generator.py rename to mojo/public/tools/bindings/pylib/mojom/generate/generator.py diff --git a/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/generator_unittest.py b/mojo/public/tools/bindings/pylib/mojom/generate/generator_unittest.py similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/generator_unittest.py rename to mojo/public/tools/bindings/pylib/mojom/generate/generator_unittest.py diff --git a/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/module.py b/mojo/public/tools/bindings/pylib/mojom/generate/module.py similarity index 99% rename from third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/module.py rename to mojo/public/tools/bindings/pylib/mojom/generate/module.py index b3e3d677aeb4df..37c76a2b8d0d5c 100644 --- a/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/module.py +++ b/mojo/public/tools/bindings/pylib/mojom/generate/module.py @@ -594,7 +594,7 @@ def IsCloneableKind(kind): def _IsCloneable(kind, visited_kinds): if kind in visited_kinds: # No need to examine the kind again. - return True + return True visited_kinds.add(kind) if IsAnyHandleKind(kind) or IsInterfaceKind(kind) or IsAssociatedKind(kind): return False diff --git a/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/module_tests.py b/mojo/public/tools/bindings/pylib/mojom/generate/module_tests.py similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/module_tests.py rename to mojo/public/tools/bindings/pylib/mojom/generate/module_tests.py diff --git a/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/pack.py b/mojo/public/tools/bindings/pylib/mojom/generate/pack.py similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/pack.py rename to mojo/public/tools/bindings/pylib/mojom/generate/pack.py diff --git a/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/pack_tests.py b/mojo/public/tools/bindings/pylib/mojom/generate/pack_tests.py similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/pack_tests.py rename to mojo/public/tools/bindings/pylib/mojom/generate/pack_tests.py diff --git a/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/run_tests.py b/mojo/public/tools/bindings/pylib/mojom/generate/run_tests.py similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/run_tests.py rename to mojo/public/tools/bindings/pylib/mojom/generate/run_tests.py diff --git a/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/template_expander.py b/mojo/public/tools/bindings/pylib/mojom/generate/template_expander.py similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/template_expander.py rename to mojo/public/tools/bindings/pylib/mojom/generate/template_expander.py diff --git a/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/test_support.py b/mojo/public/tools/bindings/pylib/mojom/generate/test_support.py similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/test_support.py rename to mojo/public/tools/bindings/pylib/mojom/generate/test_support.py diff --git a/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/parse/__init__.py b/mojo/public/tools/bindings/pylib/mojom/parse/__init__.py similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/parse/__init__.py rename to mojo/public/tools/bindings/pylib/mojom/parse/__init__.py diff --git a/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/parse/ast.py b/mojo/public/tools/bindings/pylib/mojom/parse/ast.py similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/parse/ast.py rename to mojo/public/tools/bindings/pylib/mojom/parse/ast.py diff --git a/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/parse/lexer.py b/mojo/public/tools/bindings/pylib/mojom/parse/lexer.py similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/parse/lexer.py rename to mojo/public/tools/bindings/pylib/mojom/parse/lexer.py diff --git a/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/parse/parser.py b/mojo/public/tools/bindings/pylib/mojom/parse/parser.py similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/parse/parser.py rename to mojo/public/tools/bindings/pylib/mojom/parse/parser.py diff --git a/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/parse/translate.py b/mojo/public/tools/bindings/pylib/mojom/parse/translate.py similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/parse/translate.py rename to mojo/public/tools/bindings/pylib/mojom/parse/translate.py diff --git a/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom_tests/__init__.py b/mojo/public/tools/bindings/pylib/mojom_tests/__init__.py similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom_tests/__init__.py rename to mojo/public/tools/bindings/pylib/mojom_tests/__init__.py diff --git a/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom_tests/fileutil_unittest.py b/mojo/public/tools/bindings/pylib/mojom_tests/fileutil_unittest.py similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom_tests/fileutil_unittest.py rename to mojo/public/tools/bindings/pylib/mojom_tests/fileutil_unittest.py diff --git a/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom_tests/generate/__init__.py b/mojo/public/tools/bindings/pylib/mojom_tests/generate/__init__.py similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom_tests/generate/__init__.py rename to mojo/public/tools/bindings/pylib/mojom_tests/generate/__init__.py diff --git a/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom_tests/generate/data_unittest.py b/mojo/public/tools/bindings/pylib/mojom_tests/generate/data_unittest.py similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom_tests/generate/data_unittest.py rename to mojo/public/tools/bindings/pylib/mojom_tests/generate/data_unittest.py diff --git a/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom_tests/generate/generator_unittest.py b/mojo/public/tools/bindings/pylib/mojom_tests/generate/generator_unittest.py similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom_tests/generate/generator_unittest.py rename to mojo/public/tools/bindings/pylib/mojom_tests/generate/generator_unittest.py diff --git a/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom_tests/generate/module_unittest.py b/mojo/public/tools/bindings/pylib/mojom_tests/generate/module_unittest.py similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom_tests/generate/module_unittest.py rename to mojo/public/tools/bindings/pylib/mojom_tests/generate/module_unittest.py diff --git a/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom_tests/generate/pack_unittest.py b/mojo/public/tools/bindings/pylib/mojom_tests/generate/pack_unittest.py similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom_tests/generate/pack_unittest.py rename to mojo/public/tools/bindings/pylib/mojom_tests/generate/pack_unittest.py diff --git a/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom_tests/parse/__init__.py b/mojo/public/tools/bindings/pylib/mojom_tests/parse/__init__.py similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom_tests/parse/__init__.py rename to mojo/public/tools/bindings/pylib/mojom_tests/parse/__init__.py diff --git a/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom_tests/parse/ast_unittest.py b/mojo/public/tools/bindings/pylib/mojom_tests/parse/ast_unittest.py similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom_tests/parse/ast_unittest.py rename to mojo/public/tools/bindings/pylib/mojom_tests/parse/ast_unittest.py diff --git a/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom_tests/parse/lexer_unittest.py b/mojo/public/tools/bindings/pylib/mojom_tests/parse/lexer_unittest.py similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom_tests/parse/lexer_unittest.py rename to mojo/public/tools/bindings/pylib/mojom_tests/parse/lexer_unittest.py diff --git a/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom_tests/parse/parser_unittest.py b/mojo/public/tools/bindings/pylib/mojom_tests/parse/parser_unittest.py similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom_tests/parse/parser_unittest.py rename to mojo/public/tools/bindings/pylib/mojom_tests/parse/parser_unittest.py diff --git a/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom_tests/parse/run_parser.py b/mojo/public/tools/bindings/pylib/mojom_tests/parse/run_parser.py similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom_tests/parse/run_parser.py rename to mojo/public/tools/bindings/pylib/mojom_tests/parse/run_parser.py diff --git a/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom_tests/parse/run_translate.py b/mojo/public/tools/bindings/pylib/mojom_tests/parse/run_translate.py similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom_tests/parse/run_translate.py rename to mojo/public/tools/bindings/pylib/mojom_tests/parse/run_translate.py diff --git a/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom_tests/parse/translate_unittest.py b/mojo/public/tools/bindings/pylib/mojom_tests/parse/translate_unittest.py similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom_tests/parse/translate_unittest.py rename to mojo/public/tools/bindings/pylib/mojom_tests/parse/translate_unittest.py diff --git a/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom_tests/support/__init__.py b/mojo/public/tools/bindings/pylib/mojom_tests/support/__init__.py similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom_tests/support/__init__.py rename to mojo/public/tools/bindings/pylib/mojom_tests/support/__init__.py diff --git a/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom_tests/support/find_files.py b/mojo/public/tools/bindings/pylib/mojom_tests/support/find_files.py similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom_tests/support/find_files.py rename to mojo/public/tools/bindings/pylib/mojom_tests/support/find_files.py diff --git a/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom_tests/support/run_bindings_generator.py b/mojo/public/tools/bindings/pylib/mojom_tests/support/run_bindings_generator.py similarity index 100% rename from third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom_tests/support/run_bindings_generator.py rename to mojo/public/tools/bindings/pylib/mojom_tests/support/run_bindings_generator.py diff --git a/third_party/mojo/src/mojo/public/tools/gn/zip.py b/mojo/public/tools/gn/zip.py similarity index 100% rename from third_party/mojo/src/mojo/public/tools/gn/zip.py rename to mojo/public/tools/gn/zip.py diff --git a/third_party/mojo/src/mojo/public/tools/prepend.py b/mojo/public/tools/prepend.py similarity index 100% rename from third_party/mojo/src/mojo/public/tools/prepend.py rename to mojo/public/tools/prepend.py diff --git a/mojo/runner/BUILD.gn b/mojo/runner/BUILD.gn index 533478996ee31d..159af7d1159a44 100644 --- a/mojo/runner/BUILD.gn +++ b/mojo/runner/BUILD.gn @@ -4,8 +4,8 @@ import("//mojo/generate_mojo_shell_assets_list.gni") import("//mojo/public/mojo_application.gni") +import("//mojo/public/tools/bindings/mojom.gni") import("//testing/test.gni") -import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") group("runner") { testonly = true diff --git a/mojo/runner/android/android_handler.cc b/mojo/runner/android/android_handler.cc index 9cc4a819be854f..98313e31b22ddf 100644 --- a/mojo/runner/android/android_handler.cc +++ b/mojo/runner/android/android_handler.cc @@ -12,10 +12,10 @@ #include "jni/AndroidHandler_jni.h" #include "mojo/application/public/cpp/application_impl.h" #include "mojo/common/data_pipe_utils.h" +#include "mojo/public/c/system/main.h" #include "mojo/runner/android/run_android_application_function.h" #include "mojo/runner/host/native_application_support.h" #include "mojo/util/filename_util.h" -#include "third_party/mojo/src/mojo/public/c/system/main.h" #include "url/gurl.h" using base::android::AttachCurrentThread; diff --git a/mojo/runner/child/BUILD.gn b/mojo/runner/child/BUILD.gn index fe89ecb5bd0038..edf5f97b77ccd3 100644 --- a/mojo/runner/child/BUILD.gn +++ b/mojo/runner/child/BUILD.gn @@ -3,7 +3,7 @@ # found in the LICENSE file. import("//mojo/public/mojo_application.gni") -import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") +import("//mojo/public/tools/bindings/mojom.gni") group("child") { testonly = true diff --git a/mojo/runner/child/runner_connection.cc b/mojo/runner/child/runner_connection.cc index 015df41f83465b..c7758c41141d27 100644 --- a/mojo/runner/child/runner_connection.cc +++ b/mojo/runner/child/runner_connection.cc @@ -13,11 +13,11 @@ #include "base/threading/thread.h" #include "base/threading/thread_checker.h" #include "mojo/message_pump/message_pump_mojo.h" +#include "mojo/public/cpp/bindings/binding.h" #include "mojo/runner/child/child_controller.mojom.h" #include "third_party/mojo/src/mojo/edk/embedder/embedder.h" #include "third_party/mojo/src/mojo/edk/embedder/platform_channel_pair.h" #include "third_party/mojo/src/mojo/edk/embedder/scoped_platform_handle.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" namespace mojo { namespace runner { diff --git a/mojo/runner/context.cc b/mojo/runner/context.cc index 850cb5ac7d5252..a21323b03d1a38 100644 --- a/mojo/runner/context.cc +++ b/mojo/runner/context.cc @@ -28,6 +28,7 @@ #include "mojo/application/public/cpp/application_delegate.h" #include "mojo/application/public/cpp/application_impl.h" #include "mojo/package_manager/package_manager_impl.h" +#include "mojo/public/cpp/bindings/strong_binding.h" #include "mojo/runner/host/in_process_native_runner.h" #include "mojo/runner/host/out_of_process_native_runner.h" #include "mojo/runner/register_local_aliases.h" @@ -43,7 +44,6 @@ #include "mojo/shell/switches.h" #include "mojo/util/filename_util.h" #include "third_party/mojo/src/mojo/edk/embedder/embedder.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" #include "url/gurl.h" namespace mojo { diff --git a/mojo/runner/host/BUILD.gn b/mojo/runner/host/BUILD.gn index 4227baa07a16f5..f1890f87b26a85 100644 --- a/mojo/runner/host/BUILD.gn +++ b/mojo/runner/host/BUILD.gn @@ -4,8 +4,8 @@ import("//mojo/generate_mojo_shell_assets_list.gni") import("//mojo/public/mojo_application.gni") +import("//mojo/public/tools/bindings/mojom.gni") import("//testing/test.gni") -import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") group("host") { testonly = true diff --git a/mojo/runner/host/child_process.cc b/mojo/runner/host/child_process.cc index fac23ec2fab167..8d2ab952cf7b9b 100644 --- a/mojo/runner/host/child_process.cc +++ b/mojo/runner/host/child_process.cc @@ -22,6 +22,8 @@ #include "base/threading/thread.h" #include "base/threading/thread_checker.h" #include "mojo/message_pump/message_pump_mojo.h" +#include "mojo/public/cpp/bindings/binding.h" +#include "mojo/public/cpp/system/core.h" #include "mojo/runner/child/child_controller.mojom.h" #include "mojo/runner/host/native_application_support.h" #include "mojo/runner/host/switches.h" @@ -30,8 +32,6 @@ #include "third_party/mojo/src/mojo/edk/embedder/platform_channel_pair.h" #include "third_party/mojo/src/mojo/edk/embedder/process_delegate.h" #include "third_party/mojo/src/mojo/edk/embedder/scoped_platform_handle.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" -#include "third_party/mojo/src/mojo/public/cpp/system/core.h" #if defined(OS_LINUX) && !defined(OS_ANDROID) #include "base/rand_util.h" diff --git a/mojo/runner/host/child_process_host.cc b/mojo/runner/host/child_process_host.cc index 8cc2b018129d44..6074b5b5acfc7c 100644 --- a/mojo/runner/host/child_process_host.cc +++ b/mojo/runner/host/child_process_host.cc @@ -14,10 +14,10 @@ #include "base/process/launch.h" #include "base/task_runner.h" #include "base/thread_task_runner_handle.h" +#include "mojo/public/cpp/bindings/interface_ptr_info.h" +#include "mojo/public/cpp/system/core.h" #include "mojo/runner/host/switches.h" #include "third_party/mojo/src/mojo/edk/embedder/embedder.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_ptr_info.h" -#include "third_party/mojo/src/mojo/public/cpp/system/core.h" #if defined(OS_LINUX) && !defined(OS_ANDROID) #include "sandbox/linux/services/namespace_sandbox.h" diff --git a/mojo/runner/host/native_application_support.cc b/mojo/runner/host/native_application_support.cc index eae4e98f1ca312..5b53744a9d7669 100644 --- a/mojo/runner/host/native_application_support.cc +++ b/mojo/runner/host/native_application_support.cc @@ -9,10 +9,10 @@ #include "base/files/file_util.h" #include "base/logging.h" #include "mojo/platform_handle/platform_handle_private_thunks.h" -#include "third_party/mojo/src/mojo/public/platform/native/gles2_impl_chromium_extension_thunks.h" -#include "third_party/mojo/src/mojo/public/platform/native/gles2_impl_thunks.h" -#include "third_party/mojo/src/mojo/public/platform/native/gles2_thunks.h" -#include "third_party/mojo/src/mojo/public/platform/native/system_thunks.h" +#include "mojo/public/platform/native/gles2_impl_chromium_extension_thunks.h" +#include "mojo/public/platform/native/gles2_impl_thunks.h" +#include "mojo/public/platform/native/gles2_thunks.h" +#include "mojo/public/platform/native/system_thunks.h" namespace mojo { namespace runner { diff --git a/mojo/runner/host/native_application_support.h b/mojo/runner/host/native_application_support.h index 209cc183e3c251..dca22dedd63cc8 100644 --- a/mojo/runner/host/native_application_support.h +++ b/mojo/runner/host/native_application_support.h @@ -6,7 +6,7 @@ #define MOJO_RUNNER_HOST_NATIVE_APPLICATION_SUPPORT_H_ #include "base/native_library.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h" +#include "mojo/public/cpp/bindings/interface_request.h" namespace base { class FilePath; diff --git a/mojo/runner/shell_apptest.cc b/mojo/runner/shell_apptest.cc new file mode 100644 index 00000000000000..f0eb95cf1afdcf --- /dev/null +++ b/mojo/runner/shell_apptest.cc @@ -0,0 +1,199 @@ +// Copyright 2015 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "base/base_paths.h" +#include "base/bind.h" +#include "base/files/file_path.h" +#include "base/files/file_util.h" +#include "base/path_service.h" +#include "base/run_loop.h" +#include "base/strings/string_util.h" +#include "base/strings/stringprintf.h" +#include "mojo/application/public/cpp/application_impl.h" +#include "mojo/application/public/cpp/application_test_base.h" +#include "mojo/common/data_pipe_utils.h" +#include "mojo/public/cpp/system/macros.h" +#include "mojo/runner/kPingable.h" +#include "mojo/runner/test/pingable.mojom.h" +#include "mojo/services/http_server/public/cpp/http_server_util.h" +#include "mojo/services/http_server/public/interfaces/http_server.mojom.h" +#include "mojo/services/http_server/public/interfaces/http_server_factory.mojom.h" +#include "mojo/services/network/public/interfaces/net_address.mojom.h" + +namespace mojo { +namespace { + +std::string GetURL(uint16_t port, const std::string& path) { + return base::StringPrintf("http://127.0.0.1:%u/%s", + static_cast(port), path.c_str()); +} + +class GetHandler : public http_server::HttpHandler { + public: + GetHandler(InterfaceRequest request, uint16_t port) + : binding_(this, request.Pass()), port_(port) { + } + ~GetHandler() override {} + + private: + // http_server::HttpHandler: + void HandleRequest( + http_server::HttpRequestPtr request, + const Callback& callback) override { + http_server::HttpResponsePtr response; + if (base::StartsWith(request->relative_url, "/app", + base::CompareCase::SENSITIVE)) { + response = http_server::CreateHttpResponse( + 200, std::string(kPingable.data, kPingable.size)); + response->content_type = "application/octet-stream"; + } else if (request->relative_url == "/redirect") { + response = http_server::HttpResponse::New(); + response->status_code = 302; + response->custom_headers.insert("Location", GetURL(port_, "app")); + } else { + NOTREACHED(); + } + + callback.Run(response.Pass()); + } + + Binding binding_; + uint16_t port_; + + MOJO_DISALLOW_COPY_AND_ASSIGN(GetHandler); +}; + +typedef test::ApplicationTestBase ShellAppTest; + +class ShellHTTPAppTest : public test::ApplicationTestBase { + public: + ShellHTTPAppTest() : ApplicationTestBase() {} + ~ShellHTTPAppTest() override {} + + protected: + // ApplicationTestBase: + void SetUp() override { + ApplicationTestBase::SetUp(); + + application_impl()->ConnectToService("mojo:http_server", + &http_server_factory_); + + NetAddressPtr local_address(NetAddress::New()); + local_address->family = NET_ADDRESS_FAMILY_IPV4; + local_address->ipv4 = NetAddressIPv4::New(); + local_address->ipv4->addr.resize(4); + local_address->ipv4->addr[0] = 127; + local_address->ipv4->addr[1] = 0; + local_address->ipv4->addr[2] = 0; + local_address->ipv4->addr[3] = 1; + local_address->ipv4->port = 0; + http_server_factory_->CreateHttpServer(GetProxy(&http_server_), + local_address.Pass()); + + http_server_->GetPort([this](uint16_t p) { port_ = p; }); + EXPECT_TRUE(http_server_.WaitForIncomingResponse()); + + InterfacePtr http_handler; + handler_.reset(new GetHandler(GetProxy(&http_handler).Pass(), port_)); + http_server_->SetHandler(".*", http_handler.Pass(), + [](bool result) { EXPECT_TRUE(result); }); + EXPECT_TRUE(http_server_.WaitForIncomingResponse()); + } + + std::string GetURL(const std::string& path) { + return ::mojo::GetURL(port_, path); + } + + http_server::HttpServerFactoryPtr http_server_factory_; + http_server::HttpServerPtr http_server_; + scoped_ptr handler_; + uint16_t port_; + + private: + MOJO_DISALLOW_COPY_AND_ASSIGN(ShellHTTPAppTest); +}; + +// Test that we can load apps over http. +TEST_F(ShellHTTPAppTest, Http) { + InterfacePtr pingable; + application_impl()->ConnectToService(GetURL("app"), &pingable); + pingable->Ping("hello", + [this](const String& app_url, const String& connection_url, + const String& message) { + EXPECT_EQ(GetURL("app"), app_url); + EXPECT_EQ(GetURL("app"), connection_url); + EXPECT_EQ("hello", message); + base::MessageLoop::current()->QuitWhenIdle(); + }); + base::RunLoop().Run(); +} + +// Test that redirects work. +// TODO(aa): Test that apps receive the correct URL parameters. +TEST_F(ShellHTTPAppTest, Redirect) { + InterfacePtr pingable; + application_impl()->ConnectToService(GetURL("redirect"), &pingable); + pingable->Ping("hello", + [this](const String& app_url, const String& connection_url, + const String& message) { + EXPECT_EQ(GetURL("app"), app_url); + EXPECT_EQ(GetURL("app"), connection_url); + EXPECT_EQ("hello", message); + base::MessageLoop::current()->QuitWhenIdle(); + }); + base::RunLoop().Run(); +} + +// Test that querystring is not considered when resolving http applications. +// TODO(aa|qsr): Fix this test on Linux ASAN http://crbug.com/463662 +#if defined(ADDRESS_SANITIZER) +#define MAYBE_QueryHandling DISABLED_QueryHandling +#else +#define MAYBE_QueryHandling QueryHandling +#endif // ADDRESS_SANITIZER +TEST_F(ShellHTTPAppTest, MAYBE_QueryHandling) { + InterfacePtr pingable1; + InterfacePtr pingable2; + application_impl()->ConnectToService(GetURL("app?foo"), &pingable1); + application_impl()->ConnectToService(GetURL("app?bar"), &pingable2); + + int num_responses = 0; + auto callback = [this, &num_responses](const String& app_url, + const String& connection_url, + const String& message) { + EXPECT_EQ(GetURL("app"), app_url); + EXPECT_EQ("hello", message); + ++num_responses; + if (num_responses == 1) { + EXPECT_EQ(GetURL("app?foo"), connection_url); + } else if (num_responses == 2) { + EXPECT_EQ(GetURL("app?bar"), connection_url); + base::MessageLoop::current()->QuitWhenIdle(); + } else { + CHECK(false); + } + }; + pingable1->Ping("hello", callback); + pingable2->Ping("hello", callback); + base::RunLoop().Run(); +} + +// mojo: URLs can have querystrings too +TEST_F(ShellAppTest, MojoURLQueryHandling) { + InterfacePtr pingable; + application_impl()->ConnectToService("mojo:pingable_app?foo", &pingable); + auto callback = [this](const String& app_url, const String& connection_url, + const String& message) { + EXPECT_TRUE(base::EndsWith(app_url, "/pingable_app.mojo", + base::CompareCase::SENSITIVE)); + EXPECT_EQ(app_url.To() + "?foo", connection_url); + EXPECT_EQ("hello", message); + base::MessageLoop::current()->QuitWhenIdle(); + }; + pingable->Ping("hello", callback); + base::RunLoop().Run(); +} + +} // namespace +} // namespace mojo diff --git a/mojo/runner/shell_test_base.h b/mojo/runner/shell_test_base.h index 861b0230cd5c01..73343a80d15409 100644 --- a/mojo/runner/shell_test_base.h +++ b/mojo/runner/shell_test_base.h @@ -9,10 +9,10 @@ #include "base/macros.h" #include "base/message_loop/message_loop.h" +#include "mojo/public/cpp/bindings/interface_ptr_info.h" +#include "mojo/public/cpp/system/core.h" #include "mojo/runner/context.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_ptr_info.h" -#include "third_party/mojo/src/mojo/public/cpp/system/core.h" class GURL; diff --git a/mojo/runner/shell_test_base_unittest.cc b/mojo/runner/shell_test_base_unittest.cc index 3d2cca1fbf74b7..998d55b1d40786 100644 --- a/mojo/runner/shell_test_base_unittest.cc +++ b/mojo/runner/shell_test_base_unittest.cc @@ -9,11 +9,11 @@ #include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/strings/utf_string_conversions.h" +#include "mojo/public/cpp/bindings/interface_ptr.h" +#include "mojo/public/cpp/system/core.h" #include "mojo/services/test_service/test_request_tracker.mojom.h" #include "mojo/services/test_service/test_service.mojom.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/system/core.h" #include "url/gurl.h" using mojo::test::ServiceReport; diff --git a/mojo/runner/test/BUILD.gn b/mojo/runner/test/BUILD.gn new file mode 100644 index 00000000000000..bd94a9decb2c41 --- /dev/null +++ b/mojo/runner/test/BUILD.gn @@ -0,0 +1,28 @@ +# Copyright 2015 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//mojo/public/mojo_application.gni") +import("//mojo/public/tools/bindings/mojom.gni") + +mojom("bindings") { + sources = [ + "pingable.mojom", + ] +} + +mojo_native_application("pingable_app") { + output_name = "pingable_app" + + testonly = true + + sources = [ + "pingable_app.cc", + ] + + deps = [ + ":bindings", + "//mojo/application/public/cpp", + "//mojo/public/cpp/bindings:callback", + ] +} diff --git a/mojo/runner/test/pingable_app.cc b/mojo/runner/test/pingable_app.cc index f700044158b2f4..2930a51e2cd2f6 100644 --- a/mojo/runner/test/pingable_app.cc +++ b/mojo/runner/test/pingable_app.cc @@ -6,11 +6,11 @@ #include "mojo/application/public/cpp/application_impl.h" #include "mojo/application/public/cpp/application_runner.h" #include "mojo/application/public/cpp/interface_factory.h" +#include "mojo/public/c/system/main.h" +#include "mojo/public/cpp/bindings/callback.h" +#include "mojo/public/cpp/bindings/interface_request.h" +#include "mojo/public/cpp/bindings/strong_binding.h" #include "mojo/runner/test/pingable.mojom.h" -#include "third_party/mojo/src/mojo/public/c/system/main.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/callback.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" namespace mojo { diff --git a/mojo/services/DEPS b/mojo/services/DEPS index a7ee2748852fda..2bbe62df877b3a 100644 --- a/mojo/services/DEPS +++ b/mojo/services/DEPS @@ -3,7 +3,6 @@ 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/network/BUILD.gn b/mojo/services/network/BUILD.gn index 4dec488069742a..6b20a9ba545ccf 100644 --- a/mojo/services/network/BUILD.gn +++ b/mojo/services/network/BUILD.gn @@ -97,6 +97,7 @@ source_set("lib") { "//mojo/common:common_base", "//mojo/common:url_type_converters", "//mojo/message_pump", + "//mojo/public/cpp/system:system", "//mojo/services/network/public/cpp", "//mojo/services/network/public/interfaces", "//net", @@ -104,7 +105,6 @@ source_set("lib") { "//net:http_server", "//url", "//sql/mojo", - "//third_party/mojo/src/mojo/public/cpp/system:system", ] } @@ -119,10 +119,10 @@ source_set("sources") { ":lib", "//base", "//mojo/application/public/cpp", + "//mojo/public/c/system:for_shared_library", + "//mojo/public/cpp/bindings:bindings", "//mojo/services/network/public/cpp", "//mojo/services/network/public/interfaces", - "//third_party/mojo/src/mojo/public/c/system:for_shared_library", - "//third_party/mojo/src/mojo/public/cpp/bindings:bindings", ] } @@ -144,11 +144,11 @@ mojo_native_application("apptests") { "//mojo/application/public/cpp:test_support", "//mojo/common:common_base", "//mojo/message_pump", + "//mojo/public/cpp/bindings:callback", "//mojo/services/network/public/cpp", "//mojo/services/network/public/interfaces", "//net", "//net:test_support", "//testing/gtest", - "//third_party/mojo/src/mojo/public/cpp/bindings:callback", ] } diff --git a/mojo/services/network/cookie_store_impl.h b/mojo/services/network/cookie_store_impl.h index 944818467d5719..adfa85c02d111c 100644 --- a/mojo/services/network/cookie_store_impl.h +++ b/mojo/services/network/cookie_store_impl.h @@ -6,8 +6,8 @@ #define MOJO_SERVICES_NETWORK_COOKIE_STORE_IMPL_H_ #include "mojo/application/public/cpp/app_lifetime_helper.h" +#include "mojo/public/cpp/bindings/strong_binding.h" #include "mojo/services/network/public/interfaces/cookie_store.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" #include "url/gurl.h" namespace mojo { diff --git a/mojo/services/network/http_connection_impl.cc b/mojo/services/network/http_connection_impl.cc index 965c27e06a01ac..2d23f5f1af6908 100644 --- a/mojo/services/network/http_connection_impl.cc +++ b/mojo/services/network/http_connection_impl.cc @@ -13,6 +13,8 @@ #include "base/stl_util.h" #include "base/strings/string_util.h" #include "mojo/message_pump/handle_watcher.h" +#include "mojo/public/cpp/bindings/type_converter.h" +#include "mojo/public/cpp/system/data_pipe.h" #include "mojo/services/network/http_server_impl.h" #include "mojo/services/network/net_adapters.h" #include "mojo/services/network/public/cpp/web_socket_read_queue.h" @@ -24,8 +26,6 @@ #include "net/server/http_server.h" #include "net/server/http_server_request_info.h" #include "net/server/http_server_response_info.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/type_converter.h" -#include "third_party/mojo/src/mojo/public/cpp/system/data_pipe.h" namespace mojo { diff --git a/mojo/services/network/http_connection_impl.h b/mojo/services/network/http_connection_impl.h index c54218d6dac846..71f1fc45c004ee 100644 --- a/mojo/services/network/http_connection_impl.h +++ b/mojo/services/network/http_connection_impl.h @@ -10,9 +10,9 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" +#include "mojo/public/cpp/bindings/binding.h" #include "mojo/services/network/public/interfaces/http_connection.mojom.h" #include "mojo/services/network/public/interfaces/http_message.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" namespace net { class HttpServerRequestInfo; diff --git a/mojo/services/network/main.cc b/mojo/services/network/main.cc index b8051be4d727be..45216b1c6b60c1 100644 --- a/mojo/services/network/main.cc +++ b/mojo/services/network/main.cc @@ -4,8 +4,8 @@ #include "base/message_loop/message_loop.h" #include "mojo/application/public/cpp/application_runner.h" +#include "mojo/public/c/system/main.h" #include "mojo/services/network/network_service_delegate.h" -#include "third_party/mojo/src/mojo/public/c/system/main.h" MojoResult MojoMain(MojoHandle shell_handle) { mojo::ApplicationRunner runner(new mojo::NetworkServiceDelegate); diff --git a/mojo/services/network/net_address_type_converters.h b/mojo/services/network/net_address_type_converters.h index a1af10e8e05cd3..f9999087ecdf09 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_impl.h b/mojo/services/network/network_service_impl.h index b349cda1656077..fd6455c8e786fe 100644 --- a/mojo/services/network/network_service_impl.h +++ b/mojo/services/network/network_service_impl.h @@ -7,8 +7,8 @@ #include "base/compiler_specific.h" #include "mojo/application/public/cpp/app_lifetime_helper.h" +#include "mojo/public/cpp/bindings/strong_binding.h" #include "mojo/services/network/public/interfaces/network_service.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" #include "url/gurl.h" namespace mojo { diff --git a/mojo/services/network/public/DEPS b/mojo/services/network/public/DEPS index 3a9fdf749a6782..88036f82f97230 100644 --- a/mojo/services/network/public/DEPS +++ b/mojo/services/network/public/DEPS @@ -5,6 +5,6 @@ include_rules = [ "-services", "-testing", "!mojo/message_pump", + "+mojo/public", "+mojo/services/network/public", - "+third_party/mojo/src/mojo/public", ] diff --git a/mojo/services/network/public/cpp/BUILD.gn b/mojo/services/network/public/cpp/BUILD.gn index 7a079895d0145e..cca613d319e5c0 100644 --- a/mojo/services/network/public/cpp/BUILD.gn +++ b/mojo/services/network/public/cpp/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/mojo_sdk.gni") +import("//mojo/public/mojo_sdk.gni") mojo_sdk_source_set("cpp") { restrict_external_deps = false @@ -22,7 +22,7 @@ mojo_sdk_source_set("cpp") { "//mojo/application/public/cpp", "//mojo/environment:chromium", "//mojo/message_pump", - "//third_party/mojo/src/mojo/public/c/system", - "//third_party/mojo/src/mojo/public/cpp/system", + "//mojo/public/c/system", + "//mojo/public/cpp/system", ] } diff --git a/mojo/services/network/public/cpp/udp_socket_wrapper.cc b/mojo/services/network/public/cpp/udp_socket_wrapper.cc index 10a1f138222f29..a9c5c11e2d1d00 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 -#include "third_party/mojo/src/mojo/public/cpp/environment/logging.h" +#include "mojo/public/cpp/environment/logging.h" namespace mojo { namespace { diff --git a/mojo/services/network/public/cpp/udp_socket_wrapper.h b/mojo/services/network/public/cpp/udp_socket_wrapper.h index c45ed47db6f9de..a3cd370345926a 100644 --- a/mojo/services/network/public/cpp/udp_socket_wrapper.h +++ b/mojo/services/network/public/cpp/udp_socket_wrapper.h @@ -7,8 +7,8 @@ #include +#include "mojo/public/cpp/bindings/binding.h" #include "network/public/interfaces/udp_socket.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" namespace mojo { 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 b270892e397cf9..d63e774d59fbfd 100644 --- a/mojo/services/network/public/cpp/web_socket_read_queue.h +++ b/mojo/services/network/public/cpp/web_socket_read_queue.h @@ -9,7 +9,7 @@ #include "base/memory/scoped_vector.h" #include "base/memory/weak_ptr.h" #include "mojo/message_pump/handle_watcher.h" -#include "third_party/mojo/src/mojo/public/cpp/system/data_pipe.h" +#include "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 d0ba6b2fc73112..b7ca161ea065c8 100644 --- a/mojo/services/network/public/cpp/web_socket_write_queue.h +++ b/mojo/services/network/public/cpp/web_socket_write_queue.h @@ -9,7 +9,7 @@ #include "base/memory/scoped_vector.h" #include "base/memory/weak_ptr.h" #include "mojo/message_pump/handle_watcher.h" -#include "third_party/mojo/src/mojo/public/cpp/system/data_pipe.h" +#include "mojo/public/cpp/system/data_pipe.h" namespace mojo { diff --git a/mojo/services/network/public/interfaces/BUILD.gn b/mojo/services/network/public/interfaces/BUILD.gn index bc777bcf5fdc44..64ad3dc0446ffa 100644 --- a/mojo/services/network/public/interfaces/BUILD.gn +++ b/mojo/services/network/public/interfaces/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") +import("//mojo/public/tools/bindings/mojom.gni") mojom("interfaces") { sources = [ diff --git a/mojo/services/network/tcp_bound_socket_impl.h b/mojo/services/network/tcp_bound_socket_impl.h index 94946ba06060ff..17d4a0017804cd 100644 --- a/mojo/services/network/tcp_bound_socket_impl.h +++ b/mojo/services/network/tcp_bound_socket_impl.h @@ -7,9 +7,9 @@ #include "base/memory/scoped_ptr.h" #include "mojo/application/public/cpp/app_lifetime_helper.h" +#include "mojo/public/cpp/bindings/strong_binding.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/strong_binding.h" namespace mojo { diff --git a/mojo/services/network/tcp_connected_socket_impl.h b/mojo/services/network/tcp_connected_socket_impl.h index b1c072e18ad143..15d72f3cfb253e 100644 --- a/mojo/services/network/tcp_connected_socket_impl.h +++ b/mojo/services/network/tcp_connected_socket_impl.h @@ -9,9 +9,9 @@ #include "base/memory/weak_ptr.h" #include "mojo/application/public/cpp/app_lifetime_helper.h" #include "mojo/message_pump/handle_watcher.h" +#include "mojo/public/cpp/bindings/binding.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/binding.h" namespace mojo { diff --git a/mojo/services/network/tcp_server_socket_impl.h b/mojo/services/network/tcp_server_socket_impl.h index 3adb2888280034..84ce3093ba1ded 100644 --- a/mojo/services/network/tcp_server_socket_impl.h +++ b/mojo/services/network/tcp_server_socket_impl.h @@ -7,10 +7,10 @@ #include "base/memory/scoped_ptr.h" #include "mojo/application/public/cpp/app_lifetime_helper.h" +#include "mojo/public/cpp/bindings/strong_binding.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/strong_binding.h" namespace mojo { diff --git a/mojo/services/network/udp_socket_apptest.cc b/mojo/services/network/udp_socket_apptest.cc index 5b2032feffb98c..0c92ede974a3b7 100644 --- a/mojo/services/network/udp_socket_apptest.cc +++ b/mojo/services/network/udp_socket_apptest.cc @@ -8,12 +8,12 @@ #include "mojo/application/public/cpp/application_connection.h" #include "mojo/application/public/cpp/application_impl.h" #include "mojo/application/public/cpp/application_test_base.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 "net/base/net_errors.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/callback.h" namespace mojo { namespace service { diff --git a/mojo/services/network/udp_socket_impl.h b/mojo/services/network/udp_socket_impl.h index 3da68b37b4a34c..8a671cea2d34cb 100644 --- a/mojo/services/network/udp_socket_impl.h +++ b/mojo/services/network/udp_socket_impl.h @@ -10,10 +10,10 @@ #include "base/macros.h" #include "base/memory/ref_counted.h" #include "mojo/application/public/cpp/app_lifetime_helper.h" +#include "mojo/public/cpp/bindings/strong_binding.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/strong_binding.h" namespace net { class IOBuffer; diff --git a/mojo/services/network/url_loader_factory_impl.h b/mojo/services/network/url_loader_factory_impl.h index 1d6c7c6dcc2a78..e2bd44664b6f75 100644 --- a/mojo/services/network/url_loader_factory_impl.h +++ b/mojo/services/network/url_loader_factory_impl.h @@ -7,8 +7,8 @@ #include "base/compiler_specific.h" #include "mojo/application/public/cpp/app_lifetime_helper.h" +#include "mojo/public/cpp/bindings/strong_binding.h" #include "mojo/services/network/public/interfaces/url_loader_factory.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" namespace mojo { class NetworkContext; diff --git a/mojo/services/network/url_loader_impl.h b/mojo/services/network/url_loader_impl.h index 88bf89c05b4a90..0b7b44da52dc29 100644 --- a/mojo/services/network/url_loader_impl.h +++ b/mojo/services/network/url_loader_impl.h @@ -9,10 +9,10 @@ #include "base/memory/weak_ptr.h" #include "mojo/application/public/cpp/app_lifetime_helper.h" #include "mojo/message_pump/handle_watcher.h" +#include "mojo/public/cpp/bindings/binding.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" namespace mojo { diff --git a/mojo/services/network/url_loader_impl_apptest.cc b/mojo/services/network/url_loader_impl_apptest.cc index 7bbbba6f490996..0fe17495404ca8 100644 --- a/mojo/services/network/url_loader_impl_apptest.cc +++ b/mojo/services/network/url_loader_impl_apptest.cc @@ -9,6 +9,7 @@ #include "base/run_loop.h" #include "mojo/application/public/cpp/application_test_base.h" #include "mojo/message_pump/message_pump_mojo.h" +#include "mojo/public/cpp/bindings/interface_request.h" #include "mojo/services/network/network_context.h" #include "mojo/services/network/url_loader_impl.h" #include "net/base/net_errors.h" @@ -17,7 +18,6 @@ #include "net/url_request/url_request_status.h" #include "net/url_request/url_request_test_util.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h" namespace mojo { diff --git a/mojo/services/network/web_socket_factory_impl.h b/mojo/services/network/web_socket_factory_impl.h index 64fd1be90df7fc..a6e418f002c10c 100644 --- a/mojo/services/network/web_socket_factory_impl.h +++ b/mojo/services/network/web_socket_factory_impl.h @@ -7,8 +7,8 @@ #include "base/compiler_specific.h" #include "mojo/application/public/cpp/app_lifetime_helper.h" +#include "mojo/public/cpp/bindings/strong_binding.h" #include "mojo/services/network/public/interfaces/web_socket_factory.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" namespace mojo { class NetworkContext; diff --git a/mojo/services/network/web_socket_impl.h b/mojo/services/network/web_socket_impl.h index 0f26fff9a5e9bb..ce9c282bf7aff5 100644 --- a/mojo/services/network/web_socket_impl.h +++ b/mojo/services/network/web_socket_impl.h @@ -7,8 +7,8 @@ #include "base/memory/scoped_ptr.h" #include "mojo/application/public/cpp/app_lifetime_helper.h" +#include "mojo/public/cpp/bindings/strong_binding.h" #include "mojo/services/network/public/interfaces/web_socket.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" namespace net { class WebSocketChannel; diff --git a/mojo/services/test_service/BUILD.gn b/mojo/services/test_service/BUILD.gn index 90bf19a21bf20c..36647da07634ba 100644 --- a/mojo/services/test_service/BUILD.gn +++ b/mojo/services/test_service/BUILD.gn @@ -3,7 +3,7 @@ # found in the LICENSE file. import("//mojo/public/mojo_application.gni") -import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") +import("//mojo/public/tools/bindings/mojom.gni") group("test_service") { # Meta-target, don't link into production code. diff --git a/mojo/services/test_service/test_request_tracker_application.cc b/mojo/services/test_service/test_request_tracker_application.cc index cc6869b1dfcb5c..6facdc56fbd68b 100644 --- a/mojo/services/test_service/test_request_tracker_application.cc +++ b/mojo/services/test_service/test_request_tracker_application.cc @@ -8,8 +8,8 @@ #include "mojo/application/public/cpp/application_connection.h" #include "mojo/application/public/cpp/application_runner.h" +#include "mojo/public/c/system/main.h" #include "mojo/services/test_service/test_time_service_impl.h" -#include "third_party/mojo/src/mojo/public/c/system/main.h" namespace mojo { namespace test { diff --git a/mojo/services/test_service/test_request_tracker_application.h b/mojo/services/test_service/test_request_tracker_application.h index 371ee1f4affc17..a009f628e7d882 100644 --- a/mojo/services/test_service/test_request_tracker_application.h +++ b/mojo/services/test_service/test_request_tracker_application.h @@ -7,8 +7,8 @@ #include "mojo/application/public/cpp/application_delegate.h" #include "mojo/application/public/cpp/interface_factory_impl.h" +#include "mojo/public/cpp/system/macros.h" #include "mojo/services/test_service/test_request_tracker_impl.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { class ApplicationImpl; diff --git a/mojo/services/test_service/test_request_tracker_impl.h b/mojo/services/test_service/test_request_tracker_impl.h index 2edb5cc866d5ec..0ed220ac0cb0ef 100644 --- a/mojo/services/test_service/test_request_tracker_impl.h +++ b/mojo/services/test_service/test_request_tracker_impl.h @@ -6,9 +6,9 @@ #define SERVICES_TEST_SERVICE_TEST_REQUEST_TRACKER_IMPL_H_ #include "base/memory/weak_ptr.h" +#include "mojo/public/cpp/bindings/strong_binding.h" +#include "mojo/public/cpp/system/macros.h" #include "mojo/services/test_service/test_request_tracker.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { class ApplicationConnection; diff --git a/mojo/services/test_service/test_service_application.cc b/mojo/services/test_service/test_service_application.cc index 493551c44dc72a..7fd16fadbe5b59 100644 --- a/mojo/services/test_service/test_service_application.cc +++ b/mojo/services/test_service/test_service_application.cc @@ -8,9 +8,9 @@ #include "mojo/application/public/cpp/application_connection.h" #include "mojo/application/public/cpp/application_runner.h" +#include "mojo/public/c/system/main.h" #include "mojo/services/test_service/test_service_impl.h" #include "mojo/services/test_service/test_time_service_impl.h" -#include "third_party/mojo/src/mojo/public/c/system/main.h" namespace mojo { namespace test { diff --git a/mojo/services/test_service/test_service_application.h b/mojo/services/test_service/test_service_application.h index 704eb409f39f65..4ad5559ea0d1b6 100644 --- a/mojo/services/test_service/test_service_application.h +++ b/mojo/services/test_service/test_service_application.h @@ -7,7 +7,7 @@ #include "mojo/application/public/cpp/application_delegate.h" #include "mojo/application/public/cpp/interface_factory.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/cpp/system/macros.h" namespace mojo { class ApplicationConnection; diff --git a/mojo/services/test_service/test_service_impl.h b/mojo/services/test_service/test_service_impl.h index 9c8c86dc93e4ee..c6680a29e75d51 100644 --- a/mojo/services/test_service/test_service_impl.h +++ b/mojo/services/test_service/test_service_impl.h @@ -6,9 +6,9 @@ #define SERVICES_TEST_SERVICE_TEST_SERVICE_IMPL_H_ #include "base/memory/scoped_ptr.h" +#include "mojo/public/cpp/bindings/strong_binding.h" +#include "mojo/public/cpp/system/macros.h" #include "mojo/services/test_service/test_service.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { class ApplicationImpl; diff --git a/mojo/services/test_service/test_time_service_impl.h b/mojo/services/test_service/test_time_service_impl.h index af92964d0f4795..242f66c690778f 100644 --- a/mojo/services/test_service/test_time_service_impl.h +++ b/mojo/services/test_service/test_time_service_impl.h @@ -6,10 +6,10 @@ #define SERVICES_TEST_SERVICE_TEST_TIME_SERVICE_IMPL_H_ #include "base/memory/scoped_ptr.h" +#include "mojo/public/cpp/bindings/interface_request.h" +#include "mojo/public/cpp/bindings/strong_binding.h" +#include "mojo/public/cpp/system/macros.h" #include "mojo/services/test_service/test_service.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { diff --git a/mojo/services/test_service/tracked_service.h b/mojo/services/test_service/tracked_service.h index bd9cd21f8c35ff..62ec14a4563f0b 100644 --- a/mojo/services/test_service/tracked_service.h +++ b/mojo/services/test_service/tracked_service.h @@ -5,8 +5,8 @@ #ifndef SERVICES_TEST_SERVICE_TRACKED_SERVICE_H_ #define SERVICES_TEST_SERVICE_TRACKED_SERVICE_H_ +#include "mojo/public/cpp/system/macros.h" #include "mojo/services/test_service/test_request_tracker.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace test { diff --git a/mojo/services/tracing/BUILD.gn b/mojo/services/tracing/BUILD.gn index 63d3a9cbc72019..4c8421e6597ccb 100644 --- a/mojo/services/tracing/BUILD.gn +++ b/mojo/services/tracing/BUILD.gn @@ -14,7 +14,7 @@ mojo_native_application("tracing") { deps = [ ":lib", "//mojo/application/public/cpp", - "//third_party/mojo/src/mojo/public/cpp/system", + "//mojo/public/cpp/system", ] } diff --git a/mojo/services/tracing/main.cc b/mojo/services/tracing/main.cc index a7875aa939138b..1810d1b27904b5 100644 --- a/mojo/services/tracing/main.cc +++ b/mojo/services/tracing/main.cc @@ -4,8 +4,8 @@ #include "mojo/application/public/cpp/application_impl.h" #include "mojo/application/public/cpp/application_runner.h" +#include "mojo/public/c/system/main.h" #include "mojo/services/tracing/tracing_app.h" -#include "third_party/mojo/src/mojo/public/c/system/main.h" MojoResult MojoMain(MojoHandle shell_handle) { mojo::ApplicationRunner runner(new tracing::TracingApp); diff --git a/mojo/services/tracing/public/cpp/BUILD.gn b/mojo/services/tracing/public/cpp/BUILD.gn index bf40151d1b9b27..02eed11af71094 100644 --- a/mojo/services/tracing/public/cpp/BUILD.gn +++ b/mojo/services/tracing/public/cpp/BUILD.gn @@ -15,7 +15,7 @@ source_set("cpp") { deps = [ "//base", "//mojo/application/public/cpp", + "//mojo/public/cpp/bindings", "//mojo/services/tracing/public/interfaces", - "//third_party/mojo/src/mojo/public/cpp/bindings", ] } diff --git a/mojo/services/tracing/public/cpp/trace_provider_impl.h b/mojo/services/tracing/public/cpp/trace_provider_impl.h index dca965fd4dae71..5774911414f9f9 100644 --- a/mojo/services/tracing/public/cpp/trace_provider_impl.h +++ b/mojo/services/tracing/public/cpp/trace_provider_impl.h @@ -8,9 +8,9 @@ #include "base/macros.h" #include "base/memory/ref_counted_memory.h" #include "base/memory/weak_ptr.h" +#include "mojo/public/cpp/bindings/binding.h" +#include "mojo/public/cpp/bindings/interface_request.h" #include "mojo/services/tracing/public/interfaces/tracing.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h" namespace mojo { diff --git a/mojo/services/tracing/public/interfaces/BUILD.gn b/mojo/services/tracing/public/interfaces/BUILD.gn index 5b4ecae5c1fb47..8323805231aa06 100644 --- a/mojo/services/tracing/public/interfaces/BUILD.gn +++ b/mojo/services/tracing/public/interfaces/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") +import("//mojo/public/tools/bindings/mojom.gni") mojom("interfaces") { sources = [ diff --git a/mojo/services/tracing/trace_data_sink.h b/mojo/services/tracing/trace_data_sink.h index 658a2653bba45b..f945d4f0a50d8d 100644 --- a/mojo/services/tracing/trace_data_sink.h +++ b/mojo/services/tracing/trace_data_sink.h @@ -8,7 +8,7 @@ #include #include "base/basictypes.h" -#include "third_party/mojo/src/mojo/public/cpp/system/data_pipe.h" +#include "mojo/public/cpp/system/data_pipe.h" namespace tracing { diff --git a/mojo/services/tracing/trace_recorder_impl.h b/mojo/services/tracing/trace_recorder_impl.h index ea74dd6b9bd1b7..55640e1c1f5b2f 100644 --- a/mojo/services/tracing/trace_recorder_impl.h +++ b/mojo/services/tracing/trace_recorder_impl.h @@ -6,10 +6,10 @@ #define MOJO_SERVICES_TRACING_TRACE_RECORDER_IMPL_H_ #include "base/macros.h" +#include "mojo/public/cpp/bindings/binding.h" +#include "mojo/public/cpp/bindings/string.h" #include "mojo/services/tracing/public/interfaces/tracing.mojom.h" #include "mojo/services/tracing/trace_data_sink.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/string.h" namespace tracing { diff --git a/mojo/services/tracing/tracing_app.h b/mojo/services/tracing/tracing_app.h index 2c70fdd02544ef..ccf7a3524721f2 100644 --- a/mojo/services/tracing/tracing_app.h +++ b/mojo/services/tracing/tracing_app.h @@ -12,10 +12,10 @@ #include "mojo/application/public/cpp/interface_factory.h" #include "mojo/common/weak_binding_set.h" #include "mojo/common/weak_interface_ptr_set.h" +#include "mojo/public/cpp/bindings/strong_binding.h" #include "mojo/services/tracing/public/interfaces/tracing.mojom.h" #include "mojo/services/tracing/trace_data_sink.h" #include "mojo/services/tracing/trace_recorder_impl.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" namespace tracing { diff --git a/mojo/services/updater/BUILD.gn b/mojo/services/updater/BUILD.gn index 664b81904f27c8..6e3bd81d025735 100644 --- a/mojo/services/updater/BUILD.gn +++ b/mojo/services/updater/BUILD.gn @@ -2,8 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//mojo/public/mojo.gni") -import("$mojo_sdk_root/mojo/public/tools/bindings/mojom.gni") +import("//mojo/public/tools/bindings/mojom.gni") mojom("updater") { sources = [ diff --git a/mojo/shell/BUILD.gn b/mojo/shell/BUILD.gn index e7bd7abf9704a1..b54c7b505de9f0 100644 --- a/mojo/shell/BUILD.gn +++ b/mojo/shell/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") import("//testing/test.gni") source_set("shell") { @@ -43,7 +43,7 @@ source_set("shell") { "//base", "//mojo/application/public/interfaces", "//mojo/common", - "//third_party/mojo/src/mojo/public/cpp/bindings", + "//mojo/public/cpp/bindings", "//mojo/services/network/public/interfaces", "//mojo/services/updater", "//url", @@ -98,9 +98,9 @@ test("mojo_shell_unittests") { "//mojo/application/public/cpp", "//mojo/fetcher", "//mojo/package_manager", + "//mojo/public/cpp/system", "//mojo/util:filename_util", "//third_party/mojo/src/mojo/edk/test:run_all_unittests", - "//third_party/mojo/src/mojo/public/cpp/system", "//testing/gtest", "//url", ] diff --git a/mojo/shell/application_instance.h b/mojo/shell/application_instance.h index ea6a91be0d4a56..a99a3856b810be 100644 --- a/mojo/shell/application_instance.h +++ b/mojo/shell/application_instance.h @@ -11,10 +11,10 @@ #include "base/memory/scoped_ptr.h" #include "mojo/application/public/interfaces/application.mojom.h" #include "mojo/application/public/interfaces/shell.mojom.h" +#include "mojo/public/cpp/bindings/binding.h" #include "mojo/shell/capability_filter.h" #include "mojo/shell/connect_to_application_params.h" #include "mojo/shell/identity.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" #include "url/gurl.h" namespace mojo { diff --git a/mojo/shell/application_loader.h b/mojo/shell/application_loader.h index a13b254c0c8566..f464ab1305a532 100644 --- a/mojo/shell/application_loader.h +++ b/mojo/shell/application_loader.h @@ -7,8 +7,8 @@ #include "base/callback.h" #include "mojo/application/public/interfaces/shell.mojom.h" +#include "mojo/public/cpp/system/core.h" #include "mojo/services/network/public/interfaces/url_loader.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/system/core.h" #include "url/gurl.h" namespace mojo { diff --git a/mojo/shell/application_manager.cc b/mojo/shell/application_manager.cc index 688cdf48f428a5..16c483d25312fb 100644 --- a/mojo/shell/application_manager.cc +++ b/mojo/shell/application_manager.cc @@ -11,13 +11,13 @@ #include "base/stl_util.h" #include "base/strings/string_util.h" #include "base/trace_event/trace_event.h" +#include "mojo/public/cpp/bindings/binding.h" #include "mojo/shell/application_instance.h" #include "mojo/shell/fetcher.h" #include "mojo/shell/package_manager.h" #include "mojo/shell/query_util.h" #include "mojo/shell/shell_application_loader.h" #include "mojo/shell/switches.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" namespace mojo { namespace shell { diff --git a/mojo/shell/application_manager.h b/mojo/shell/application_manager.h index 3b8d90aacaacac..16afd4451ea25f 100644 --- a/mojo/shell/application_manager.h +++ b/mojo/shell/application_manager.h @@ -14,14 +14,14 @@ #include "mojo/application/public/interfaces/application.mojom.h" #include "mojo/application/public/interfaces/service_provider.mojom.h" #include "mojo/application/public/interfaces/shell.mojom.h" +#include "mojo/public/cpp/bindings/interface_ptr_info.h" +#include "mojo/public/cpp/bindings/interface_request.h" #include "mojo/shell/application_loader.h" #include "mojo/shell/capability_filter.h" #include "mojo/shell/connect_to_application_params.h" #include "mojo/shell/fetcher.h" #include "mojo/shell/identity.h" #include "mojo/shell/native_runner.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_ptr_info.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h" #include "url/gurl.h" namespace base { diff --git a/mojo/shell/application_manager_unittest.cc b/mojo/shell/application_manager_unittest.cc index 72a418253eeb5a..e13f616f5573d6 100644 --- a/mojo/shell/application_manager_unittest.cc +++ b/mojo/shell/application_manager_unittest.cc @@ -13,6 +13,7 @@ #include "mojo/application/public/cpp/application_impl.h" #include "mojo/application/public/cpp/interface_factory.h" #include "mojo/application/public/interfaces/service_provider.mojom.h" +#include "mojo/public/cpp/bindings/strong_binding.h" #include "mojo/shell/application_loader.h" #include "mojo/shell/application_manager.h" #include "mojo/shell/connect_util.h" @@ -21,7 +22,6 @@ #include "mojo/shell/test.mojom.h" #include "mojo/shell/test_package_manager.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" namespace mojo { namespace shell { diff --git a/mojo/shell/capability_filter.h b/mojo/shell/capability_filter.h index 685496f6df83f6..a2a9dfd6325571 100644 --- a/mojo/shell/capability_filter.h +++ b/mojo/shell/capability_filter.h @@ -8,7 +8,7 @@ #include #include -#include "third_party/mojo/src/mojo/public/cpp/bindings/array.h" +#include "mojo/public/cpp/bindings/array.h" namespace mojo { namespace shell { diff --git a/mojo/shell/capability_filter_test.cc b/mojo/shell/capability_filter_test.cc index 6214554fbcb82a..b50f7174dd817f 100644 --- a/mojo/shell/capability_filter_test.cc +++ b/mojo/shell/capability_filter_test.cc @@ -12,9 +12,9 @@ #include "mojo/application/public/cpp/interface_factory.h" #include "mojo/application/public/cpp/service_provider_impl.h" #include "mojo/common/weak_binding_set.h" +#include "mojo/public/cpp/bindings/strong_binding.h" #include "mojo/shell/application_loader.h" #include "mojo/shell/package_manager.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" namespace mojo { namespace shell { diff --git a/mojo/shell/connect_to_application_params.h b/mojo/shell/connect_to_application_params.h index 457db98b847c37..badca064e3368f 100644 --- a/mojo/shell/connect_to_application_params.h +++ b/mojo/shell/connect_to_application_params.h @@ -10,9 +10,9 @@ #include "base/callback.h" #include "mojo/application/public/interfaces/service_provider.mojom.h" #include "mojo/application/public/interfaces/shell.mojom.h" +#include "mojo/public/cpp/bindings/interface_request.h" #include "mojo/services/network/public/interfaces/url_loader.mojom.h" #include "mojo/shell/identity.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h" #include "url/gurl.h" namespace mojo { diff --git a/mojo/shell/connect_util.h b/mojo/shell/connect_util.h index 8d1a8d63798692..8c36b3d37af8ab 100644 --- a/mojo/shell/connect_util.h +++ b/mojo/shell/connect_util.h @@ -5,8 +5,8 @@ #ifndef MOJO_SHELL_CONNECT_UTIL_H_ #define MOJO_SHELL_CONNECT_UTIL_H_ -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_ptr.h" -#include "third_party/mojo/src/mojo/public/cpp/system/handle.h" +#include "mojo/public/cpp/bindings/interface_ptr.h" +#include "mojo/public/cpp/system/handle.h" class GURL; diff --git a/mojo/shell/data_pipe_peek.h b/mojo/shell/data_pipe_peek.h index a26e079f409a26..0bcf1dd9f29b4e 100644 --- a/mojo/shell/data_pipe_peek.h +++ b/mojo/shell/data_pipe_peek.h @@ -7,7 +7,7 @@ #include -#include "third_party/mojo/src/mojo/public/cpp/system/core.h" +#include "mojo/public/cpp/system/core.h" namespace mojo { namespace shell { diff --git a/mojo/shell/native_runner.h b/mojo/shell/native_runner.h index d4d5b8b3fe18f1..77e73c8caa6d83 100644 --- a/mojo/shell/native_runner.h +++ b/mojo/shell/native_runner.h @@ -8,7 +8,7 @@ #include "base/callback_forward.h" #include "base/memory/scoped_ptr.h" #include "mojo/application/public/interfaces/application.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h" +#include "mojo/public/cpp/bindings/interface_request.h" #if defined(OS_WIN) #undef DELETE diff --git a/mojo/shell/static_application_loader.cc b/mojo/shell/static_application_loader.cc index a0f90a87d9020c..482021dfead006 100644 --- a/mojo/shell/static_application_loader.cc +++ b/mojo/shell/static_application_loader.cc @@ -13,7 +13,7 @@ #include "mojo/application/public/cpp/application_delegate.h" #include "mojo/application/public/cpp/application_runner.h" #include "mojo/application/public/interfaces/application.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h" +#include "mojo/public/cpp/bindings/interface_request.h" namespace mojo { namespace shell { diff --git a/mojo/util/capture_util.h b/mojo/util/capture_util.h index c4ccd0d4ebce3c..4b89eb72d05d4f 100644 --- a/mojo/util/capture_util.h +++ b/mojo/util/capture_util.h @@ -5,7 +5,7 @@ #ifndef MOJO_UTIL_CAPTURE_UTIL_H_ #define MOJO_UTIL_CAPTURE_UTIL_H_ -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/template_util.h" +#include "mojo/public/cpp/bindings/lib/template_util.h" namespace mojo { diff --git a/net/BUILD.gn b/net/BUILD.gn index 6daea5a0c0fc07..478634f32b2c69 100644 --- a/net/BUILD.gn +++ b/net/BUILD.gn @@ -784,8 +784,8 @@ if (use_v8_in_net && !is_android) { ":net", "//base", "//mojo/common", + "//mojo/public/cpp/bindings", "//net/interfaces", - "//third_party/mojo/src/mojo/public/cpp/bindings", # NOTE(amistry): As long as we support in-process Mojo v8 PAC, we need # this dependency since in_process_mojo_proxy_resolver_factory creates @@ -805,8 +805,8 @@ if (use_v8_in_net && !is_android) { public_deps = [ ":net", + "//mojo/public/cpp/bindings", "//net/interfaces", - "//third_party/mojo/src/mojo/public/cpp/bindings", ] } @@ -829,8 +829,8 @@ if (use_v8_in_net && !is_android) { ":mojo_type_converters", ":net", "//mojo/common", + "//mojo/public/cpp/bindings", "//net/interfaces", - "//third_party/mojo/src/mojo/public/cpp/bindings", ] } } diff --git a/net/DEPS b/net/DEPS index fd0fd480cde03b..5f49c8048b5227 100644 --- a/net/DEPS +++ b/net/DEPS @@ -3,8 +3,8 @@ include_rules = [ "+gin", "+jni", "+mojo/common", + "+mojo/public", "+third_party/apple_apsl", - "+third_party/mojo/src/mojo/public", "+third_party/nss", "+third_party/protobuf/src/google/protobuf", "+third_party/zlib", diff --git a/net/dns/host_resolver_mojo.cc b/net/dns/host_resolver_mojo.cc index 161f586f61a45f..ed9c37451251e7 100644 --- a/net/dns/host_resolver_mojo.cc +++ b/net/dns/host_resolver_mojo.cc @@ -4,11 +4,11 @@ #include "net/dns/host_resolver_mojo.h" +#include "mojo/public/cpp/bindings/binding.h" #include "net/base/address_list.h" #include "net/base/net_errors.h" #include "net/dns/mojo_host_type_converters.h" #include "net/log/net_log.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" namespace net { namespace { diff --git a/net/dns/host_resolver_mojo_unittest.cc b/net/dns/host_resolver_mojo_unittest.cc index 209bda88a812cf..54ec594811356f 100644 --- a/net/dns/host_resolver_mojo_unittest.cc +++ b/net/dns/host_resolver_mojo_unittest.cc @@ -7,6 +7,7 @@ #include #include "base/memory/scoped_vector.h" +#include "mojo/public/cpp/bindings/binding.h" #include "net/base/address_list.h" #include "net/base/net_errors.h" #include "net/base/request_priority.h" @@ -14,7 +15,6 @@ #include "net/dns/mojo_host_type_converters.h" #include "net/test/event_waiter.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" namespace net { namespace { diff --git a/net/dns/mojo_host_resolver_impl_unittest.cc b/net/dns/mojo_host_resolver_impl_unittest.cc index 4f7a05b47ee94d..130462cd3764d2 100644 --- a/net/dns/mojo_host_resolver_impl_unittest.cc +++ b/net/dns/mojo_host_resolver_impl_unittest.cc @@ -9,6 +9,8 @@ #include "base/memory/scoped_ptr.h" #include "base/run_loop.h" #include "base/time/time.h" +#include "mojo/public/cpp/bindings/binding.h" +#include "mojo/public/cpp/bindings/interface_request.h" #include "net/base/address_list.h" #include "net/base/net_errors.h" #include "net/base/net_util.h" @@ -16,8 +18,6 @@ #include "net/dns/mojo_host_type_converters.h" #include "net/log/net_log.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h" namespace net { diff --git a/net/dns/mojo_host_type_converters.cc b/net/dns/mojo_host_type_converters.cc index c64679ef46cb32..253d8c9f8979c2 100644 --- a/net/dns/mojo_host_type_converters.cc +++ b/net/dns/mojo_host_type_converters.cc @@ -4,9 +4,9 @@ #include "net/dns/mojo_host_type_converters.h" +#include "mojo/public/cpp/bindings/type_converter.h" #include "net/base/address_list.h" #include "net/base/net_util.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/type_converter.h" namespace net { namespace { diff --git a/net/interfaces/BUILD.gn b/net/interfaces/BUILD.gn index 03a07785251e4d..4a5b799158251b 100644 --- a/net/interfaces/BUILD.gn +++ b/net/interfaces/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") +import("//mojo/public/tools/bindings/mojom.gni") mojom("interfaces") { sources = [ diff --git a/net/proxy/mojo_proxy_resolver_factory.h b/net/proxy/mojo_proxy_resolver_factory.h index 2163cb0cad3ad6..98cb3475f8fee4 100644 --- a/net/proxy/mojo_proxy_resolver_factory.h +++ b/net/proxy/mojo_proxy_resolver_factory.h @@ -7,9 +7,9 @@ #include "base/callback_helpers.h" #include "base/memory/scoped_ptr.h" +#include "mojo/public/cpp/bindings/interface_request.h" #include "net/interfaces/host_resolver_service.mojom.h" #include "net/interfaces/proxy_resolver_service.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h" namespace net { diff --git a/net/proxy/mojo_proxy_resolver_factory_impl.h b/net/proxy/mojo_proxy_resolver_factory_impl.h index dcc7b482bf62c7..4c8252e3bbf446 100644 --- a/net/proxy/mojo_proxy_resolver_factory_impl.h +++ b/net/proxy/mojo_proxy_resolver_factory_impl.h @@ -8,8 +8,8 @@ #include #include "base/callback.h" +#include "mojo/public/cpp/bindings/strong_binding.h" #include "net/interfaces/proxy_resolver_service.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" namespace net { class HostResolver; diff --git a/net/proxy/mojo_proxy_resolver_factory_impl_unittest.cc b/net/proxy/mojo_proxy_resolver_factory_impl_unittest.cc index 0262d647cc1c18..d8312fa8f9a60f 100644 --- a/net/proxy/mojo_proxy_resolver_factory_impl_unittest.cc +++ b/net/proxy/mojo_proxy_resolver_factory_impl_unittest.cc @@ -5,12 +5,12 @@ #include "net/proxy/mojo_proxy_resolver_factory_impl.h" #include "base/strings/utf_string_conversions.h" +#include "mojo/public/cpp/bindings/binding.h" #include "net/base/test_completion_callback.h" #include "net/proxy/mock_proxy_resolver.h" #include "net/proxy/proxy_resolver_v8_tracing.h" #include "net/test/event_waiter.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" namespace net { namespace { diff --git a/net/proxy/mojo_proxy_resolver_impl_unittest.cc b/net/proxy/mojo_proxy_resolver_impl_unittest.cc index bfc777325a7953..a76c5863aebd4c 100644 --- a/net/proxy/mojo_proxy_resolver_impl_unittest.cc +++ b/net/proxy/mojo_proxy_resolver_impl_unittest.cc @@ -8,6 +8,7 @@ #include #include "base/run_loop.h" +#include "mojo/public/cpp/bindings/binding.h" #include "net/base/net_errors.h" #include "net/proxy/mock_proxy_resolver.h" #include "net/proxy/mojo_proxy_type_converters.h" @@ -16,7 +17,6 @@ #include "net/proxy/proxy_server.h" #include "net/test/event_waiter.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" namespace net { namespace { diff --git a/net/proxy/mojo_proxy_type_converters.h b/net/proxy/mojo_proxy_type_converters.h index 55ea69df919e6a..51b0e380c666a7 100644 --- a/net/proxy/mojo_proxy_type_converters.h +++ b/net/proxy/mojo_proxy_type_converters.h @@ -5,8 +5,8 @@ #ifndef NET_PROXY_MOJO_PROXY_TYPE_CONVERTERS_H_ #define NET_PROXY_MOJO_PROXY_TYPE_CONVERTERS_H_ +#include "mojo/public/cpp/bindings/type_converter.h" #include "net/interfaces/proxy_resolver_service.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/type_converter.h" namespace net { class ProxyInfo; diff --git a/net/proxy/proxy_resolver_factory_mojo.cc b/net/proxy/proxy_resolver_factory_mojo.cc index 32c1203e19b0da..592e7489f127b0 100644 --- a/net/proxy/proxy_resolver_factory_mojo.cc +++ b/net/proxy/proxy_resolver_factory_mojo.cc @@ -13,6 +13,7 @@ #include "base/values.h" #include "mojo/common/common_type_converters.h" #include "mojo/common/url_type_converters.h" +#include "mojo/public/cpp/bindings/binding.h" #include "net/base/load_states.h" #include "net/base/net_errors.h" #include "net/dns/mojo_host_resolver_impl.h" @@ -24,7 +25,6 @@ #include "net/proxy/proxy_resolver.h" #include "net/proxy/proxy_resolver_error_observer.h" #include "net/proxy/proxy_resolver_script_data.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" namespace net { namespace { diff --git a/net/proxy/proxy_resolver_factory_mojo.h b/net/proxy/proxy_resolver_factory_mojo.h index 65e4866a99b4c6..23a679d430bb9c 100644 --- a/net/proxy/proxy_resolver_factory_mojo.h +++ b/net/proxy/proxy_resolver_factory_mojo.h @@ -7,9 +7,9 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" +#include "mojo/public/cpp/bindings/binding.h" #include "net/base/completion_callback.h" #include "net/proxy/proxy_resolver_factory.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" namespace net { class HostResolver; diff --git a/net/proxy/proxy_resolver_factory_mojo_unittest.cc b/net/proxy/proxy_resolver_factory_mojo_unittest.cc index 15d8a64d9f5475..69e0f4ebb984ac 100644 --- a/net/proxy/proxy_resolver_factory_mojo_unittest.cc +++ b/net/proxy/proxy_resolver_factory_mojo_unittest.cc @@ -16,6 +16,7 @@ #include "base/stl_util.h" #include "base/values.h" #include "mojo/common/common_type_converters.h" +#include "mojo/public/cpp/bindings/binding.h" #include "net/base/load_states.h" #include "net/base/net_errors.h" #include "net/base/test_completion_callback.h" @@ -29,7 +30,6 @@ #include "net/proxy/proxy_resolver_script_data.h" #include "net/test/event_waiter.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" #include "url/gurl.h" namespace net { diff --git a/skia/public/BUILD.gn b/skia/public/BUILD.gn index ce407dfacf0793..bcc7a289dd85af 100644 --- a/skia/public/BUILD.gn +++ b/skia/public/BUILD.gn @@ -14,7 +14,7 @@ source_set("public") { deps = [ "//base", + "//mojo/public/cpp/bindings", "//skia", - "//third_party/mojo/src/mojo/public/cpp/bindings", ] } diff --git a/skia/public/interfaces/BUILD.gn b/skia/public/interfaces/BUILD.gn index ea57c5032c69ba..e2ffdf006ad1c7 100644 --- a/skia/public/interfaces/BUILD.gn +++ b/skia/public/interfaces/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") +import("//mojo/public/tools/bindings/mojom.gni") mojom("interfaces") { sources = [ diff --git a/sql/mojo/BUILD.gn b/sql/mojo/BUILD.gn index 18feaec1094293..0ce00d87636f31 100644 --- a/sql/mojo/BUILD.gn +++ b/sql/mojo/BUILD.gn @@ -53,10 +53,10 @@ mojo_native_application("apptests") { "//components/filesystem/public/interfaces", "//mojo/application/public/cpp:sources", "//mojo/application/public/cpp:test_support", + "//mojo/public/cpp/bindings", "//sql", "//sql:redirection_header", "//sql:test_support", "//testing/gtest:gtest", - "//third_party/mojo/src/mojo/public/cpp/bindings", ] } diff --git a/sql/mojo/DEPS b/sql/mojo/DEPS index 23304c8b1bc104..be63411efe96bd 100644 --- a/sql/mojo/DEPS +++ b/sql/mojo/DEPS @@ -3,5 +3,4 @@ include_rules = [ "+mojo/application", "+mojo/public", "+mojo/util", - "+third_party/mojo/src/mojo/public", ] diff --git a/sql/mojo/mojo_vfs.cc b/sql/mojo/mojo_vfs.cc index e2fe138e505b58..943f38bd75eb79 100644 --- a/sql/mojo/mojo_vfs.cc +++ b/sql/mojo/mojo_vfs.cc @@ -11,8 +11,8 @@ #include "components/filesystem/public/interfaces/file.mojom.h" #include "components/filesystem/public/interfaces/file_system.mojom.h" #include "components/filesystem/public/interfaces/types.mojom.h" +#include "mojo/public/cpp/bindings/lib/template_util.h" #include "mojo/util/capture_util.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/template_util.h" #include "third_party/sqlite/sqlite3.h" using mojo::Capture; diff --git a/sql/mojo/sql_test_base.h b/sql/mojo/sql_test_base.h index 11131d4b3ca0f3..d39198da96834b 100644 --- a/sql/mojo/sql_test_base.h +++ b/sql/mojo/sql_test_base.h @@ -9,9 +9,9 @@ #include "base/memory/scoped_ptr.h" #include "components/filesystem/public/interfaces/file_system.mojom.h" #include "mojo/application/public/cpp/application_test_base.h" +#include "mojo/public/cpp/bindings/binding.h" #include "sql/connection.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" namespace sql { diff --git a/third_party/khronos/DEPS b/third_party/khronos/DEPS index 971f63f7337313..e2f13b6bccd6ac 100644 --- a/third_party/khronos/DEPS +++ b/third_party/khronos/DEPS @@ -1,4 +1,4 @@ include_rules = [ "+gpu/command_buffer/client/gles2_c_lib_export.h", - "+third_party/mojo/src/mojo/public/c/gles2/gles2_export.h", + "+mojo/public/c/gles2/gles2_export.h", ] diff --git a/third_party/khronos/KHR/khrplatform.h b/third_party/khronos/KHR/khrplatform.h index ffe75dba94d940..328bd65fcef336 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 "third_party/mojo/src/mojo/public/c/gles2/gles2_export.h" +#include "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/third_party/mojo/mojo_edk_tests.gyp b/third_party/mojo/mojo_edk_tests.gyp index aee91375c0c375..e607879883d112 100644 --- a/third_party/mojo/mojo_edk_tests.gyp +++ b/third_party/mojo/mojo_edk_tests.gyp @@ -45,25 +45,25 @@ 'mojo_public.gyp:mojo_utility', ], 'sources': [ - 'src/mojo/public/cpp/bindings/tests/array_unittest.cc', - 'src/mojo/public/cpp/bindings/tests/bounds_checker_unittest.cc', - 'src/mojo/public/cpp/bindings/tests/buffer_unittest.cc', - 'src/mojo/public/cpp/bindings/tests/connector_unittest.cc', - 'src/mojo/public/cpp/bindings/tests/container_test_util.cc', - 'src/mojo/public/cpp/bindings/tests/equals_unittest.cc', - 'src/mojo/public/cpp/bindings/tests/handle_passing_unittest.cc', - 'src/mojo/public/cpp/bindings/tests/interface_ptr_unittest.cc', - 'src/mojo/public/cpp/bindings/tests/map_unittest.cc', - 'src/mojo/public/cpp/bindings/tests/message_queue.cc', - 'src/mojo/public/cpp/bindings/tests/message_queue.h', - 'src/mojo/public/cpp/bindings/tests/request_response_unittest.cc', - 'src/mojo/public/cpp/bindings/tests/router_unittest.cc', - 'src/mojo/public/cpp/bindings/tests/sample_service_unittest.cc', - 'src/mojo/public/cpp/bindings/tests/serialization_warning_unittest.cc', - 'src/mojo/public/cpp/bindings/tests/string_unittest.cc', - 'src/mojo/public/cpp/bindings/tests/struct_unittest.cc', - 'src/mojo/public/cpp/bindings/tests/type_conversion_unittest.cc', - 'src/mojo/public/cpp/bindings/tests/validation_unittest.cc', + '../../mojo/public/cpp/bindings/tests/array_unittest.cc', + '../../mojo/public/cpp/bindings/tests/bounds_checker_unittest.cc', + '../../mojo/public/cpp/bindings/tests/buffer_unittest.cc', + '../../mojo/public/cpp/bindings/tests/connector_unittest.cc', + '../../mojo/public/cpp/bindings/tests/container_test_util.cc', + '../../mojo/public/cpp/bindings/tests/equals_unittest.cc', + '../../mojo/public/cpp/bindings/tests/handle_passing_unittest.cc', + '../../mojo/public/cpp/bindings/tests/interface_ptr_unittest.cc', + '../../mojo/public/cpp/bindings/tests/map_unittest.cc', + '../../mojo/public/cpp/bindings/tests/message_queue.cc', + '../../mojo/public/cpp/bindings/tests/message_queue.h', + '../../mojo/public/cpp/bindings/tests/request_response_unittest.cc', + '../../mojo/public/cpp/bindings/tests/router_unittest.cc', + '../../mojo/public/cpp/bindings/tests/sample_service_unittest.cc', + '../../mojo/public/cpp/bindings/tests/serialization_warning_unittest.cc', + '../../mojo/public/cpp/bindings/tests/string_unittest.cc', + '../../mojo/public/cpp/bindings/tests/struct_unittest.cc', + '../../mojo/public/cpp/bindings/tests/type_conversion_unittest.cc', + '../../mojo/public/cpp/bindings/tests/validation_unittest.cc', ], }, { @@ -81,7 +81,7 @@ 'mojo_public.gyp:mojo_utility', ], 'sources': [ - 'src/mojo/public/cpp/bindings/tests/bindings_perftest.cc', + '../../mojo/public/cpp/bindings/tests/bindings_perftest.cc', ], }, { @@ -98,10 +98,10 @@ ], 'include_dirs': [ '../..' ], 'sources': [ - 'src/mojo/public/cpp/environment/tests/async_wait_unittest.cc', - 'src/mojo/public/cpp/environment/tests/async_waiter_unittest.cc', - 'src/mojo/public/cpp/environment/tests/logger_unittest.cc', - 'src/mojo/public/cpp/environment/tests/logging_unittest.cc', + '../../mojo/public/cpp/environment/tests/async_wait_unittest.cc', + '../../mojo/public/cpp/environment/tests/async_waiter_unittest.cc', + '../../mojo/public/cpp/environment/tests/logger_unittest.cc', + '../../mojo/public/cpp/environment/tests/logging_unittest.cc', ], }, { @@ -132,16 +132,16 @@ ], 'include_dirs': [ '../..' ], 'sources': [ - 'src/mojo/public/cpp/utility/tests/mutex_unittest.cc', - 'src/mojo/public/cpp/utility/tests/run_loop_unittest.cc', - 'src/mojo/public/cpp/utility/tests/thread_unittest.cc', + '../../mojo/public/cpp/utility/tests/mutex_unittest.cc', + '../../mojo/public/cpp/utility/tests/run_loop_unittest.cc', + '../../mojo/public/cpp/utility/tests/thread_unittest.cc', ], 'conditions': [ # See crbug.com/342893: ['OS=="win"', { 'sources!': [ - 'src/mojo/public/cpp/utility/tests/mutex_unittest.cc', - 'src/mojo/public/cpp/utility/tests/thread_unittest.cc', + '../../mojo/public/cpp/utility/tests/mutex_unittest.cc', + '../../mojo/public/cpp/utility/tests/thread_unittest.cc', ], }], ], @@ -158,7 +158,7 @@ 'mojo_public.gyp:mojo_utility', ], 'sources': [ - 'src/mojo/public/c/system/tests/core_perftest.cc', + '../../mojo/public/c/system/tests/core_perftest.cc', ], }, { @@ -182,9 +182,9 @@ 'src/mojo/edk/system/channel_test_base.cc', 'src/mojo/edk/system/channel_test_base.h', 'src/mojo/edk/system/channel_unittest.cc', - 'src/mojo/edk/system/core_unittest.cc', 'src/mojo/edk/system/core_test_base.cc', 'src/mojo/edk/system/core_test_base.h', + 'src/mojo/edk/system/core_unittest.cc', 'src/mojo/edk/system/data_pipe_impl_unittest.cc', 'src/mojo/edk/system/data_pipe_unittest.cc', 'src/mojo/edk/system/dispatcher_unittest.cc', diff --git a/third_party/mojo/mojo_public.gyp b/third_party/mojo/mojo_public.gyp index 5d4b47386d3953..62991f92223c67 100644 --- a/third_party/mojo/mojo_public.gyp +++ b/third_party/mojo/mojo_public.gyp @@ -49,8 +49,8 @@ ], }, 'sources': [ - 'src/mojo/public/platform/native/system_thunks.cc', - 'src/mojo/public/platform/native/system_thunks.h', + '../../mojo/public/platform/native/system_thunks.cc', + '../../mojo/public/platform/native/system_thunks.h', ], 'dependencies': [ 'mojo_system_headers', @@ -61,14 +61,14 @@ 'target_name': 'mojo_system_headers', 'type': 'none', 'sources': [ - 'src/mojo/public/c/system/buffer.h', - 'src/mojo/public/c/system/core.h', - 'src/mojo/public/c/system/data_pipe.h', - 'src/mojo/public/c/system/functions.h', - 'src/mojo/public/c/system/macros.h', - 'src/mojo/public/c/system/message_pipe.h', - 'src/mojo/public/c/system/system_export.h', - 'src/mojo/public/c/system/types.h', + '../../mojo/public/c/system/buffer.h', + '../../mojo/public/c/system/core.h', + '../../mojo/public/c/system/data_pipe.h', + '../../mojo/public/c/system/functions.h', + '../../mojo/public/c/system/macros.h', + '../../mojo/public/c/system/message_pipe.h', + '../../mojo/public/c/system/system_export.h', + '../../mojo/public/c/system/types.h', ], }, { @@ -76,13 +76,13 @@ 'target_name': 'mojo_system_cpp_headers', 'type': 'none', 'sources': [ - 'src/mojo/public/cpp/system/buffer.h', - 'src/mojo/public/cpp/system/core.h', - 'src/mojo/public/cpp/system/data_pipe.h', - 'src/mojo/public/cpp/system/functions.h', - 'src/mojo/public/cpp/system/handle.h', - 'src/mojo/public/cpp/system/macros.h', - 'src/mojo/public/cpp/system/message_pipe.h', + '../../mojo/public/cpp/system/buffer.h', + '../../mojo/public/cpp/system/core.h', + '../../mojo/public/cpp/system/data_pipe.h', + '../../mojo/public/cpp/system/functions.h', + '../../mojo/public/cpp/system/handle.h', + '../../mojo/public/cpp/system/macros.h', + '../../mojo/public/cpp/system/message_pipe.h', ], 'dependencies': [ 'mojo_system_headers', @@ -96,64 +96,64 @@ '../..' ], 'sources': [ - 'src/mojo/public/cpp/bindings/array.h', - 'src/mojo/public/cpp/bindings/binding.h', - 'src/mojo/public/cpp/bindings/callback.h', - 'src/mojo/public/cpp/bindings/interface_ptr.h', - 'src/mojo/public/cpp/bindings/interface_request.h', - 'src/mojo/public/cpp/bindings/message.h', - 'src/mojo/public/cpp/bindings/message_filter.h', - 'src/mojo/public/cpp/bindings/no_interface.h', - 'src/mojo/public/cpp/bindings/string.h', - 'src/mojo/public/cpp/bindings/strong_binding.h', - 'src/mojo/public/cpp/bindings/type_converter.h', - 'src/mojo/public/cpp/bindings/lib/array_internal.h', - 'src/mojo/public/cpp/bindings/lib/array_internal.cc', - 'src/mojo/public/cpp/bindings/lib/array_serialization.h', - 'src/mojo/public/cpp/bindings/lib/bindings_internal.h', - 'src/mojo/public/cpp/bindings/lib/bindings_serialization.cc', - 'src/mojo/public/cpp/bindings/lib/bindings_serialization.h', - 'src/mojo/public/cpp/bindings/lib/bounds_checker.cc', - 'src/mojo/public/cpp/bindings/lib/bounds_checker.h', - 'src/mojo/public/cpp/bindings/lib/buffer.h', - 'src/mojo/public/cpp/bindings/lib/callback_internal.h', - 'src/mojo/public/cpp/bindings/lib/connector.cc', - 'src/mojo/public/cpp/bindings/lib/connector.h', - 'src/mojo/public/cpp/bindings/lib/control_message_handler.cc', - 'src/mojo/public/cpp/bindings/lib/control_message_handler.h', - 'src/mojo/public/cpp/bindings/lib/control_message_proxy.cc', - 'src/mojo/public/cpp/bindings/lib/control_message_proxy.h', - 'src/mojo/public/cpp/bindings/lib/filter_chain.cc', - 'src/mojo/public/cpp/bindings/lib/filter_chain.h', - 'src/mojo/public/cpp/bindings/lib/fixed_buffer.cc', - 'src/mojo/public/cpp/bindings/lib/fixed_buffer.h', - 'src/mojo/public/cpp/bindings/lib/interface_ptr_internal.h', - 'src/mojo/public/cpp/bindings/lib/map_data_internal.h', - 'src/mojo/public/cpp/bindings/lib/map_internal.h', - 'src/mojo/public/cpp/bindings/lib/map_serialization.h', - 'src/mojo/public/cpp/bindings/lib/message.cc', - 'src/mojo/public/cpp/bindings/lib/message_builder.cc', - 'src/mojo/public/cpp/bindings/lib/message_builder.h', - 'src/mojo/public/cpp/bindings/lib/message_filter.cc', - 'src/mojo/public/cpp/bindings/lib/message_header_validator.cc', - 'src/mojo/public/cpp/bindings/lib/message_header_validator.h', - 'src/mojo/public/cpp/bindings/lib/message_internal.h', - 'src/mojo/public/cpp/bindings/lib/no_interface.cc', - 'src/mojo/public/cpp/bindings/lib/router.cc', - 'src/mojo/public/cpp/bindings/lib/router.h', - 'src/mojo/public/cpp/bindings/lib/shared_data.h', - 'src/mojo/public/cpp/bindings/lib/shared_ptr.h', - 'src/mojo/public/cpp/bindings/lib/string_serialization.h', - 'src/mojo/public/cpp/bindings/lib/string_serialization.cc', - 'src/mojo/public/cpp/bindings/lib/thread_checker.h', - 'src/mojo/public/cpp/bindings/lib/thread_checker_posix.cc', - 'src/mojo/public/cpp/bindings/lib/thread_checker_posix.h', - 'src/mojo/public/cpp/bindings/lib/validate_params.h', - 'src/mojo/public/cpp/bindings/lib/validation_errors.cc', - 'src/mojo/public/cpp/bindings/lib/validation_errors.h', - 'src/mojo/public/cpp/bindings/lib/validation_util.cc', - 'src/mojo/public/cpp/bindings/lib/validation_util.h', - 'src/mojo/public/cpp/bindings/lib/value_traits.h', + '../../mojo/public/cpp/bindings/array.h', + '../../mojo/public/cpp/bindings/binding.h', + '../../mojo/public/cpp/bindings/callback.h', + '../../mojo/public/cpp/bindings/interface_ptr.h', + '../../mojo/public/cpp/bindings/interface_request.h', + '../../mojo/public/cpp/bindings/lib/array_internal.cc', + '../../mojo/public/cpp/bindings/lib/array_internal.h', + '../../mojo/public/cpp/bindings/lib/array_serialization.h', + '../../mojo/public/cpp/bindings/lib/bindings_internal.h', + '../../mojo/public/cpp/bindings/lib/bindings_serialization.cc', + '../../mojo/public/cpp/bindings/lib/bindings_serialization.h', + '../../mojo/public/cpp/bindings/lib/bounds_checker.cc', + '../../mojo/public/cpp/bindings/lib/bounds_checker.h', + '../../mojo/public/cpp/bindings/lib/buffer.h', + '../../mojo/public/cpp/bindings/lib/callback_internal.h', + '../../mojo/public/cpp/bindings/lib/connector.cc', + '../../mojo/public/cpp/bindings/lib/connector.h', + '../../mojo/public/cpp/bindings/lib/control_message_handler.cc', + '../../mojo/public/cpp/bindings/lib/control_message_handler.h', + '../../mojo/public/cpp/bindings/lib/control_message_proxy.cc', + '../../mojo/public/cpp/bindings/lib/control_message_proxy.h', + '../../mojo/public/cpp/bindings/lib/filter_chain.cc', + '../../mojo/public/cpp/bindings/lib/filter_chain.h', + '../../mojo/public/cpp/bindings/lib/fixed_buffer.cc', + '../../mojo/public/cpp/bindings/lib/fixed_buffer.h', + '../../mojo/public/cpp/bindings/lib/interface_ptr_internal.h', + '../../mojo/public/cpp/bindings/lib/map_data_internal.h', + '../../mojo/public/cpp/bindings/lib/map_internal.h', + '../../mojo/public/cpp/bindings/lib/map_serialization.h', + '../../mojo/public/cpp/bindings/lib/message.cc', + '../../mojo/public/cpp/bindings/lib/message_builder.cc', + '../../mojo/public/cpp/bindings/lib/message_builder.h', + '../../mojo/public/cpp/bindings/lib/message_filter.cc', + '../../mojo/public/cpp/bindings/lib/message_header_validator.cc', + '../../mojo/public/cpp/bindings/lib/message_header_validator.h', + '../../mojo/public/cpp/bindings/lib/message_internal.h', + '../../mojo/public/cpp/bindings/lib/no_interface.cc', + '../../mojo/public/cpp/bindings/lib/router.cc', + '../../mojo/public/cpp/bindings/lib/router.h', + '../../mojo/public/cpp/bindings/lib/shared_data.h', + '../../mojo/public/cpp/bindings/lib/shared_ptr.h', + '../../mojo/public/cpp/bindings/lib/string_serialization.cc', + '../../mojo/public/cpp/bindings/lib/string_serialization.h', + '../../mojo/public/cpp/bindings/lib/thread_checker.h', + '../../mojo/public/cpp/bindings/lib/thread_checker_posix.cc', + '../../mojo/public/cpp/bindings/lib/thread_checker_posix.h', + '../../mojo/public/cpp/bindings/lib/validate_params.h', + '../../mojo/public/cpp/bindings/lib/validation_errors.cc', + '../../mojo/public/cpp/bindings/lib/validation_errors.h', + '../../mojo/public/cpp/bindings/lib/validation_util.cc', + '../../mojo/public/cpp/bindings/lib/validation_util.h', + '../../mojo/public/cpp/bindings/lib/value_traits.h', + '../../mojo/public/cpp/bindings/message.h', + '../../mojo/public/cpp/bindings/message_filter.h', + '../../mojo/public/cpp/bindings/no_interface.h', + '../../mojo/public/cpp/bindings/string.h', + '../../mojo/public/cpp/bindings/strong_binding.h', + '../../mojo/public/cpp/bindings/type_converter.h', # This comes from the mojo_interface_bindings_cpp_sources dependency. '>@(mojom_generated_sources)', ], @@ -169,8 +169,8 @@ '../..' ], 'sources': [ - 'src/mojo/public/js/constants.cc', - 'src/mojo/public/js/constants.h', + '../../mojo/public/js/constants.cc', + '../../mojo/public/js/constants.h', ], }, { @@ -178,23 +178,23 @@ 'target_name': 'mojo_environment_standalone', 'type': 'static_library', 'sources': [ - 'src/mojo/public/c/environment/async_waiter.h', - 'src/mojo/public/c/environment/logger.h', - 'src/mojo/public/cpp/environment/async_waiter.h', - 'src/mojo/public/cpp/environment/environment.h', - 'src/mojo/public/cpp/environment/lib/async_waiter.cc', - 'src/mojo/public/cpp/environment/lib/default_async_waiter.cc', - 'src/mojo/public/cpp/environment/lib/default_async_waiter.h', - 'src/mojo/public/cpp/environment/lib/default_logger.cc', - 'src/mojo/public/cpp/environment/lib/default_logger.h', - 'src/mojo/public/cpp/environment/lib/default_task_tracker.cc', - 'src/mojo/public/cpp/environment/lib/default_task_tracker.h', - 'src/mojo/public/cpp/environment/lib/environment.cc', - 'src/mojo/public/cpp/environment/lib/logging.cc', - 'src/mojo/public/cpp/environment/lib/scoped_task_tracking.cc', - 'src/mojo/public/cpp/environment/lib/scoped_task_tracking.h', - 'src/mojo/public/cpp/environment/logging.h', - 'src/mojo/public/cpp/environment/task_tracker.h', + '../../mojo/public/c/environment/async_waiter.h', + '../../mojo/public/c/environment/logger.h', + '../../mojo/public/cpp/environment/async_waiter.h', + '../../mojo/public/cpp/environment/environment.h', + '../../mojo/public/cpp/environment/lib/async_waiter.cc', + '../../mojo/public/cpp/environment/lib/default_async_waiter.cc', + '../../mojo/public/cpp/environment/lib/default_async_waiter.h', + '../../mojo/public/cpp/environment/lib/default_logger.cc', + '../../mojo/public/cpp/environment/lib/default_logger.h', + '../../mojo/public/cpp/environment/lib/default_task_tracker.cc', + '../../mojo/public/cpp/environment/lib/default_task_tracker.h', + '../../mojo/public/cpp/environment/lib/environment.cc', + '../../mojo/public/cpp/environment/lib/logging.cc', + '../../mojo/public/cpp/environment/lib/scoped_task_tracking.cc', + '../../mojo/public/cpp/environment/lib/scoped_task_tracking.h', + '../../mojo/public/cpp/environment/logging.h', + '../../mojo/public/cpp/environment/task_tracker.h', ], 'include_dirs': [ '../..', @@ -205,25 +205,25 @@ 'target_name': 'mojo_utility', 'type': 'static_library', 'sources': [ - 'src/mojo/public/cpp/utility/mutex.h', - 'src/mojo/public/cpp/utility/run_loop.h', - 'src/mojo/public/cpp/utility/run_loop_handler.h', - 'src/mojo/public/cpp/utility/thread.h', - 'src/mojo/public/cpp/utility/lib/mutex.cc', - 'src/mojo/public/cpp/utility/lib/run_loop.cc', - 'src/mojo/public/cpp/utility/lib/thread.cc', - 'src/mojo/public/cpp/utility/lib/thread_local.h', - 'src/mojo/public/cpp/utility/lib/thread_local_posix.cc', - 'src/mojo/public/cpp/utility/lib/thread_local_win.cc', + '../../mojo/public/cpp/utility/lib/mutex.cc', + '../../mojo/public/cpp/utility/lib/run_loop.cc', + '../../mojo/public/cpp/utility/lib/thread.cc', + '../../mojo/public/cpp/utility/lib/thread_local.h', + '../../mojo/public/cpp/utility/lib/thread_local_posix.cc', + '../../mojo/public/cpp/utility/lib/thread_local_win.cc', + '../../mojo/public/cpp/utility/mutex.h', + '../../mojo/public/cpp/utility/run_loop.h', + '../../mojo/public/cpp/utility/run_loop_handler.h', + '../../mojo/public/cpp/utility/thread.h', ], 'conditions': [ # See crbug.com/342893: ['OS=="win"', { 'sources!': [ - 'src/mojo/public/cpp/utility/mutex.h', - 'src/mojo/public/cpp/utility/thread.h', - 'src/mojo/public/cpp/utility/lib/mutex.cc', - 'src/mojo/public/cpp/utility/lib/thread.cc', + '../../mojo/public/cpp/utility/lib/mutex.cc', + '../../mojo/public/cpp/utility/lib/thread.cc', + '../../mojo/public/cpp/utility/mutex.h', + '../../mojo/public/cpp/utility/thread.h', ], }], ], @@ -237,7 +237,7 @@ 'variables': { 'require_interface_bindings': 0, 'mojom_files': [ - 'src/mojo/public/interfaces/bindings/interface_control_messages.mojom', + '../../mojo/public/interfaces/bindings/interface_control_messages.mojom', ], }, 'includes': [ 'mojom_bindings_generator_explicit.gypi' ], @@ -274,11 +274,11 @@ ], }, 'sources': [ - 'src/mojo/public/c/test_support/test_support.h', - 'src/mojo/public/c/test_support/test_support_export.h', + '../../mojo/public/c/test_support/test_support.h', + '../../mojo/public/c/test_support/test_support_export.h', # TODO(vtl): Convert this to thunks http://crbug.com/386799 - 'src/mojo/public/tests/test_support_private.cc', - 'src/mojo/public/tests/test_support_private.h', + '../../mojo/public/tests/test_support_private.cc', + '../../mojo/public/tests/test_support_private.h', ], 'conditions': [ ['OS=="ios"', { @@ -304,9 +304,9 @@ 'mojo_public_test_support', ], 'sources': [ - 'src/mojo/public/cpp/test_support/lib/test_support.cc', - 'src/mojo/public/cpp/test_support/lib/test_utils.cc', - 'src/mojo/public/cpp/test_support/test_utils.h', + '../../mojo/public/cpp/test_support/lib/test_support.cc', + '../../mojo/public/cpp/test_support/lib/test_utils.cc', + '../../mojo/public/cpp/test_support/test_utils.h', ], }, { @@ -317,8 +317,8 @@ '../../base/base.gyp:base', ], 'sources': [ - 'src/mojo/public/cpp/bindings/tests/validation_test_input_parser.cc', - 'src/mojo/public/cpp/bindings/tests/validation_test_input_parser.h', + '../../mojo/public/cpp/bindings/tests/validation_test_input_parser.cc', + '../../mojo/public/cpp/bindings/tests/validation_test_input_parser.h', ], }, { @@ -326,20 +326,20 @@ 'type': 'none', 'variables': { 'mojom_files': [ - 'src/mojo/public/interfaces/bindings/tests/math_calculator.mojom', - 'src/mojo/public/interfaces/bindings/tests/no_module.mojom', - 'src/mojo/public/interfaces/bindings/tests/ping_service.mojom', - 'src/mojo/public/interfaces/bindings/tests/rect.mojom', - 'src/mojo/public/interfaces/bindings/tests/regression_tests.mojom', - 'src/mojo/public/interfaces/bindings/tests/sample_factory.mojom', - 'src/mojo/public/interfaces/bindings/tests/sample_import.mojom', - 'src/mojo/public/interfaces/bindings/tests/sample_import2.mojom', - 'src/mojo/public/interfaces/bindings/tests/sample_interfaces.mojom', - 'src/mojo/public/interfaces/bindings/tests/sample_service.mojom', - 'src/mojo/public/interfaces/bindings/tests/scoping.mojom', - 'src/mojo/public/interfaces/bindings/tests/serialization_test_structs.mojom', - 'src/mojo/public/interfaces/bindings/tests/test_structs.mojom', - 'src/mojo/public/interfaces/bindings/tests/validation_test_interfaces.mojom', + '../../mojo/public/interfaces/bindings/tests/math_calculator.mojom', + '../../mojo/public/interfaces/bindings/tests/no_module.mojom', + '../../mojo/public/interfaces/bindings/tests/ping_service.mojom', + '../../mojo/public/interfaces/bindings/tests/rect.mojom', + '../../mojo/public/interfaces/bindings/tests/regression_tests.mojom', + '../../mojo/public/interfaces/bindings/tests/sample_factory.mojom', + '../../mojo/public/interfaces/bindings/tests/sample_import.mojom', + '../../mojo/public/interfaces/bindings/tests/sample_import2.mojom', + '../../mojo/public/interfaces/bindings/tests/sample_interfaces.mojom', + '../../mojo/public/interfaces/bindings/tests/sample_service.mojom', + '../../mojo/public/interfaces/bindings/tests/scoping.mojom', + '../../mojo/public/interfaces/bindings/tests/serialization_test_structs.mojom', + '../../mojo/public/interfaces/bindings/tests/test_structs.mojom', + '../../mojo/public/interfaces/bindings/tests/validation_test_interfaces.mojom', ], }, 'includes': [ 'mojom_bindings_generator_explicit.gypi' ], @@ -366,7 +366,7 @@ 'type': 'none', 'variables': { 'chromium_code': 0, - 'java_in_dir': 'src/mojo/public/java/system', + 'java_in_dir': '../../mojo/public/java/system', }, 'includes': [ '../../build/java.gypi' ], }, @@ -383,7 +383,7 @@ 'type': 'none', 'variables': { 'chromium_code': 0, - 'java_in_dir': 'src/mojo/public/java/bindings', + 'java_in_dir': '../../mojo/public/java/bindings', }, 'dependencies': [ 'mojo_interface_bindings_java_sources', diff --git a/third_party/mojo/mojo_variables.gypi b/third_party/mojo/mojo_variables.gypi index 0e082f302b44fe..f76ad6d20d111a 100644 --- a/third_party/mojo/mojo_variables.gypi +++ b/third_party/mojo/mojo_variables.gypi @@ -42,11 +42,11 @@ }], ], 'mojo_public_system_unittest_sources': [ - '<(DEPTH)/third_party/mojo/src/mojo/public/c/system/tests/core_unittest.cc', - '<(DEPTH)/third_party/mojo/src/mojo/public/c/system/tests/core_unittest_pure_c.c', - '<(DEPTH)/third_party/mojo/src/mojo/public/c/system/tests/macros_unittest.cc', - '<(DEPTH)/third_party/mojo/src/mojo/public/cpp/system/tests/core_unittest.cc', - '<(DEPTH)/third_party/mojo/src/mojo/public/cpp/system/tests/macros_unittest.cc', + '<(DEPTH)/mojo/public/c/system/tests/core_unittest.cc', + '<(DEPTH)/mojo/public/c/system/tests/core_unittest_pure_c.c', + '<(DEPTH)/mojo/public/c/system/tests/macros_unittest.cc', + '<(DEPTH)/mojo/public/cpp/system/tests/core_unittest.cc', + '<(DEPTH)/mojo/public/cpp/system/tests/macros_unittest.cc', ], }, } diff --git a/third_party/mojo/mojom_bindings_generator_explicit.gypi b/third_party/mojo/mojom_bindings_generator_explicit.gypi index 4eec0823914fa0..8c398139c70b03 100644 --- a/third_party/mojo/mojom_bindings_generator_explicit.gypi +++ b/third_party/mojo/mojom_bindings_generator_explicit.gypi @@ -10,7 +10,7 @@ 'mojom_base_output_dir': ' +#include "mojo/public/cpp/system/macros.h" #include "third_party/mojo/src/mojo/edk/embedder/scoped_platform_handle.h" #include "third_party/mojo/src/mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace embedder { diff --git a/third_party/mojo/src/mojo/edk/embedder/process_delegate.h b/third_party/mojo/src/mojo/edk/embedder/process_delegate.h index d7829072201b0a..e00591ff87f96b 100644 --- a/third_party/mojo/src/mojo/edk/embedder/process_delegate.h +++ b/third_party/mojo/src/mojo/edk/embedder/process_delegate.h @@ -5,9 +5,9 @@ #ifndef THIRD_PARTY_MOJO_SRC_MOJO_EDK_EMBEDDER_PROCESS_DELEGATE_H_ #define THIRD_PARTY_MOJO_SRC_MOJO_EDK_EMBEDDER_PROCESS_DELEGATE_H_ +#include "mojo/public/cpp/system/macros.h" #include "third_party/mojo/src/mojo/edk/embedder/process_type.h" #include "third_party/mojo/src/mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace embedder { diff --git a/third_party/mojo/src/mojo/edk/embedder/scoped_platform_handle.h b/third_party/mojo/src/mojo/edk/embedder/scoped_platform_handle.h index b7e31415e466dc..ed5ce61699a87b 100644 --- a/third_party/mojo/src/mojo/edk/embedder/scoped_platform_handle.h +++ b/third_party/mojo/src/mojo/edk/embedder/scoped_platform_handle.h @@ -6,9 +6,9 @@ #define THIRD_PARTY_MOJO_SRC_MOJO_EDK_EMBEDDER_SCOPED_PLATFORM_HANDLE_H_ #include "base/move.h" +#include "mojo/public/c/system/macros.h" #include "third_party/mojo/src/mojo/edk/embedder/platform_handle.h" #include "third_party/mojo/src/mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/c/system/macros.h" namespace mojo { namespace embedder { diff --git a/third_party/mojo/src/mojo/edk/embedder/simple_platform_shared_buffer.h b/third_party/mojo/src/mojo/edk/embedder/simple_platform_shared_buffer.h index 308247296d5a01..90b8dd1d87431a 100644 --- a/third_party/mojo/src/mojo/edk/embedder/simple_platform_shared_buffer.h +++ b/third_party/mojo/src/mojo/edk/embedder/simple_platform_shared_buffer.h @@ -7,9 +7,9 @@ #include +#include "mojo/public/cpp/system/macros.h" #include "third_party/mojo/src/mojo/edk/embedder/platform_shared_buffer.h" #include "third_party/mojo/src/mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace embedder { diff --git a/third_party/mojo/src/mojo/edk/embedder/simple_platform_shared_buffer_unittest.cc b/third_party/mojo/src/mojo/edk/embedder/simple_platform_shared_buffer_unittest.cc index 88b0827b69fbba..8fc1cf41451ec5 100644 --- a/third_party/mojo/src/mojo/edk/embedder/simple_platform_shared_buffer_unittest.cc +++ b/third_party/mojo/src/mojo/edk/embedder/simple_platform_shared_buffer_unittest.cc @@ -8,8 +8,8 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" +#include "mojo/public/cpp/system/macros.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace embedder { diff --git a/third_party/mojo/src/mojo/edk/embedder/simple_platform_support.h b/third_party/mojo/src/mojo/edk/embedder/simple_platform_support.h index c9ec3b5c51069a..8974d2d748eb17 100644 --- a/third_party/mojo/src/mojo/edk/embedder/simple_platform_support.h +++ b/third_party/mojo/src/mojo/edk/embedder/simple_platform_support.h @@ -5,9 +5,9 @@ #ifndef THIRD_PARTY_MOJO_SRC_MOJO_EDK_EMBEDDER_SIMPLE_PLATFORM_SUPPORT_H_ #define THIRD_PARTY_MOJO_SRC_MOJO_EDK_EMBEDDER_SIMPLE_PLATFORM_SUPPORT_H_ +#include "mojo/public/cpp/system/macros.h" #include "third_party/mojo/src/mojo/edk/embedder/platform_support.h" #include "third_party/mojo/src/mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace embedder { diff --git a/third_party/mojo/src/mojo/edk/embedder/slave_process_delegate.h b/third_party/mojo/src/mojo/edk/embedder/slave_process_delegate.h index f14fa42b0082ab..d8fd4421749b18 100644 --- a/third_party/mojo/src/mojo/edk/embedder/slave_process_delegate.h +++ b/third_party/mojo/src/mojo/edk/embedder/slave_process_delegate.h @@ -5,9 +5,9 @@ #ifndef THIRD_PARTY_MOJO_SRC_MOJO_EDK_EMBEDDER_SLAVE_PROCESS_DELEGATE_H_ #define THIRD_PARTY_MOJO_SRC_MOJO_EDK_EMBEDDER_SLAVE_PROCESS_DELEGATE_H_ +#include "mojo/public/cpp/system/macros.h" #include "third_party/mojo/src/mojo/edk/embedder/process_delegate.h" #include "third_party/mojo/src/mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace embedder { diff --git a/third_party/mojo/src/mojo/edk/js/drain_data.cc b/third_party/mojo/src/mojo/edk/js/drain_data.cc index 139d768f750e98..407c5d2a726255 100644 --- a/third_party/mojo/src/mojo/edk/js/drain_data.cc +++ b/third_party/mojo/src/mojo/edk/js/drain_data.cc @@ -9,8 +9,8 @@ #include "gin/dictionary.h" #include "gin/per_context_data.h" #include "gin/per_isolate_data.h" -#include "third_party/mojo/src/mojo/public/cpp/environment/environment.h" -#include "third_party/mojo/src/mojo/public/cpp/system/core.h" +#include "mojo/public/cpp/environment/environment.h" +#include "mojo/public/cpp/system/core.h" namespace mojo { namespace js { diff --git a/third_party/mojo/src/mojo/edk/js/drain_data.h b/third_party/mojo/src/mojo/edk/js/drain_data.h index 4d9f33a417a6dd..9767f2ddfb0744 100644 --- a/third_party/mojo/src/mojo/edk/js/drain_data.h +++ b/third_party/mojo/src/mojo/edk/js/drain_data.h @@ -7,8 +7,8 @@ #include "base/memory/scoped_vector.h" #include "gin/runner.h" -#include "third_party/mojo/src/mojo/public/c/environment/async_waiter.h" -#include "third_party/mojo/src/mojo/public/cpp/system/core.h" +#include "mojo/public/c/environment/async_waiter.h" +#include "mojo/public/cpp/system/core.h" #include "v8/include/v8.h" namespace mojo { diff --git a/third_party/mojo/src/mojo/edk/js/handle.h b/third_party/mojo/src/mojo/edk/js/handle.h index 1b477fbb96a724..00f258fd9554be 100644 --- a/third_party/mojo/src/mojo/edk/js/handle.h +++ b/third_party/mojo/src/mojo/edk/js/handle.h @@ -9,7 +9,7 @@ #include "gin/converter.h" #include "gin/handle.h" #include "gin/wrappable.h" -#include "third_party/mojo/src/mojo/public/cpp/system/core.h" +#include "mojo/public/cpp/system/core.h" namespace mojo { namespace js { diff --git a/third_party/mojo/src/mojo/edk/js/handle_unittest.cc b/third_party/mojo/src/mojo/edk/js/handle_unittest.cc index 349f8428627f8e..7a10d6153ded5d 100644 --- a/third_party/mojo/src/mojo/edk/js/handle_unittest.cc +++ b/third_party/mojo/src/mojo/edk/js/handle_unittest.cc @@ -3,10 +3,10 @@ // found in the LICENSE file. #include "base/macros.h" +#include "mojo/public/cpp/system/core.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/mojo/src/mojo/edk/js/handle.h" #include "third_party/mojo/src/mojo/edk/js/handle_close_observer.h" -#include "third_party/mojo/src/mojo/public/cpp/system/core.h" namespace mojo { namespace js { diff --git a/third_party/mojo/src/mojo/edk/js/mojo_runner_delegate.h b/third_party/mojo/src/mojo/edk/js/mojo_runner_delegate.h index 9e5b57bdb627b4..2890a1075f0650 100644 --- a/third_party/mojo/src/mojo/edk/js/mojo_runner_delegate.h +++ b/third_party/mojo/src/mojo/edk/js/mojo_runner_delegate.h @@ -7,7 +7,7 @@ #include "base/macros.h" #include "gin/modules/module_runner_delegate.h" -#include "third_party/mojo/src/mojo/public/c/system/core.h" +#include "mojo/public/c/system/core.h" namespace mojo { namespace js { diff --git a/third_party/mojo/src/mojo/edk/js/support.cc b/third_party/mojo/src/mojo/edk/js/support.cc index 401c5a25b1f879..e739eebc0e6cde 100644 --- a/third_party/mojo/src/mojo/edk/js/support.cc +++ b/third_party/mojo/src/mojo/edk/js/support.cc @@ -12,9 +12,9 @@ #include "gin/per_isolate_data.h" #include "gin/public/wrapper_info.h" #include "gin/wrappable.h" +#include "mojo/public/cpp/system/core.h" #include "third_party/mojo/src/mojo/edk/js/handle.h" #include "third_party/mojo/src/mojo/edk/js/waiting_callback.h" -#include "third_party/mojo/src/mojo/public/cpp/system/core.h" namespace mojo { namespace js { diff --git a/third_party/mojo/src/mojo/edk/js/test/BUILD.gn b/third_party/mojo/src/mojo/edk/js/test/BUILD.gn index d5439121b39bb2..eab195745731ff 100644 --- a/third_party/mojo/src/mojo/edk/js/test/BUILD.gn +++ b/third_party/mojo/src/mojo/edk/js/test/BUILD.gn @@ -10,14 +10,14 @@ test("js_unittests") { "../../js:js_unittests", "../../test:run_all_unittests", "../../test:test_support", - "../../../public/cpp/environment", - "../../../public/cpp/system", - "../../../public/cpp/utility", - "../../../public/interfaces/bindings/tests:test_interfaces", - "../../../public/interfaces/bindings/tests:test_interfaces_experimental", "//base", "//gin:gin_test", "//mojo/environment:chromium", + "//mojo/public/cpp/environment", + "//mojo/public/cpp/system", + "//mojo/public/cpp/utility", + "//mojo/public/interfaces/bindings/tests:test_interfaces", + "//mojo/public/interfaces/bindings/tests:test_interfaces_experimental", ] sources = [ @@ -31,11 +31,11 @@ test("js_integration_tests") { "../../js/tests:js_to_cpp_tests", "../../test:run_all_unittests", "../../test:test_support", - "../../../public/cpp/bindings", - "../../../public/interfaces/bindings/tests:test_interfaces", "//base", "//gin:gin_test", "//mojo/environment:chromium", + "//mojo/public/cpp/bindings", + "//mojo/public/interfaces/bindings/tests:test_interfaces", ] sources = [ diff --git a/third_party/mojo/src/mojo/edk/js/test/run_js_tests.cc b/third_party/mojo/src/mojo/edk/js/test/run_js_tests.cc index 7d111fa0487680..3fab0ef21eb674 100644 --- a/third_party/mojo/src/mojo/edk/js/test/run_js_tests.cc +++ b/third_party/mojo/src/mojo/edk/js/test/run_js_tests.cc @@ -8,10 +8,10 @@ #include "gin/modules/module_registry.h" #include "gin/test/file_runner.h" #include "gin/test/gtest.h" +#include "mojo/public/cpp/environment/environment.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/mojo/src/mojo/edk/js/core.h" #include "third_party/mojo/src/mojo/edk/js/support.h" -#include "third_party/mojo/src/mojo/public/cpp/environment/environment.h" namespace mojo { namespace js { diff --git a/third_party/mojo/src/mojo/edk/js/tests/BUILD.gn b/third_party/mojo/src/mojo/edk/js/tests/BUILD.gn index dc3d694f7e10b3..d372a68ccec358 100644 --- a/third_party/mojo/src/mojo/edk/js/tests/BUILD.gn +++ b/third_party/mojo/src/mojo/edk/js/tests/BUILD.gn @@ -3,7 +3,7 @@ # found in the LICENSE file. import("../../mojo_edk.gni") -import("../../../public/tools/bindings/mojom.gni") +import("//mojo/public/tools/bindings/mojom.gni") mojo_edk_source_set("js_to_cpp_tests") { testonly = true diff --git a/third_party/mojo/src/mojo/edk/js/tests/js_to_cpp_tests.cc b/third_party/mojo/src/mojo/edk/js/tests/js_to_cpp_tests.cc index a709f0080e0b07..459e8a2b5d9277 100644 --- a/third_party/mojo/src/mojo/edk/js/tests/js_to_cpp_tests.cc +++ b/third_party/mojo/src/mojo/edk/js/tests/js_to_cpp_tests.cc @@ -11,13 +11,13 @@ #include "base/strings/utf_string_conversions.h" #include "gin/array_buffer.h" #include "gin/public/isolate_holder.h" +#include "mojo/public/cpp/bindings/binding.h" +#include "mojo/public/cpp/system/core.h" +#include "mojo/public/cpp/system/macros.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/mojo/src/mojo/edk/js/mojo_runner_delegate.h" #include "third_party/mojo/src/mojo/edk/js/tests/js_to_cpp.mojom.h" #include "third_party/mojo/src/mojo/edk/test/test_utils.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" -#include "third_party/mojo/src/mojo/public/cpp/system/core.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace js { diff --git a/third_party/mojo/src/mojo/edk/js/waiting_callback.cc b/third_party/mojo/src/mojo/edk/js/waiting_callback.cc index 2bd2af5d2dc8ac..65833f3baed454 100644 --- a/third_party/mojo/src/mojo/edk/js/waiting_callback.cc +++ b/third_party/mojo/src/mojo/edk/js/waiting_callback.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/message_loop/message_loop.h" #include "gin/per_context_data.h" -#include "third_party/mojo/src/mojo/public/cpp/environment/environment.h" +#include "mojo/public/cpp/environment/environment.h" namespace mojo { namespace js { diff --git a/third_party/mojo/src/mojo/edk/js/waiting_callback.h b/third_party/mojo/src/mojo/edk/js/waiting_callback.h index 401471030436e3..63f4d0cab3d56d 100644 --- a/third_party/mojo/src/mojo/edk/js/waiting_callback.h +++ b/third_party/mojo/src/mojo/edk/js/waiting_callback.h @@ -9,10 +9,10 @@ #include "gin/handle.h" #include "gin/runner.h" #include "gin/wrappable.h" +#include "mojo/public/c/environment/async_waiter.h" +#include "mojo/public/cpp/system/core.h" #include "third_party/mojo/src/mojo/edk/js/handle.h" #include "third_party/mojo/src/mojo/edk/js/handle_close_observer.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 mojo { namespace js { diff --git a/third_party/mojo/src/mojo/edk/mojo_edk.gni b/third_party/mojo/src/mojo/edk/mojo_edk.gni index 21ad315a96af5b..19133a9682c3a4 100644 --- a/third_party/mojo/src/mojo/edk/mojo_edk.gni +++ b/third_party/mojo/src/mojo/edk/mojo_edk.gni @@ -2,14 +2,13 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("../public/mojo_sdk.gni") +import("//mojo/public/mojo_sdk.gni") # A mojo_edk_source_set is a mojo_sdk_source_set that does not restrict # external dependencies and understands the following additional variables, all # of which admit a list of the relevant elements specified relative to the # location of the Mojo EDK: # mojo_edk_configs -# allow_circular_mojo_edk_includes_from # mojo_edk_public_deps # mojo_edk_deps @@ -26,7 +25,7 @@ template("mojo_edk_source_set") { visibility = invoker.visibility } if (defined(invoker.mojo_edk_visibility)) { - mojo_sdk_visibility = invoker.mojo_edk_visibility + mojo_edk_visibility = invoker.mojo_edk_visibility } if (defined(invoker.testonly)) { testonly = invoker.testonly @@ -50,7 +49,7 @@ template("mojo_edk_source_set") { # Check that the EDK config was not mistakenly given as an absolute # path. assert(get_path_info(edk_config, "abspath") != edk_config) - configs += [ rebase_path(edk_config, ".", mojo_root) ] + configs += [ rebase_path(edk_config, ".", "//third_party/mojo/src") ] } } @@ -58,25 +57,15 @@ template("mojo_edk_source_set") { if (defined(invoker.allow_circular_includes_from)) { allow_circular_includes_from += invoker.allow_circular_includes_from } - if (defined(invoker.allow_circular_mojo_edk_includes_from)) { - foreach(edk_target, invoker.allow_circular_mojo_edk_includes_from) { - # Check that the EDK target was not mistakenly given as an absolute - # path. - assert(get_path_info(edk_target, "abspath") != edk_target) - allow_circular_includes_from += - [ rebase_path(edk_target, ".", mojo_root) ] - } - } if (defined(invoker.public_deps)) { public_deps = invoker.public_deps } - mojo_sdk_public_deps = [] + mojo_edk_public_deps = [] if (defined(invoker.mojo_edk_public_deps)) { - # The EDK is required to be a sibling of the SDK, so the relative - # dependencies are rewritten in the same way. - mojo_sdk_public_deps = invoker.mojo_edk_public_deps + mojo_edk_public_deps += invoker.mojo_edk_public_deps } + mojo_sdk_public_deps = [] if (defined(invoker.mojo_sdk_public_deps)) { mojo_sdk_public_deps += invoker.mojo_sdk_public_deps } @@ -84,12 +73,13 @@ template("mojo_edk_source_set") { if (defined(invoker.deps)) { deps = invoker.deps } - mojo_sdk_deps = [] + mojo_edk_deps = [] if (defined(invoker.mojo_edk_deps)) { # The EDK is required to be a sibling of the SDK, so the relative # dependencies are rewritten in the same way. - mojo_sdk_deps = invoker.mojo_edk_deps + mojo_edk_deps += invoker.mojo_edk_deps } + mojo_sdk_deps = [] if (defined(invoker.mojo_sdk_deps)) { mojo_sdk_deps += invoker.mojo_sdk_deps } diff --git a/third_party/mojo/src/mojo/edk/system/BUILD.gn b/third_party/mojo/src/mojo/edk/system/BUILD.gn index ebe88a81b6410d..961eec0a703fe0 100644 --- a/third_party/mojo/src/mojo/edk/system/BUILD.gn +++ b/third_party/mojo/src/mojo/edk/system/BUILD.gn @@ -126,13 +126,13 @@ component("system") { "../embedder", "../embedder:delegates", "../embedder:platform", - "../../public/c/system", - "../../public/cpp/system", # TODO(use_chrome_edk): so that EDK in third_party can choose the EDK in # src/mojo if the command line flag is specified. It has to since we can # only have one definition of the Mojo primitives. "//mojo/edk/system", + "//mojo/public/c/system", + "//mojo/public/cpp/system", ] deps = [ @@ -220,10 +220,10 @@ test("mojo_system_unittests") { ":system", ":test_utils", "../embedder:embedder_unittests", - "../../public/cpp/environment:standalone", "../test:test_support", "//base", "//base/test:test_support", + "//mojo/public/cpp/environment:standalone", "//testing/gtest", ] @@ -240,11 +240,11 @@ test("mojo_message_pipe_perftests") { deps = [ ":system", ":test_utils", - "../../public/cpp/environment:standalone", "../test:test_support", "//base", "//base/test:test_support", "//base/test:test_support_perf", + "//mojo/public/cpp/environment:standalone", "//testing/gtest", ] } diff --git a/third_party/mojo/src/mojo/edk/system/async_waiter.h b/third_party/mojo/src/mojo/edk/system/async_waiter.h index 1c894663ab83cd..3dd96ac4509173 100644 --- a/third_party/mojo/src/mojo/edk/system/async_waiter.h +++ b/third_party/mojo/src/mojo/edk/system/async_waiter.h @@ -6,10 +6,10 @@ #define THIRD_PARTY_MOJO_SRC_MOJO_EDK_SYSTEM_ASYNC_WAITER_H_ #include "base/callback.h" +#include "mojo/public/c/system/types.h" +#include "mojo/public/cpp/system/macros.h" #include "third_party/mojo/src/mojo/edk/system/awakable.h" #include "third_party/mojo/src/mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/c/system/types.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace system { diff --git a/third_party/mojo/src/mojo/edk/system/awakable.h b/third_party/mojo/src/mojo/edk/system/awakable.h index 7a2da125728e6b..ae1376c9dab365 100644 --- a/third_party/mojo/src/mojo/edk/system/awakable.h +++ b/third_party/mojo/src/mojo/edk/system/awakable.h @@ -7,8 +7,8 @@ #include +#include "mojo/public/c/system/types.h" #include "third_party/mojo/src/mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/c/system/types.h" namespace mojo { namespace system { diff --git a/third_party/mojo/src/mojo/edk/system/awakable_list.h b/third_party/mojo/src/mojo/edk/system/awakable_list.h index 4768efe3d6541f..5eedc56c4d8e8d 100644 --- a/third_party/mojo/src/mojo/edk/system/awakable_list.h +++ b/third_party/mojo/src/mojo/edk/system/awakable_list.h @@ -9,9 +9,9 @@ #include +#include "mojo/public/c/system/types.h" +#include "mojo/public/cpp/system/macros.h" #include "third_party/mojo/src/mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/c/system/types.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace system { diff --git a/third_party/mojo/src/mojo/edk/system/channel.h b/third_party/mojo/src/mojo/edk/system/channel.h index 0ad5036cbe8cd3..9feda954a3182f 100644 --- a/third_party/mojo/src/mojo/edk/system/channel.h +++ b/third_party/mojo/src/mojo/edk/system/channel.h @@ -13,6 +13,8 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/threading/thread_checker.h" +#include "mojo/public/c/system/types.h" +#include "mojo/public/cpp/system/macros.h" #include "third_party/mojo/src/mojo/edk/embedder/scoped_platform_handle.h" #include "third_party/mojo/src/mojo/edk/system/channel_endpoint.h" #include "third_party/mojo/src/mojo/edk/system/channel_endpoint_id.h" @@ -21,8 +23,6 @@ #include "third_party/mojo/src/mojo/edk/system/mutex.h" #include "third_party/mojo/src/mojo/edk/system/raw_channel.h" #include "third_party/mojo/src/mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/c/system/types.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { diff --git a/third_party/mojo/src/mojo/edk/system/channel_endpoint.cc b/third_party/mojo/src/mojo/edk/system/channel_endpoint.cc index 0cc3d562b319ae..e330b38e39b2d8 100644 --- a/third_party/mojo/src/mojo/edk/system/channel_endpoint.cc +++ b/third_party/mojo/src/mojo/edk/system/channel_endpoint.cc @@ -6,9 +6,9 @@ #include "base/logging.h" #include "base/threading/platform_thread.h" +#include "mojo/public/cpp/system/macros.h" #include "third_party/mojo/src/mojo/edk/system/channel.h" #include "third_party/mojo/src/mojo/edk/system/channel_endpoint_client.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace system { diff --git a/third_party/mojo/src/mojo/edk/system/channel_endpoint.h b/third_party/mojo/src/mojo/edk/system/channel_endpoint.h index 2764bc3cf52961..6f5e06dae03d4d 100644 --- a/third_party/mojo/src/mojo/edk/system/channel_endpoint.h +++ b/third_party/mojo/src/mojo/edk/system/channel_endpoint.h @@ -7,11 +7,11 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" +#include "mojo/public/cpp/system/macros.h" #include "third_party/mojo/src/mojo/edk/system/channel_endpoint_id.h" #include "third_party/mojo/src/mojo/edk/system/message_in_transit_queue.h" #include "third_party/mojo/src/mojo/edk/system/mutex.h" #include "third_party/mojo/src/mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace system { diff --git a/third_party/mojo/src/mojo/edk/system/channel_endpoint_client.h b/third_party/mojo/src/mojo/edk/system/channel_endpoint_client.h index 58ce596cf97bc8..d250b285b8597c 100644 --- a/third_party/mojo/src/mojo/edk/system/channel_endpoint_client.h +++ b/third_party/mojo/src/mojo/edk/system/channel_endpoint_client.h @@ -7,8 +7,8 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" +#include "mojo/public/cpp/system/macros.h" #include "third_party/mojo/src/mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace system { diff --git a/third_party/mojo/src/mojo/edk/system/channel_endpoint_id.h b/third_party/mojo/src/mojo/edk/system/channel_endpoint_id.h index c9d8908238d657..6d767aa2835f2e 100644 --- a/third_party/mojo/src/mojo/edk/system/channel_endpoint_id.h +++ b/third_party/mojo/src/mojo/edk/system/channel_endpoint_id.h @@ -12,8 +12,8 @@ #include "base/containers/hash_tables.h" #include "base/gtest_prod_util.h" +#include "mojo/public/cpp/system/macros.h" #include "third_party/mojo/src/mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace system { diff --git a/third_party/mojo/src/mojo/edk/system/channel_endpoint_unittest.cc b/third_party/mojo/src/mojo/edk/system/channel_endpoint_unittest.cc index fb31dc378681de..659b9b7fc3aa60 100644 --- a/third_party/mojo/src/mojo/edk/system/channel_endpoint_unittest.cc +++ b/third_party/mojo/src/mojo/edk/system/channel_endpoint_unittest.cc @@ -6,11 +6,11 @@ #include "base/synchronization/waitable_event.h" #include "base/test/test_timeouts.h" +#include "mojo/public/cpp/system/macros.h" #include "third_party/mojo/src/mojo/edk/system/channel_test_base.h" #include "third_party/mojo/src/mojo/edk/system/message_in_transit_queue.h" #include "third_party/mojo/src/mojo/edk/system/message_in_transit_test_utils.h" #include "third_party/mojo/src/mojo/edk/system/test_channel_endpoint_client.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace system { diff --git a/third_party/mojo/src/mojo/edk/system/channel_manager.h b/third_party/mojo/src/mojo/edk/system/channel_manager.h index 12590436bf10c2..360996f7f352d9 100644 --- a/third_party/mojo/src/mojo/edk/system/channel_manager.h +++ b/third_party/mojo/src/mojo/edk/system/channel_manager.h @@ -11,10 +11,10 @@ #include "base/containers/hash_tables.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" +#include "mojo/public/cpp/system/macros.h" #include "third_party/mojo/src/mojo/edk/embedder/scoped_platform_handle.h" #include "third_party/mojo/src/mojo/edk/system/channel_id.h" #include "third_party/mojo/src/mojo/edk/system/mutex.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace base { class TaskRunner; diff --git a/third_party/mojo/src/mojo/edk/system/channel_manager_unittest.cc b/third_party/mojo/src/mojo/edk/system/channel_manager_unittest.cc index bf648a4ed9350a..807ec0b2780c56 100644 --- a/third_party/mojo/src/mojo/edk/system/channel_manager_unittest.cc +++ b/third_party/mojo/src/mojo/edk/system/channel_manager_unittest.cc @@ -10,13 +10,13 @@ #include "base/task_runner.h" #include "base/thread_task_runner_handle.h" #include "base/threading/simple_thread.h" +#include "mojo/public/cpp/system/macros.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/mojo/src/mojo/edk/embedder/platform_channel_pair.h" #include "third_party/mojo/src/mojo/edk/embedder/simple_platform_support.h" #include "third_party/mojo/src/mojo/edk/system/channel.h" #include "third_party/mojo/src/mojo/edk/system/channel_endpoint.h" #include "third_party/mojo/src/mojo/edk/system/message_pipe_dispatcher.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace system { diff --git a/third_party/mojo/src/mojo/edk/system/channel_test_base.h b/third_party/mojo/src/mojo/edk/system/channel_test_base.h index 754c3f8baa6afa..2bc59702022e56 100644 --- a/third_party/mojo/src/mojo/edk/system/channel_test_base.h +++ b/third_party/mojo/src/mojo/edk/system/channel_test_base.h @@ -10,10 +10,10 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/test/test_io_thread.h" +#include "mojo/public/cpp/system/macros.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/mojo/src/mojo/edk/embedder/simple_platform_support.h" #include "third_party/mojo/src/mojo/edk/system/channel.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace system { diff --git a/third_party/mojo/src/mojo/edk/system/connection_manager.h b/third_party/mojo/src/mojo/edk/system/connection_manager.h index 85fb1ef6276c00..7e569d95f6f881 100644 --- a/third_party/mojo/src/mojo/edk/system/connection_manager.h +++ b/third_party/mojo/src/mojo/edk/system/connection_manager.h @@ -7,11 +7,11 @@ #include +#include "mojo/public/cpp/system/macros.h" #include "third_party/mojo/src/mojo/edk/system/connection_identifier.h" #include "third_party/mojo/src/mojo/edk/system/process_identifier.h" #include "third_party/mojo/src/mojo/edk/system/system_impl_export.h" #include "third_party/mojo/src/mojo/edk/system/thread_annotations.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { diff --git a/third_party/mojo/src/mojo/edk/system/connection_manager_unittest.cc b/third_party/mojo/src/mojo/edk/system/connection_manager_unittest.cc index ffe48750338c46..905193c8f508fe 100644 --- a/third_party/mojo/src/mojo/edk/system/connection_manager_unittest.cc +++ b/third_party/mojo/src/mojo/edk/system/connection_manager_unittest.cc @@ -14,6 +14,7 @@ #include "base/message_loop/message_loop.h" #include "base/run_loop.h" #include "base/threading/thread_checker.h" +#include "mojo/public/cpp/system/macros.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/mojo/src/mojo/edk/embedder/master_process_delegate.h" #include "third_party/mojo/src/mojo/edk/embedder/platform_channel_pair.h" @@ -22,7 +23,6 @@ #include "third_party/mojo/src/mojo/edk/system/master_connection_manager.h" #include "third_party/mojo/src/mojo/edk/system/slave_connection_manager.h" #include "third_party/mojo/src/mojo/edk/test/test_utils.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace system { diff --git a/third_party/mojo/src/mojo/edk/system/core.cc b/third_party/mojo/src/mojo/edk/system/core.cc index 64e2f82d95f71d..e1e6ec9a76c1ba 100644 --- a/third_party/mojo/src/mojo/edk/system/core.cc +++ b/third_party/mojo/src/mojo/edk/system/core.cc @@ -8,6 +8,8 @@ #include "base/logging.h" #include "base/time/time.h" +#include "mojo/public/c/system/macros.h" +#include "mojo/public/cpp/system/macros.h" #include "third_party/mojo/src/mojo/edk/embedder/platform_shared_buffer.h" #include "third_party/mojo/src/mojo/edk/embedder/platform_support.h" #include "third_party/mojo/src/mojo/edk/system/async_waiter.h" @@ -22,8 +24,6 @@ #include "third_party/mojo/src/mojo/edk/system/message_pipe_dispatcher.h" #include "third_party/mojo/src/mojo/edk/system/shared_buffer_dispatcher.h" #include "third_party/mojo/src/mojo/edk/system/waiter.h" -#include "third_party/mojo/src/mojo/public/c/system/macros.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace system { diff --git a/third_party/mojo/src/mojo/edk/system/core.h b/third_party/mojo/src/mojo/edk/system/core.h index 7a1ca9fac13ffa..2dc504bb0b380a 100644 --- a/third_party/mojo/src/mojo/edk/system/core.h +++ b/third_party/mojo/src/mojo/edk/system/core.h @@ -10,16 +10,16 @@ #include "base/callback.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" +#include "mojo/public/c/system/buffer.h" +#include "mojo/public/c/system/data_pipe.h" +#include "mojo/public/c/system/message_pipe.h" +#include "mojo/public/c/system/types.h" +#include "mojo/public/cpp/system/macros.h" #include "third_party/mojo/src/mojo/edk/system/handle_table.h" #include "third_party/mojo/src/mojo/edk/system/mapping_table.h" #include "third_party/mojo/src/mojo/edk/system/memory.h" #include "third_party/mojo/src/mojo/edk/system/mutex.h" #include "third_party/mojo/src/mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/c/system/buffer.h" -#include "third_party/mojo/src/mojo/public/c/system/data_pipe.h" -#include "third_party/mojo/src/mojo/public/c/system/message_pipe.h" -#include "third_party/mojo/src/mojo/public/c/system/types.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { @@ -73,7 +73,7 @@ class MOJO_SYSTEM_IMPL_EXPORT Core { // API functions, referenced below. // These methods correspond to the API functions defined in - // "third_party/mojo/src/mojo/public/c/system/functions.h": + // "mojo/public/c/system/functions.h": MojoTimeTicks GetTimeTicksNow(); MojoResult Close(MojoHandle handle); MojoResult Wait(MojoHandle handle, @@ -88,7 +88,7 @@ class MOJO_SYSTEM_IMPL_EXPORT Core { UserPointer signals_states); // These methods correspond to the API functions defined in - // "third_party/mojo/src/mojo/public/c/system/message_pipe.h": + // "mojo/public/c/system/message_pipe.h": MojoResult CreateMessagePipe( UserPointer options, UserPointer message_pipe_handle0, @@ -107,7 +107,7 @@ class MOJO_SYSTEM_IMPL_EXPORT Core { MojoReadMessageFlags flags); // These methods correspond to the API functions defined in - // "third_party/mojo/src/mojo/public/c/system/data_pipe.h": + // "mojo/public/c/system/data_pipe.h": MojoResult CreateDataPipe( UserPointer options, UserPointer data_pipe_producer_handle, @@ -134,7 +134,7 @@ class MOJO_SYSTEM_IMPL_EXPORT Core { uint32_t num_bytes_read); // These methods correspond to the API functions defined in - // "third_party/mojo/src/mojo/public/c/system/buffer.h": + // "mojo/public/c/system/buffer.h": MojoResult CreateSharedBuffer( UserPointer options, uint64_t num_bytes, diff --git a/third_party/mojo/src/mojo/edk/system/core_test_base.cc b/third_party/mojo/src/mojo/edk/system/core_test_base.cc index 8d2bcc8c140915..712b10a8ac1543 100644 --- a/third_party/mojo/src/mojo/edk/system/core_test_base.cc +++ b/third_party/mojo/src/mojo/edk/system/core_test_base.cc @@ -8,11 +8,11 @@ #include "base/logging.h" #include "base/memory/ref_counted.h" +#include "mojo/public/cpp/system/macros.h" #include "third_party/mojo/src/mojo/edk/system/configuration.h" #include "third_party/mojo/src/mojo/edk/system/core.h" #include "third_party/mojo/src/mojo/edk/system/dispatcher.h" #include "third_party/mojo/src/mojo/edk/system/memory.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace system { diff --git a/third_party/mojo/src/mojo/edk/system/core_test_base.h b/third_party/mojo/src/mojo/edk/system/core_test_base.h index 6f6f6b763c5be3..5798cb6d3f0052 100644 --- a/third_party/mojo/src/mojo/edk/system/core_test_base.h +++ b/third_party/mojo/src/mojo/edk/system/core_test_base.h @@ -5,11 +5,11 @@ #ifndef THIRD_PARTY_MOJO_SRC_MOJO_EDK_SYSTEM_CORE_TEST_BASE_H_ #define THIRD_PARTY_MOJO_SRC_MOJO_EDK_SYSTEM_CORE_TEST_BASE_H_ +#include "mojo/public/c/system/types.h" +#include "mojo/public/cpp/system/macros.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/mojo/src/mojo/edk/embedder/simple_platform_support.h" #include "third_party/mojo/src/mojo/edk/system/mutex.h" -#include "third_party/mojo/src/mojo/public/c/system/types.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace system { diff --git a/third_party/mojo/src/mojo/edk/system/core_unittest.cc b/third_party/mojo/src/mojo/edk/system/core_unittest.cc index 786eb523503ea2..979cfbd15ffaac 100644 --- a/third_party/mojo/src/mojo/edk/system/core_unittest.cc +++ b/third_party/mojo/src/mojo/edk/system/core_unittest.cc @@ -9,10 +9,10 @@ #include #include "base/bind.h" +#include "mojo/public/cpp/system/macros.h" #include "third_party/mojo/src/mojo/edk/system/awakable.h" #include "third_party/mojo/src/mojo/edk/system/core_test_base.h" #include "third_party/mojo/src/mojo/edk/system/test_utils.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace system { diff --git a/third_party/mojo/src/mojo/edk/system/data_pipe.h b/third_party/mojo/src/mojo/edk/system/data_pipe.h index e43d27a989a2c2..b49ab40d467901 100644 --- a/third_party/mojo/src/mojo/edk/system/data_pipe.h +++ b/third_party/mojo/src/mojo/edk/system/data_pipe.h @@ -10,14 +10,14 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "base/synchronization/lock.h" +#include "mojo/public/c/system/data_pipe.h" +#include "mojo/public/c/system/types.h" +#include "mojo/public/cpp/system/macros.h" #include "third_party/mojo/src/mojo/edk/embedder/platform_handle_vector.h" #include "third_party/mojo/src/mojo/edk/system/channel_endpoint_client.h" #include "third_party/mojo/src/mojo/edk/system/handle_signals_state.h" #include "third_party/mojo/src/mojo/edk/system/memory.h" #include "third_party/mojo/src/mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/c/system/data_pipe.h" -#include "third_party/mojo/src/mojo/public/c/system/types.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace system { diff --git a/third_party/mojo/src/mojo/edk/system/data_pipe_consumer_dispatcher.h b/third_party/mojo/src/mojo/edk/system/data_pipe_consumer_dispatcher.h index 6ce5c2fb2fd6eb..138c629d84298a 100644 --- a/third_party/mojo/src/mojo/edk/system/data_pipe_consumer_dispatcher.h +++ b/third_party/mojo/src/mojo/edk/system/data_pipe_consumer_dispatcher.h @@ -6,9 +6,9 @@ #define THIRD_PARTY_MOJO_SRC_MOJO_EDK_SYSTEM_DATA_PIPE_CONSUMER_DISPATCHER_H_ #include "base/memory/ref_counted.h" +#include "mojo/public/cpp/system/macros.h" #include "third_party/mojo/src/mojo/edk/system/dispatcher.h" #include "third_party/mojo/src/mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace system { diff --git a/third_party/mojo/src/mojo/edk/system/data_pipe_impl.h b/third_party/mojo/src/mojo/edk/system/data_pipe_impl.h index 904946095ce4e2..067feee9214f4b 100644 --- a/third_party/mojo/src/mojo/edk/system/data_pipe_impl.h +++ b/third_party/mojo/src/mojo/edk/system/data_pipe_impl.h @@ -7,14 +7,14 @@ #include +#include "mojo/public/c/system/data_pipe.h" +#include "mojo/public/c/system/macros.h" +#include "mojo/public/c/system/types.h" #include "third_party/mojo/src/mojo/edk/embedder/platform_handle_vector.h" #include "third_party/mojo/src/mojo/edk/system/data_pipe.h" #include "third_party/mojo/src/mojo/edk/system/handle_signals_state.h" #include "third_party/mojo/src/mojo/edk/system/memory.h" #include "third_party/mojo/src/mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/c/system/data_pipe.h" -#include "third_party/mojo/src/mojo/public/c/system/macros.h" -#include "third_party/mojo/src/mojo/public/c/system/types.h" namespace mojo { namespace system { diff --git a/third_party/mojo/src/mojo/edk/system/data_pipe_impl_unittest.cc b/third_party/mojo/src/mojo/edk/system/data_pipe_impl_unittest.cc index 63a5bd1421b6da..efe8bb5df30fe9 100644 --- a/third_party/mojo/src/mojo/edk/system/data_pipe_impl_unittest.cc +++ b/third_party/mojo/src/mojo/edk/system/data_pipe_impl_unittest.cc @@ -15,6 +15,7 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/test/test_io_thread.h" +#include "mojo/public/cpp/system/macros.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/mojo/src/mojo/edk/embedder/platform_channel_pair.h" #include "third_party/mojo/src/mojo/edk/embedder/simple_platform_support.h" @@ -28,7 +29,6 @@ #include "third_party/mojo/src/mojo/edk/system/raw_channel.h" #include "third_party/mojo/src/mojo/edk/system/test_utils.h" #include "third_party/mojo/src/mojo/edk/system/waiter.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace system { diff --git a/third_party/mojo/src/mojo/edk/system/data_pipe_producer_dispatcher.h b/third_party/mojo/src/mojo/edk/system/data_pipe_producer_dispatcher.h index 08767baa8bf8fa..0685683f0509cc 100644 --- a/third_party/mojo/src/mojo/edk/system/data_pipe_producer_dispatcher.h +++ b/third_party/mojo/src/mojo/edk/system/data_pipe_producer_dispatcher.h @@ -6,9 +6,9 @@ #define THIRD_PARTY_MOJO_SRC_MOJO_EDK_SYSTEM_DATA_PIPE_PRODUCER_DISPATCHER_H_ #include "base/memory/ref_counted.h" +#include "mojo/public/cpp/system/macros.h" #include "third_party/mojo/src/mojo/edk/system/dispatcher.h" #include "third_party/mojo/src/mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace system { diff --git a/third_party/mojo/src/mojo/edk/system/data_pipe_unittest.cc b/third_party/mojo/src/mojo/edk/system/data_pipe_unittest.cc index 4ea35dabfbc9a4..2cb2bbd668eb72 100644 --- a/third_party/mojo/src/mojo/edk/system/data_pipe_unittest.cc +++ b/third_party/mojo/src/mojo/edk/system/data_pipe_unittest.cc @@ -9,9 +9,9 @@ #include +#include "mojo/public/cpp/system/macros.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/mojo/src/mojo/edk/system/configuration.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace system { diff --git a/third_party/mojo/src/mojo/edk/system/dispatcher.h b/third_party/mojo/src/mojo/edk/system/dispatcher.h index 2f11ddc6c52803..c0bb69ba2d6fe8 100644 --- a/third_party/mojo/src/mojo/edk/system/dispatcher.h +++ b/third_party/mojo/src/mojo/edk/system/dispatcher.h @@ -13,16 +13,16 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" +#include "mojo/public/c/system/buffer.h" +#include "mojo/public/c/system/data_pipe.h" +#include "mojo/public/c/system/message_pipe.h" +#include "mojo/public/c/system/types.h" +#include "mojo/public/cpp/system/macros.h" #include "third_party/mojo/src/mojo/edk/embedder/platform_handle_vector.h" #include "third_party/mojo/src/mojo/edk/system/handle_signals_state.h" #include "third_party/mojo/src/mojo/edk/system/memory.h" #include "third_party/mojo/src/mojo/edk/system/mutex.h" #include "third_party/mojo/src/mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/c/system/buffer.h" -#include "third_party/mojo/src/mojo/public/c/system/data_pipe.h" -#include "third_party/mojo/src/mojo/public/c/system/message_pipe.h" -#include "third_party/mojo/src/mojo/public/c/system/types.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { diff --git a/third_party/mojo/src/mojo/edk/system/dispatcher_unittest.cc b/third_party/mojo/src/mojo/edk/system/dispatcher_unittest.cc index 5fb6b3c67c9d91..a9a413badda50f 100644 --- a/third_party/mojo/src/mojo/edk/system/dispatcher_unittest.cc +++ b/third_party/mojo/src/mojo/edk/system/dispatcher_unittest.cc @@ -8,11 +8,11 @@ #include "base/memory/scoped_vector.h" #include "base/synchronization/waitable_event.h" #include "base/threading/simple_thread.h" +#include "mojo/public/cpp/system/macros.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/mojo/src/mojo/edk/embedder/platform_shared_buffer.h" #include "third_party/mojo/src/mojo/edk/system/memory.h" #include "third_party/mojo/src/mojo/edk/system/waiter.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace system { diff --git a/third_party/mojo/src/mojo/edk/system/endpoint_relayer.h b/third_party/mojo/src/mojo/edk/system/endpoint_relayer.h index ed789da4f288d6..acff70043d957c 100644 --- a/third_party/mojo/src/mojo/edk/system/endpoint_relayer.h +++ b/third_party/mojo/src/mojo/edk/system/endpoint_relayer.h @@ -7,10 +7,10 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" +#include "mojo/public/cpp/system/macros.h" #include "third_party/mojo/src/mojo/edk/system/channel_endpoint_client.h" #include "third_party/mojo/src/mojo/edk/system/mutex.h" #include "third_party/mojo/src/mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace system { diff --git a/third_party/mojo/src/mojo/edk/system/endpoint_relayer_unittest.cc b/third_party/mojo/src/mojo/edk/system/endpoint_relayer_unittest.cc index eb96eec944daa8..29096e181a5282 100644 --- a/third_party/mojo/src/mojo/edk/system/endpoint_relayer_unittest.cc +++ b/third_party/mojo/src/mojo/edk/system/endpoint_relayer_unittest.cc @@ -7,12 +7,12 @@ #include "base/logging.h" #include "base/synchronization/waitable_event.h" #include "base/test/test_timeouts.h" +#include "mojo/public/cpp/system/macros.h" #include "third_party/mojo/src/mojo/edk/system/channel_endpoint_id.h" #include "third_party/mojo/src/mojo/edk/system/channel_test_base.h" #include "third_party/mojo/src/mojo/edk/system/message_in_transit_queue.h" #include "third_party/mojo/src/mojo/edk/system/message_in_transit_test_utils.h" #include "third_party/mojo/src/mojo/edk/system/test_channel_endpoint_client.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace system { diff --git a/third_party/mojo/src/mojo/edk/system/handle_signals_state.h b/third_party/mojo/src/mojo/edk/system/handle_signals_state.h index 501d9031f08378..bec6e74b0d810f 100644 --- a/third_party/mojo/src/mojo/edk/system/handle_signals_state.h +++ b/third_party/mojo/src/mojo/edk/system/handle_signals_state.h @@ -5,8 +5,8 @@ #ifndef THIRD_PARTY_MOJO_SRC_MOJO_EDK_SYSTEM_HANDLE_SIGNALS_STATE_H_ #define THIRD_PARTY_MOJO_SRC_MOJO_EDK_SYSTEM_HANDLE_SIGNALS_STATE_H_ +#include "mojo/public/c/system/types.h" #include "third_party/mojo/src/mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/c/system/types.h" namespace mojo { namespace system { diff --git a/third_party/mojo/src/mojo/edk/system/handle_table.h b/third_party/mojo/src/mojo/edk/system/handle_table.h index d0a5c0401e0bd9..65b81eb9072e75 100644 --- a/third_party/mojo/src/mojo/edk/system/handle_table.h +++ b/third_party/mojo/src/mojo/edk/system/handle_table.h @@ -10,9 +10,9 @@ #include "base/containers/hash_tables.h" #include "base/memory/ref_counted.h" +#include "mojo/public/c/system/types.h" +#include "mojo/public/cpp/system/macros.h" #include "third_party/mojo/src/mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/c/system/types.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace system { diff --git a/third_party/mojo/src/mojo/edk/system/incoming_endpoint.h b/third_party/mojo/src/mojo/edk/system/incoming_endpoint.h index f0c61066ae9f02..18f76ea1fe13a4 100644 --- a/third_party/mojo/src/mojo/edk/system/incoming_endpoint.h +++ b/third_party/mojo/src/mojo/edk/system/incoming_endpoint.h @@ -8,11 +8,11 @@ #include #include "base/memory/ref_counted.h" +#include "mojo/public/cpp/system/macros.h" #include "third_party/mojo/src/mojo/edk/system/channel_endpoint_client.h" #include "third_party/mojo/src/mojo/edk/system/message_in_transit_queue.h" #include "third_party/mojo/src/mojo/edk/system/mutex.h" #include "third_party/mojo/src/mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" struct MojoCreateDataPipeOptions; diff --git a/third_party/mojo/src/mojo/edk/system/ipc_support.h b/third_party/mojo/src/mojo/edk/system/ipc_support.h index 0acac6eff70363..953673ef16f0e7 100644 --- a/third_party/mojo/src/mojo/edk/system/ipc_support.h +++ b/third_party/mojo/src/mojo/edk/system/ipc_support.h @@ -10,6 +10,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/task_runner.h" +#include "mojo/public/cpp/system/macros.h" #include "third_party/mojo/src/mojo/edk/embedder/process_type.h" #include "third_party/mojo/src/mojo/edk/embedder/scoped_platform_handle.h" #include "third_party/mojo/src/mojo/edk/embedder/slave_info.h" @@ -17,7 +18,6 @@ #include "third_party/mojo/src/mojo/edk/system/connection_identifier.h" #include "third_party/mojo/src/mojo/edk/system/process_identifier.h" #include "third_party/mojo/src/mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { diff --git a/third_party/mojo/src/mojo/edk/system/ipc_support_unittest.cc b/third_party/mojo/src/mojo/edk/system/ipc_support_unittest.cc index 3e4d330d93b60d..2df558e6da252f 100644 --- a/third_party/mojo/src/mojo/edk/system/ipc_support_unittest.cc +++ b/third_party/mojo/src/mojo/edk/system/ipc_support_unittest.cc @@ -16,6 +16,7 @@ #include "base/synchronization/waitable_event.h" #include "base/test/test_io_thread.h" #include "base/test/test_timeouts.h" +#include "mojo/public/cpp/system/macros.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/mojo/src/mojo/edk/embedder/master_process_delegate.h" #include "third_party/mojo/src/mojo/edk/embedder/platform_channel_pair.h" @@ -31,7 +32,6 @@ #include "third_party/mojo/src/mojo/edk/system/waiter.h" #include "third_party/mojo/src/mojo/edk/test/multiprocess_test_helper.h" #include "third_party/mojo/src/mojo/edk/test/test_utils.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace system { diff --git a/third_party/mojo/src/mojo/edk/system/local_data_pipe_impl.h b/third_party/mojo/src/mojo/edk/system/local_data_pipe_impl.h index 0921e774591c2b..c1442041a1edb1 100644 --- a/third_party/mojo/src/mojo/edk/system/local_data_pipe_impl.h +++ b/third_party/mojo/src/mojo/edk/system/local_data_pipe_impl.h @@ -7,9 +7,9 @@ #include "base/memory/aligned_memory.h" #include "base/memory/scoped_ptr.h" +#include "mojo/public/cpp/system/macros.h" #include "third_party/mojo/src/mojo/edk/system/data_pipe_impl.h" #include "third_party/mojo/src/mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace system { diff --git a/third_party/mojo/src/mojo/edk/system/local_message_pipe_endpoint.h b/third_party/mojo/src/mojo/edk/system/local_message_pipe_endpoint.h index 16903e4409cc1d..c2736317b40d1a 100644 --- a/third_party/mojo/src/mojo/edk/system/local_message_pipe_endpoint.h +++ b/third_party/mojo/src/mojo/edk/system/local_message_pipe_endpoint.h @@ -5,12 +5,12 @@ #ifndef THIRD_PARTY_MOJO_SRC_MOJO_EDK_SYSTEM_LOCAL_MESSAGE_PIPE_ENDPOINT_H_ #define THIRD_PARTY_MOJO_SRC_MOJO_EDK_SYSTEM_LOCAL_MESSAGE_PIPE_ENDPOINT_H_ +#include "mojo/public/cpp/system/macros.h" #include "third_party/mojo/src/mojo/edk/system/awakable_list.h" #include "third_party/mojo/src/mojo/edk/system/handle_signals_state.h" #include "third_party/mojo/src/mojo/edk/system/message_in_transit_queue.h" #include "third_party/mojo/src/mojo/edk/system/message_pipe_endpoint.h" #include "third_party/mojo/src/mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace system { diff --git a/third_party/mojo/src/mojo/edk/system/mapping_table.h b/third_party/mojo/src/mojo/edk/system/mapping_table.h index 3c522a067115ce..cc74acae02dbe6 100644 --- a/third_party/mojo/src/mojo/edk/system/mapping_table.h +++ b/third_party/mojo/src/mojo/edk/system/mapping_table.h @@ -11,9 +11,9 @@ #include "base/containers/hash_tables.h" #include "base/memory/scoped_ptr.h" +#include "mojo/public/c/system/types.h" +#include "mojo/public/cpp/system/macros.h" #include "third_party/mojo/src/mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/c/system/types.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { diff --git a/third_party/mojo/src/mojo/edk/system/master_connection_manager.cc b/third_party/mojo/src/mojo/edk/system/master_connection_manager.cc index 833abd36c1ff43..b72e8ee04c96d0 100644 --- a/third_party/mojo/src/mojo/edk/system/master_connection_manager.cc +++ b/third_party/mojo/src/mojo/edk/system/master_connection_manager.cc @@ -10,6 +10,7 @@ #include "base/logging.h" #include "base/message_loop/message_loop.h" #include "base/synchronization/waitable_event.h" +#include "mojo/public/cpp/system/macros.h" #include "third_party/mojo/src/mojo/edk/embedder/master_process_delegate.h" #include "third_party/mojo/src/mojo/edk/embedder/platform_channel_pair.h" #include "third_party/mojo/src/mojo/edk/embedder/platform_handle.h" @@ -18,7 +19,6 @@ #include "third_party/mojo/src/mojo/edk/system/message_in_transit.h" #include "third_party/mojo/src/mojo/edk/system/raw_channel.h" #include "third_party/mojo/src/mojo/edk/system/transport_data.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace system { diff --git a/third_party/mojo/src/mojo/edk/system/master_connection_manager.h b/third_party/mojo/src/mojo/edk/system/master_connection_manager.h index acc89c2e17e8cf..0ebad055ff4936 100644 --- a/third_party/mojo/src/mojo/edk/system/master_connection_manager.h +++ b/third_party/mojo/src/mojo/edk/system/master_connection_manager.h @@ -10,11 +10,11 @@ #include "base/containers/hash_tables.h" #include "base/memory/ref_counted.h" #include "base/threading/thread.h" +#include "mojo/public/cpp/system/macros.h" #include "third_party/mojo/src/mojo/edk/embedder/scoped_platform_handle.h" #include "third_party/mojo/src/mojo/edk/system/connection_manager.h" #include "third_party/mojo/src/mojo/edk/system/mutex.h" #include "third_party/mojo/src/mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace base { class TaskRunner; diff --git a/third_party/mojo/src/mojo/edk/system/memory.h b/third_party/mojo/src/mojo/edk/system/memory.h index b09eb801ed5007..3e9f79aa9892ee 100644 --- a/third_party/mojo/src/mojo/edk/system/memory.h +++ b/third_party/mojo/src/mojo/edk/system/memory.h @@ -10,9 +10,9 @@ #include // For |memcpy()|. #include "base/memory/scoped_ptr.h" +#include "mojo/public/c/system/macros.h" +#include "mojo/public/cpp/system/macros.h" #include "third_party/mojo/src/mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/c/system/macros.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace system { diff --git a/third_party/mojo/src/mojo/edk/system/memory_unittest.cc b/third_party/mojo/src/mojo/edk/system/memory_unittest.cc index 8b2e58fa6b8b04..90133e19426022 100644 --- a/third_party/mojo/src/mojo/edk/system/memory_unittest.cc +++ b/third_party/mojo/src/mojo/edk/system/memory_unittest.cc @@ -9,8 +9,8 @@ #include +#include "mojo/public/c/system/macros.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/c/system/macros.h" namespace mojo { namespace system { diff --git a/third_party/mojo/src/mojo/edk/system/message_in_transit.h b/third_party/mojo/src/mojo/edk/system/message_in_transit.h index 87f57dd3c720ed..7383d2120442c5 100644 --- a/third_party/mojo/src/mojo/edk/system/message_in_transit.h +++ b/third_party/mojo/src/mojo/edk/system/message_in_transit.h @@ -13,11 +13,11 @@ #include "base/memory/aligned_memory.h" #include "base/memory/scoped_ptr.h" +#include "mojo/public/cpp/system/macros.h" #include "third_party/mojo/src/mojo/edk/system/channel_endpoint_id.h" #include "third_party/mojo/src/mojo/edk/system/dispatcher.h" #include "third_party/mojo/src/mojo/edk/system/memory.h" #include "third_party/mojo/src/mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace system { diff --git a/third_party/mojo/src/mojo/edk/system/message_in_transit_queue.h b/third_party/mojo/src/mojo/edk/system/message_in_transit_queue.h index c9f9733c584e4c..c497341495f30c 100644 --- a/third_party/mojo/src/mojo/edk/system/message_in_transit_queue.h +++ b/third_party/mojo/src/mojo/edk/system/message_in_transit_queue.h @@ -8,9 +8,9 @@ #include #include "base/memory/scoped_ptr.h" +#include "mojo/public/cpp/system/macros.h" #include "third_party/mojo/src/mojo/edk/system/message_in_transit.h" #include "third_party/mojo/src/mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace system { diff --git a/third_party/mojo/src/mojo/edk/system/message_pipe.h b/third_party/mojo/src/mojo/edk/system/message_pipe.h index 977e9c7b111b62..34e2edce7cf61d 100644 --- a/third_party/mojo/src/mojo/edk/system/message_pipe.h +++ b/third_party/mojo/src/mojo/edk/system/message_pipe.h @@ -13,6 +13,9 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/synchronization/lock.h" +#include "mojo/public/c/system/message_pipe.h" +#include "mojo/public/c/system/types.h" +#include "mojo/public/cpp/system/macros.h" #include "third_party/mojo/src/mojo/edk/embedder/platform_handle_vector.h" #include "third_party/mojo/src/mojo/edk/system/channel_endpoint_client.h" #include "third_party/mojo/src/mojo/edk/system/dispatcher.h" @@ -21,9 +24,6 @@ #include "third_party/mojo/src/mojo/edk/system/message_in_transit.h" #include "third_party/mojo/src/mojo/edk/system/message_pipe_endpoint.h" #include "third_party/mojo/src/mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/c/system/message_pipe.h" -#include "third_party/mojo/src/mojo/public/c/system/types.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace system { diff --git a/third_party/mojo/src/mojo/edk/system/message_pipe_dispatcher.h b/third_party/mojo/src/mojo/edk/system/message_pipe_dispatcher.h index 974f5469e10585..7caa63125788a2 100644 --- a/third_party/mojo/src/mojo/edk/system/message_pipe_dispatcher.h +++ b/third_party/mojo/src/mojo/edk/system/message_pipe_dispatcher.h @@ -6,10 +6,10 @@ #define THIRD_PARTY_MOJO_SRC_MOJO_EDK_SYSTEM_MESSAGE_PIPE_DISPATCHER_H_ #include "base/memory/ref_counted.h" +#include "mojo/public/cpp/system/macros.h" #include "third_party/mojo/src/mojo/edk/system/dispatcher.h" #include "third_party/mojo/src/mojo/edk/system/memory.h" #include "third_party/mojo/src/mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace system { diff --git a/third_party/mojo/src/mojo/edk/system/message_pipe_dispatcher_unittest.cc b/third_party/mojo/src/mojo/edk/system/message_pipe_dispatcher_unittest.cc index e1e6ba8682596f..53f5223a7855ba 100644 --- a/third_party/mojo/src/mojo/edk/system/message_pipe_dispatcher_unittest.cc +++ b/third_party/mojo/src/mojo/edk/system/message_pipe_dispatcher_unittest.cc @@ -17,12 +17,12 @@ #include "base/memory/scoped_vector.h" #include "base/rand_util.h" #include "base/threading/simple_thread.h" +#include "mojo/public/cpp/system/macros.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/mojo/src/mojo/edk/system/message_pipe.h" #include "third_party/mojo/src/mojo/edk/system/test_utils.h" #include "third_party/mojo/src/mojo/edk/system/waiter.h" #include "third_party/mojo/src/mojo/edk/system/waiter_test_utils.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace system { diff --git a/third_party/mojo/src/mojo/edk/system/message_pipe_endpoint.h b/third_party/mojo/src/mojo/edk/system/message_pipe_endpoint.h index d82af5d7b3fda1..c278f56fa94be2 100644 --- a/third_party/mojo/src/mojo/edk/system/message_pipe_endpoint.h +++ b/third_party/mojo/src/mojo/edk/system/message_pipe_endpoint.h @@ -11,13 +11,13 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" +#include "mojo/public/c/system/message_pipe.h" +#include "mojo/public/c/system/types.h" +#include "mojo/public/cpp/system/macros.h" #include "third_party/mojo/src/mojo/edk/system/dispatcher.h" #include "third_party/mojo/src/mojo/edk/system/memory.h" #include "third_party/mojo/src/mojo/edk/system/message_in_transit.h" #include "third_party/mojo/src/mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/c/system/message_pipe.h" -#include "third_party/mojo/src/mojo/public/c/system/types.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace system { diff --git a/third_party/mojo/src/mojo/edk/system/message_pipe_test_utils.h b/third_party/mojo/src/mojo/edk/system/message_pipe_test_utils.h index be65e027081f94..3ee386cb601096 100644 --- a/third_party/mojo/src/mojo/edk/system/message_pipe_test_utils.h +++ b/third_party/mojo/src/mojo/edk/system/message_pipe_test_utils.h @@ -6,11 +6,11 @@ #define THIRD_PARTY_MOJO_SRC_MOJO_EDK_SYSTEM_MESSAGE_PIPE_TEST_UTILS_H_ #include "base/test/test_io_thread.h" +#include "mojo/public/cpp/system/macros.h" #include "third_party/mojo/src/mojo/edk/embedder/simple_platform_support.h" #include "third_party/mojo/src/mojo/edk/system/channel.h" #include "third_party/mojo/src/mojo/edk/system/test_utils.h" #include "third_party/mojo/src/mojo/edk/test/multiprocess_test_helper.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace system { diff --git a/third_party/mojo/src/mojo/edk/system/mutex.h b/third_party/mojo/src/mojo/edk/system/mutex.h index 8f43c49d2c77f1..67cda57e18f084 100644 --- a/third_party/mojo/src/mojo/edk/system/mutex.h +++ b/third_party/mojo/src/mojo/edk/system/mutex.h @@ -14,9 +14,9 @@ #include "base/synchronization/lock_impl.h" #include "base/threading/platform_thread.h" +#include "mojo/public/cpp/system/macros.h" #include "third_party/mojo/src/mojo/edk/system/system_impl_export.h" #include "third_party/mojo/src/mojo/edk/system/thread_annotations.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace system { diff --git a/third_party/mojo/src/mojo/edk/system/mutex_unittest.cc b/third_party/mojo/src/mojo/edk/system/mutex_unittest.cc index cf38400a01212e..bcd745a0ba0913 100644 --- a/third_party/mojo/src/mojo/edk/system/mutex_unittest.cc +++ b/third_party/mojo/src/mojo/edk/system/mutex_unittest.cc @@ -7,9 +7,9 @@ #include #include "base/threading/platform_thread.h" +#include "mojo/public/cpp/system/macros.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/mojo/src/mojo/edk/system/test_utils.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace system { diff --git a/third_party/mojo/src/mojo/edk/system/options_validation.h b/third_party/mojo/src/mojo/edk/system/options_validation.h index c2ede835277763..a325b10d23d887 100644 --- a/third_party/mojo/src/mojo/edk/system/options_validation.h +++ b/third_party/mojo/src/mojo/edk/system/options_validation.h @@ -17,10 +17,10 @@ #include #include "base/logging.h" +#include "mojo/public/c/system/types.h" +#include "mojo/public/cpp/system/macros.h" #include "third_party/mojo/src/mojo/edk/system/memory.h" #include "third_party/mojo/src/mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/c/system/types.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace system { diff --git a/third_party/mojo/src/mojo/edk/system/options_validation_unittest.cc b/third_party/mojo/src/mojo/edk/system/options_validation_unittest.cc index 11632d4c80c04e..dab6597558dbe0 100644 --- a/third_party/mojo/src/mojo/edk/system/options_validation_unittest.cc +++ b/third_party/mojo/src/mojo/edk/system/options_validation_unittest.cc @@ -7,8 +7,8 @@ #include #include +#include "mojo/public/c/system/macros.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/c/system/macros.h" namespace mojo { namespace system { diff --git a/third_party/mojo/src/mojo/edk/system/platform_handle_dispatcher.h b/third_party/mojo/src/mojo/edk/system/platform_handle_dispatcher.h index 0a9eec8167b728..0dde78ca174281 100644 --- a/third_party/mojo/src/mojo/edk/system/platform_handle_dispatcher.h +++ b/third_party/mojo/src/mojo/edk/system/platform_handle_dispatcher.h @@ -5,10 +5,10 @@ #ifndef THIRD_PARTY_MOJO_SRC_MOJO_EDK_SYSTEM_PLATFORM_HANDLE_DISPATCHER_H_ #define THIRD_PARTY_MOJO_SRC_MOJO_EDK_SYSTEM_PLATFORM_HANDLE_DISPATCHER_H_ +#include "mojo/public/cpp/system/macros.h" #include "third_party/mojo/src/mojo/edk/embedder/scoped_platform_handle.h" #include "third_party/mojo/src/mojo/edk/system/simple_dispatcher.h" #include "third_party/mojo/src/mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace system { diff --git a/third_party/mojo/src/mojo/edk/system/proxy_message_pipe_endpoint.h b/third_party/mojo/src/mojo/edk/system/proxy_message_pipe_endpoint.h index 732c86dd23cb55..9e649fa0b0a7c9 100644 --- a/third_party/mojo/src/mojo/edk/system/proxy_message_pipe_endpoint.h +++ b/third_party/mojo/src/mojo/edk/system/proxy_message_pipe_endpoint.h @@ -6,10 +6,10 @@ #define THIRD_PARTY_MOJO_SRC_MOJO_EDK_SYSTEM_PROXY_MESSAGE_PIPE_ENDPOINT_H_ #include "base/memory/ref_counted.h" +#include "mojo/public/cpp/system/macros.h" #include "third_party/mojo/src/mojo/edk/system/message_in_transit.h" #include "third_party/mojo/src/mojo/edk/system/message_pipe_endpoint.h" #include "third_party/mojo/src/mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace system { diff --git a/third_party/mojo/src/mojo/edk/system/raw_channel.h b/third_party/mojo/src/mojo/edk/system/raw_channel.h index 4c8b6fffe92a4b..35f7a3ebfb620e 100644 --- a/third_party/mojo/src/mojo/edk/system/raw_channel.h +++ b/third_party/mojo/src/mojo/edk/system/raw_channel.h @@ -10,12 +10,12 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/synchronization/lock.h" +#include "mojo/public/cpp/system/macros.h" #include "third_party/mojo/src/mojo/edk/embedder/platform_handle_vector.h" #include "third_party/mojo/src/mojo/edk/embedder/scoped_platform_handle.h" #include "third_party/mojo/src/mojo/edk/system/message_in_transit.h" #include "third_party/mojo/src/mojo/edk/system/message_in_transit_queue.h" #include "third_party/mojo/src/mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace base { class MessageLoopForIO; diff --git a/third_party/mojo/src/mojo/edk/system/raw_channel_posix.cc b/third_party/mojo/src/mojo/edk/system/raw_channel_posix.cc index 32d1fcec83d3b6..c2be79fec3d2d6 100644 --- a/third_party/mojo/src/mojo/edk/system/raw_channel_posix.cc +++ b/third_party/mojo/src/mojo/edk/system/raw_channel_posix.cc @@ -18,11 +18,11 @@ #include "base/memory/weak_ptr.h" #include "base/message_loop/message_loop.h" #include "base/synchronization/lock.h" +#include "mojo/public/cpp/system/macros.h" #include "third_party/mojo/src/mojo/edk/embedder/platform_channel_utils_posix.h" #include "third_party/mojo/src/mojo/edk/embedder/platform_handle.h" #include "third_party/mojo/src/mojo/edk/embedder/platform_handle_vector.h" #include "third_party/mojo/src/mojo/edk/system/transport_data.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace system { diff --git a/third_party/mojo/src/mojo/edk/system/raw_channel_unittest.cc b/third_party/mojo/src/mojo/edk/system/raw_channel_unittest.cc index a416fea1f25583..831d3848d91903 100644 --- a/third_party/mojo/src/mojo/edk/system/raw_channel_unittest.cc +++ b/third_party/mojo/src/mojo/edk/system/raw_channel_unittest.cc @@ -23,6 +23,7 @@ #include "base/test/test_io_thread.h" #include "base/threading/simple_thread.h" #include "build/build_config.h" // TODO(vtl): Remove this. +#include "mojo/public/cpp/system/macros.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/mojo/src/mojo/edk/embedder/platform_channel_pair.h" #include "third_party/mojo/src/mojo/edk/embedder/platform_handle.h" @@ -32,7 +33,6 @@ #include "third_party/mojo/src/mojo/edk/system/test_utils.h" #include "third_party/mojo/src/mojo/edk/system/transport_data.h" #include "third_party/mojo/src/mojo/edk/test/test_utils.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace system { diff --git a/third_party/mojo/src/mojo/edk/system/raw_channel_win.cc b/third_party/mojo/src/mojo/edk/system/raw_channel_win.cc index 5ff956b8f4ce37..b25453f7e7b2f6 100644 --- a/third_party/mojo/src/mojo/edk/system/raw_channel_win.cc +++ b/third_party/mojo/src/mojo/edk/system/raw_channel_win.cc @@ -15,8 +15,8 @@ #include "base/process/process.h" #include "base/synchronization/lock.h" #include "base/win/windows_version.h" +#include "mojo/public/cpp/system/macros.h" #include "third_party/mojo/src/mojo/edk/embedder/platform_handle.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace system { diff --git a/third_party/mojo/src/mojo/edk/system/remote_consumer_data_pipe_impl.h b/third_party/mojo/src/mojo/edk/system/remote_consumer_data_pipe_impl.h index c1c63063a03791..c87f23222b4fc0 100644 --- a/third_party/mojo/src/mojo/edk/system/remote_consumer_data_pipe_impl.h +++ b/third_party/mojo/src/mojo/edk/system/remote_consumer_data_pipe_impl.h @@ -8,10 +8,10 @@ #include "base/memory/aligned_memory.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" +#include "mojo/public/cpp/system/macros.h" #include "third_party/mojo/src/mojo/edk/system/channel_endpoint.h" #include "third_party/mojo/src/mojo/edk/system/data_pipe_impl.h" #include "third_party/mojo/src/mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace system { diff --git a/third_party/mojo/src/mojo/edk/system/remote_data_pipe_impl_unittest.cc b/third_party/mojo/src/mojo/edk/system/remote_data_pipe_impl_unittest.cc index 9abe6a40a01232..1aef0fc54bd027 100644 --- a/third_party/mojo/src/mojo/edk/system/remote_data_pipe_impl_unittest.cc +++ b/third_party/mojo/src/mojo/edk/system/remote_data_pipe_impl_unittest.cc @@ -12,6 +12,7 @@ #include "base/logging.h" #include "base/message_loop/message_loop.h" #include "base/test/test_io_thread.h" +#include "mojo/public/cpp/system/macros.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/mojo/src/mojo/edk/embedder/platform_channel_pair.h" #include "third_party/mojo/src/mojo/edk/embedder/simple_platform_support.h" @@ -25,7 +26,6 @@ #include "third_party/mojo/src/mojo/edk/system/raw_channel.h" #include "third_party/mojo/src/mojo/edk/system/test_utils.h" #include "third_party/mojo/src/mojo/edk/system/waiter.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace system { diff --git a/third_party/mojo/src/mojo/edk/system/remote_message_pipe_unittest.cc b/third_party/mojo/src/mojo/edk/system/remote_message_pipe_unittest.cc index b04cb2c1f3abdb..7e08429643b47f 100644 --- a/third_party/mojo/src/mojo/edk/system/remote_message_pipe_unittest.cc +++ b/third_party/mojo/src/mojo/edk/system/remote_message_pipe_unittest.cc @@ -18,6 +18,7 @@ #include "base/message_loop/message_loop.h" #include "base/test/test_io_thread.h" #include "build/build_config.h" // TODO(vtl): Remove this. +#include "mojo/public/cpp/system/macros.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/mojo/src/mojo/edk/embedder/platform_channel_pair.h" #include "third_party/mojo/src/mojo/edk/embedder/platform_shared_buffer.h" @@ -35,7 +36,6 @@ #include "third_party/mojo/src/mojo/edk/system/test_utils.h" #include "third_party/mojo/src/mojo/edk/system/waiter.h" #include "third_party/mojo/src/mojo/edk/test/test_utils.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace system { diff --git a/third_party/mojo/src/mojo/edk/system/remote_producer_data_pipe_impl.h b/third_party/mojo/src/mojo/edk/system/remote_producer_data_pipe_impl.h index 5d7b062db8d904..de90cb2650b7c0 100644 --- a/third_party/mojo/src/mojo/edk/system/remote_producer_data_pipe_impl.h +++ b/third_party/mojo/src/mojo/edk/system/remote_producer_data_pipe_impl.h @@ -8,10 +8,10 @@ #include "base/memory/aligned_memory.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" +#include "mojo/public/cpp/system/macros.h" #include "third_party/mojo/src/mojo/edk/system/channel_endpoint.h" #include "third_party/mojo/src/mojo/edk/system/data_pipe_impl.h" #include "third_party/mojo/src/mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace system { diff --git a/third_party/mojo/src/mojo/edk/system/shared_buffer_dispatcher.cc b/third_party/mojo/src/mojo/edk/system/shared_buffer_dispatcher.cc index 60707ffa82d041..75c85cfaa6707e 100644 --- a/third_party/mojo/src/mojo/edk/system/shared_buffer_dispatcher.cc +++ b/third_party/mojo/src/mojo/edk/system/shared_buffer_dispatcher.cc @@ -8,12 +8,12 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" +#include "mojo/public/c/system/macros.h" #include "third_party/mojo/src/mojo/edk/embedder/platform_support.h" #include "third_party/mojo/src/mojo/edk/system/channel.h" #include "third_party/mojo/src/mojo/edk/system/configuration.h" #include "third_party/mojo/src/mojo/edk/system/memory.h" #include "third_party/mojo/src/mojo/edk/system/options_validation.h" -#include "third_party/mojo/src/mojo/public/c/system/macros.h" namespace mojo { namespace system { diff --git a/third_party/mojo/src/mojo/edk/system/shared_buffer_dispatcher.h b/third_party/mojo/src/mojo/edk/system/shared_buffer_dispatcher.h index 5abdad7d0d3672..3e6d4f254035d5 100644 --- a/third_party/mojo/src/mojo/edk/system/shared_buffer_dispatcher.h +++ b/third_party/mojo/src/mojo/edk/system/shared_buffer_dispatcher.h @@ -5,11 +5,11 @@ #ifndef THIRD_PARTY_MOJO_SRC_MOJO_EDK_SYSTEM_SHARED_BUFFER_DISPATCHER_H_ #define THIRD_PARTY_MOJO_SRC_MOJO_EDK_SYSTEM_SHARED_BUFFER_DISPATCHER_H_ +#include "mojo/public/cpp/system/macros.h" #include "third_party/mojo/src/mojo/edk/embedder/platform_shared_buffer.h" #include "third_party/mojo/src/mojo/edk/system/memory.h" #include "third_party/mojo/src/mojo/edk/system/simple_dispatcher.h" #include "third_party/mojo/src/mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { diff --git a/third_party/mojo/src/mojo/edk/system/shared_buffer_dispatcher_unittest.cc b/third_party/mojo/src/mojo/edk/system/shared_buffer_dispatcher_unittest.cc index 0b7912d9164799..b96393c69b2594 100644 --- a/third_party/mojo/src/mojo/edk/system/shared_buffer_dispatcher_unittest.cc +++ b/third_party/mojo/src/mojo/edk/system/shared_buffer_dispatcher_unittest.cc @@ -7,11 +7,11 @@ #include #include "base/memory/ref_counted.h" +#include "mojo/public/cpp/system/macros.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/mojo/src/mojo/edk/embedder/platform_shared_buffer.h" #include "third_party/mojo/src/mojo/edk/embedder/simple_platform_support.h" #include "third_party/mojo/src/mojo/edk/system/dispatcher.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace system { diff --git a/third_party/mojo/src/mojo/edk/system/simple_dispatcher.h b/third_party/mojo/src/mojo/edk/system/simple_dispatcher.h index 5efdf95531c3ae..2c790daea77939 100644 --- a/third_party/mojo/src/mojo/edk/system/simple_dispatcher.h +++ b/third_party/mojo/src/mojo/edk/system/simple_dispatcher.h @@ -7,10 +7,10 @@ #include +#include "mojo/public/cpp/system/macros.h" #include "third_party/mojo/src/mojo/edk/system/awakable_list.h" #include "third_party/mojo/src/mojo/edk/system/dispatcher.h" #include "third_party/mojo/src/mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace system { diff --git a/third_party/mojo/src/mojo/edk/system/simple_dispatcher_unittest.cc b/third_party/mojo/src/mojo/edk/system/simple_dispatcher_unittest.cc index d607637ec8462c..04d0df761bab9e 100644 --- a/third_party/mojo/src/mojo/edk/system/simple_dispatcher_unittest.cc +++ b/third_party/mojo/src/mojo/edk/system/simple_dispatcher_unittest.cc @@ -13,11 +13,11 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_vector.h" #include "base/synchronization/lock.h" +#include "mojo/public/cpp/system/macros.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/mojo/src/mojo/edk/system/test_utils.h" #include "third_party/mojo/src/mojo/edk/system/waiter.h" #include "third_party/mojo/src/mojo/edk/system/waiter_test_utils.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace system { diff --git a/third_party/mojo/src/mojo/edk/system/slave_connection_manager.h b/third_party/mojo/src/mojo/edk/system/slave_connection_manager.h index 366aee1b4533c7..610e02bdee951a 100644 --- a/third_party/mojo/src/mojo/edk/system/slave_connection_manager.h +++ b/third_party/mojo/src/mojo/edk/system/slave_connection_manager.h @@ -9,13 +9,13 @@ #include "base/memory/scoped_ptr.h" #include "base/synchronization/waitable_event.h" #include "base/threading/thread.h" +#include "mojo/public/cpp/system/macros.h" #include "third_party/mojo/src/mojo/edk/embedder/scoped_platform_handle.h" #include "third_party/mojo/src/mojo/edk/embedder/slave_process_delegate.h" #include "third_party/mojo/src/mojo/edk/system/connection_manager.h" #include "third_party/mojo/src/mojo/edk/system/mutex.h" #include "third_party/mojo/src/mojo/edk/system/raw_channel.h" #include "third_party/mojo/src/mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace base { class TaskRunner; diff --git a/third_party/mojo/src/mojo/edk/system/test_channel_endpoint_client.h b/third_party/mojo/src/mojo/edk/system/test_channel_endpoint_client.h index f47609ffb8d8d9..7ec9d0fdf4630e 100644 --- a/third_party/mojo/src/mojo/edk/system/test_channel_endpoint_client.h +++ b/third_party/mojo/src/mojo/edk/system/test_channel_endpoint_client.h @@ -7,11 +7,11 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" +#include "mojo/public/cpp/system/macros.h" #include "third_party/mojo/src/mojo/edk/system/channel_endpoint.h" #include "third_party/mojo/src/mojo/edk/system/channel_endpoint_client.h" #include "third_party/mojo/src/mojo/edk/system/message_in_transit_queue.h" #include "third_party/mojo/src/mojo/edk/system/mutex.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace base { class WaitableEvent; diff --git a/third_party/mojo/src/mojo/edk/system/test_utils.h b/third_party/mojo/src/mojo/edk/system/test_utils.h index 2eb44d199a1ed5..c821dc1d224052 100644 --- a/third_party/mojo/src/mojo/edk/system/test_utils.h +++ b/third_party/mojo/src/mojo/edk/system/test_utils.h @@ -6,8 +6,8 @@ #define THIRD_PARTY_MOJO_SRC_MOJO_EDK_SYSTEM_TEST_UTILS_H_ #include "base/time/time.h" -#include "third_party/mojo/src/mojo/public/c/system/types.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "mojo/public/c/system/types.h" +#include "mojo/public/cpp/system/macros.h" namespace mojo { namespace system { diff --git a/third_party/mojo/src/mojo/edk/system/thread_annotations_unittest.cc b/third_party/mojo/src/mojo/edk/system/thread_annotations_unittest.cc index 63cc8783b97e7c..7b0a4e567894f5 100644 --- a/third_party/mojo/src/mojo/edk/system/thread_annotations_unittest.cc +++ b/third_party/mojo/src/mojo/edk/system/thread_annotations_unittest.cc @@ -12,9 +12,9 @@ #include "third_party/mojo/src/mojo/edk/system/thread_annotations.h" +#include "mojo/public/cpp/system/macros.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/mojo/src/mojo/edk/system/mutex.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" // Uncomment these to enable particular compilation failure tests. // #define NC_GUARDED_BY diff --git a/third_party/mojo/src/mojo/edk/system/transport_data.h b/third_party/mojo/src/mojo/edk/system/transport_data.h index f9ed7314753a43..ea94139d7c53e4 100644 --- a/third_party/mojo/src/mojo/edk/system/transport_data.h +++ b/third_party/mojo/src/mojo/edk/system/transport_data.h @@ -12,11 +12,11 @@ #include "base/memory/aligned_memory.h" #include "base/memory/scoped_ptr.h" #include "build/build_config.h" +#include "mojo/public/cpp/system/macros.h" #include "third_party/mojo/src/mojo/edk/embedder/platform_handle.h" #include "third_party/mojo/src/mojo/edk/embedder/platform_handle_vector.h" #include "third_party/mojo/src/mojo/edk/system/dispatcher.h" #include "third_party/mojo/src/mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace system { diff --git a/third_party/mojo/src/mojo/edk/system/unique_identifier.h b/third_party/mojo/src/mojo/edk/system/unique_identifier.h index b8df347d6a7ad3..0991c386eb8e2c 100644 --- a/third_party/mojo/src/mojo/edk/system/unique_identifier.h +++ b/third_party/mojo/src/mojo/edk/system/unique_identifier.h @@ -11,8 +11,8 @@ #include #include "base/containers/hash_tables.h" +#include "mojo/public/cpp/system/macros.h" #include "third_party/mojo/src/mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace system { diff --git a/third_party/mojo/src/mojo/edk/system/unique_identifier_unittest.cc b/third_party/mojo/src/mojo/edk/system/unique_identifier_unittest.cc index 669f7b67bde50c..76f5db56561434 100644 --- a/third_party/mojo/src/mojo/edk/system/unique_identifier_unittest.cc +++ b/third_party/mojo/src/mojo/edk/system/unique_identifier_unittest.cc @@ -8,9 +8,9 @@ #include #include "base/containers/hash_tables.h" +#include "mojo/public/cpp/system/macros.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/mojo/src/mojo/edk/embedder/simple_platform_support.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace system { diff --git a/third_party/mojo/src/mojo/edk/system/waiter.h b/third_party/mojo/src/mojo/edk/system/waiter.h index f09d7bdc5e0539..adb94e915db061 100644 --- a/third_party/mojo/src/mojo/edk/system/waiter.h +++ b/third_party/mojo/src/mojo/edk/system/waiter.h @@ -9,10 +9,10 @@ #include "base/synchronization/condition_variable.h" #include "base/synchronization/lock.h" +#include "mojo/public/c/system/types.h" +#include "mojo/public/cpp/system/macros.h" #include "third_party/mojo/src/mojo/edk/system/awakable.h" #include "third_party/mojo/src/mojo/edk/system/system_impl_export.h" -#include "third_party/mojo/src/mojo/public/c/system/types.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace system { diff --git a/third_party/mojo/src/mojo/edk/system/waiter_test_utils.h b/third_party/mojo/src/mojo/edk/system/waiter_test_utils.h index a9e0f45f2450df..f00989369d8633 100644 --- a/third_party/mojo/src/mojo/edk/system/waiter_test_utils.h +++ b/third_party/mojo/src/mojo/edk/system/waiter_test_utils.h @@ -9,11 +9,11 @@ #include "base/memory/ref_counted.h" #include "base/threading/simple_thread.h" +#include "mojo/public/c/system/types.h" +#include "mojo/public/cpp/system/macros.h" #include "third_party/mojo/src/mojo/edk/system/dispatcher.h" #include "third_party/mojo/src/mojo/edk/system/handle_signals_state.h" #include "third_party/mojo/src/mojo/edk/system/waiter.h" -#include "third_party/mojo/src/mojo/public/c/system/types.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace system { diff --git a/third_party/mojo/src/mojo/edk/system/waiter_unittest.cc b/third_party/mojo/src/mojo/edk/system/waiter_unittest.cc index 15fb5e6d7ad31c..de0e66284938e8 100644 --- a/third_party/mojo/src/mojo/edk/system/waiter_unittest.cc +++ b/third_party/mojo/src/mojo/edk/system/waiter_unittest.cc @@ -12,10 +12,10 @@ #include #include "base/threading/simple_thread.h" +#include "mojo/public/cpp/system/macros.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/mojo/src/mojo/edk/system/mutex.h" #include "third_party/mojo/src/mojo/edk/system/test_utils.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace system { diff --git a/third_party/mojo/src/mojo/edk/test/BUILD.gn b/third_party/mojo/src/mojo/edk/test/BUILD.gn index bcbe65cb741b0d..73351a0ffba64f 100644 --- a/third_party/mojo/src/mojo/edk/test/BUILD.gn +++ b/third_party/mojo/src/mojo/edk/test/BUILD.gn @@ -3,7 +3,6 @@ # found in the LICENSE file. import("../mojo_edk.gni") -import("//mojo/public/mojo.gni") import("//testing/test.gni") mojo_edk_source_set("test_support") { @@ -96,59 +95,46 @@ group("public_tests") { ":mojo_public_system_unittests", ":mojo_public_utility_unittests", ] - - if (mojo_use_application_in_sdk) { - deps += [ ":mojo_public_application_unittests" ] - } -} - -if (mojo_use_application_in_sdk) { - test("mojo_public_application_unittests") { - deps = [ - ":run_all_unittests", - "../../public/cpp/application/tests", - ] - } } test("mojo_public_bindings_unittests") { deps = [ ":run_all_unittests", - "../../public/cpp/bindings/tests", + "//mojo/public/cpp/bindings/tests", ] } test("mojo_public_bindings_perftests") { deps = [ ":run_all_perftests", - "../../public/cpp/bindings/tests:perftests", + "//mojo/public/cpp/bindings/tests:perftests", ] } test("mojo_public_environment_unittests") { deps = [ ":run_all_unittests", - "../../public/cpp/environment/tests", + "//mojo/public/cpp/environment/tests", ] } test("mojo_public_system_perftests") { deps = [ ":run_all_perftests", - "../../public/c/system/tests:perftests", + "//mojo/public/c/system/tests:perftests", ] } test("mojo_public_system_unittests") { deps = [ ":run_all_unittests", - "../../public/cpp/system/tests", + "//mojo/public/cpp/system/tests", ] } test("mojo_public_utility_unittests") { deps = [ ":run_all_unittests", - "../../public/cpp/utility/tests", + "//mojo/public/cpp/utility/tests", ] } diff --git a/third_party/mojo/src/mojo/edk/test/multiprocess_test_helper.h b/third_party/mojo/src/mojo/edk/test/multiprocess_test_helper.h index c075860fb64bd6..c11d79b9111950 100644 --- a/third_party/mojo/src/mojo/edk/test/multiprocess_test_helper.h +++ b/third_party/mojo/src/mojo/edk/test/multiprocess_test_helper.h @@ -10,9 +10,9 @@ #include "base/process/process.h" #include "base/test/multiprocess_test.h" #include "base/test/test_timeouts.h" +#include "mojo/public/cpp/system/macros.h" #include "testing/multiprocess_func_list.h" #include "third_party/mojo/src/mojo/edk/embedder/scoped_platform_handle.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { diff --git a/third_party/mojo/src/mojo/edk/test/run_all_perftests.cc b/third_party/mojo/src/mojo/edk/test/run_all_perftests.cc index 7fef1f6ad98d06..41b5ab263ca74e 100644 --- a/third_party/mojo/src/mojo/edk/test/run_all_perftests.cc +++ b/third_party/mojo/src/mojo/edk/test/run_all_perftests.cc @@ -3,9 +3,9 @@ // found in the LICENSE file. #include "base/test/perf_test_suite.h" +#include "mojo/public/tests/test_support_private.h" #include "third_party/mojo/src/mojo/edk/embedder/embedder.h" #include "third_party/mojo/src/mojo/edk/test/test_support_impl.h" -#include "third_party/mojo/src/mojo/public/tests/test_support_private.h" int main(int argc, char** argv) { mojo::embedder::Init(); diff --git a/third_party/mojo/src/mojo/edk/test/run_all_unittests.cc b/third_party/mojo/src/mojo/edk/test/run_all_unittests.cc index 4b7d8f0876b676..278cfeff6230ed 100644 --- a/third_party/mojo/src/mojo/edk/test/run_all_unittests.cc +++ b/third_party/mojo/src/mojo/edk/test/run_all_unittests.cc @@ -7,10 +7,10 @@ #include "base/bind.h" #include "base/test/launcher/unit_test_launcher.h" #include "base/test/test_suite.h" +#include "mojo/public/tests/test_support_private.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/mojo/src/mojo/edk/embedder/embedder.h" #include "third_party/mojo/src/mojo/edk/test/test_support_impl.h" -#include "third_party/mojo/src/mojo/public/tests/test_support_private.h" int main(int argc, char** argv) { #if !defined(OS_ANDROID) diff --git a/third_party/mojo/src/mojo/edk/test/scoped_ipc_support.h b/third_party/mojo/src/mojo/edk/test/scoped_ipc_support.h index 24681059a86f66..c46accf8189548 100644 --- a/third_party/mojo/src/mojo/edk/test/scoped_ipc_support.h +++ b/third_party/mojo/src/mojo/edk/test/scoped_ipc_support.h @@ -9,12 +9,12 @@ #include "base/memory/ref_counted.h" #include "base/run_loop.h" #include "base/task_runner.h" +#include "mojo/public/cpp/system/macros.h" #include "third_party/mojo/src/mojo/edk/embedder/master_process_delegate.h" #include "third_party/mojo/src/mojo/edk/embedder/process_delegate.h" #include "third_party/mojo/src/mojo/edk/embedder/process_type.h" #include "third_party/mojo/src/mojo/edk/embedder/scoped_platform_handle.h" #include "third_party/mojo/src/mojo/edk/embedder/slave_process_delegate.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace test { diff --git a/third_party/mojo/src/mojo/edk/test/test_support_impl.h b/third_party/mojo/src/mojo/edk/test/test_support_impl.h index ecd48173d23f4a..3ab5170966bc2d 100644 --- a/third_party/mojo/src/mojo/edk/test/test_support_impl.h +++ b/third_party/mojo/src/mojo/edk/test/test_support_impl.h @@ -7,8 +7,8 @@ #include -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" -#include "third_party/mojo/src/mojo/public/tests/test_support_private.h" +#include "mojo/public/cpp/system/macros.h" +#include "mojo/public/tests/test_support_private.h" namespace mojo { namespace test { diff --git a/third_party/mojo/src/mojo/public/.gitignore b/third_party/mojo/src/mojo/public/.gitignore deleted file mode 100644 index 0d20b6487c61e7..00000000000000 --- a/third_party/mojo/src/mojo/public/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.pyc diff --git a/third_party/mojo/src/mojo/public/c/gpu/GLES2/gl2.h b/third_party/mojo/src/mojo/public/c/gpu/GLES2/gl2.h deleted file mode 100644 index 1bd43a94b54b8c..00000000000000 --- a/third_party/mojo/src/mojo/public/c/gpu/GLES2/gl2.h +++ /dev/null @@ -1,526 +0,0 @@ -#ifndef __gl2_h_ -#define __gl2_h_ 1 - -#ifdef __cplusplus -extern "C" { -#endif - -/* -** Copyright (c) 2013-2014 The Khronos Group Inc. -** -** Permission is hereby granted, free of charge, to any person obtaining a -** copy of this software and/or associated documentation files (the -** "Materials"), to deal in the Materials without restriction, including -** without limitation the rights to use, copy, modify, merge, publish, -** distribute, sublicense, and/or sell copies of the Materials, and to -** permit persons to whom the Materials are furnished to do so, subject to -** the following conditions: -** -** The above copyright notice and this permission notice shall be included -** in all copies or substantial portions of the Materials. -** -** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. -*/ -/* -** This header is generated from the Khronos OpenGL / OpenGL ES XML -** API Registry. The current version of the Registry, generator scripts -** used to make the header, and the header can be found at -** http://www.opengl.org/registry/ -** -** Khronos $Revision: 28366 $ on $Date: 2014-10-20 11:29:02 +0200 (Mon, 20 Oct 2014) $ -*/ - -#include -#include - -/* Generated on date 20141020 */ - -/* Generated C header for: - * API: gles2 - * Profile: common - * Versions considered: 2\.[0-9] - * Versions emitted: .* - * Default extensions included: None - * Additional extensions included: _nomatch_^ - * Extensions removed: _nomatch_^ - */ - -#ifndef GL_ES_VERSION_2_0 -#define GL_ES_VERSION_2_0 1 -#include -typedef khronos_int8_t GLbyte; -typedef khronos_float_t GLclampf; -typedef khronos_int32_t GLfixed; -typedef short GLshort; -typedef unsigned short GLushort; -typedef void GLvoid; -typedef struct __GLsync *GLsync; -typedef khronos_int64_t GLint64; -typedef khronos_uint64_t GLuint64; -typedef unsigned int GLenum; -typedef unsigned int GLuint; -typedef char GLchar; -typedef khronos_float_t GLfloat; -typedef khronos_ssize_t GLsizeiptr; -typedef khronos_intptr_t GLintptr; -typedef unsigned int GLbitfield; -typedef int GLint; -typedef unsigned char GLboolean; -typedef int GLsizei; -typedef khronos_uint8_t GLubyte; -#define GL_DEPTH_BUFFER_BIT 0x00000100 -#define GL_STENCIL_BUFFER_BIT 0x00000400 -#define GL_COLOR_BUFFER_BIT 0x00004000 -#define GL_FALSE 0 -#define GL_TRUE 1 -#define GL_POINTS 0x0000 -#define GL_LINES 0x0001 -#define GL_LINE_LOOP 0x0002 -#define GL_LINE_STRIP 0x0003 -#define GL_TRIANGLES 0x0004 -#define GL_TRIANGLE_STRIP 0x0005 -#define GL_TRIANGLE_FAN 0x0006 -#define GL_ZERO 0 -#define GL_ONE 1 -#define GL_SRC_COLOR 0x0300 -#define GL_ONE_MINUS_SRC_COLOR 0x0301 -#define GL_SRC_ALPHA 0x0302 -#define GL_ONE_MINUS_SRC_ALPHA 0x0303 -#define GL_DST_ALPHA 0x0304 -#define GL_ONE_MINUS_DST_ALPHA 0x0305 -#define GL_DST_COLOR 0x0306 -#define GL_ONE_MINUS_DST_COLOR 0x0307 -#define GL_SRC_ALPHA_SATURATE 0x0308 -#define GL_FUNC_ADD 0x8006 -#define GL_BLEND_EQUATION 0x8009 -#define GL_BLEND_EQUATION_RGB 0x8009 -#define GL_BLEND_EQUATION_ALPHA 0x883D -#define GL_FUNC_SUBTRACT 0x800A -#define GL_FUNC_REVERSE_SUBTRACT 0x800B -#define GL_BLEND_DST_RGB 0x80C8 -#define GL_BLEND_SRC_RGB 0x80C9 -#define GL_BLEND_DST_ALPHA 0x80CA -#define GL_BLEND_SRC_ALPHA 0x80CB -#define GL_CONSTANT_COLOR 0x8001 -#define GL_ONE_MINUS_CONSTANT_COLOR 0x8002 -#define GL_CONSTANT_ALPHA 0x8003 -#define GL_ONE_MINUS_CONSTANT_ALPHA 0x8004 -#define GL_BLEND_COLOR 0x8005 -#define GL_ARRAY_BUFFER 0x8892 -#define GL_ELEMENT_ARRAY_BUFFER 0x8893 -#define GL_ARRAY_BUFFER_BINDING 0x8894 -#define GL_ELEMENT_ARRAY_BUFFER_BINDING 0x8895 -#define GL_STREAM_DRAW 0x88E0 -#define GL_STATIC_DRAW 0x88E4 -#define GL_DYNAMIC_DRAW 0x88E8 -#define GL_BUFFER_SIZE 0x8764 -#define GL_BUFFER_USAGE 0x8765 -#define GL_CURRENT_VERTEX_ATTRIB 0x8626 -#define GL_FRONT 0x0404 -#define GL_BACK 0x0405 -#define GL_FRONT_AND_BACK 0x0408 -#define GL_TEXTURE_2D 0x0DE1 -#define GL_CULL_FACE 0x0B44 -#define GL_BLEND 0x0BE2 -#define GL_DITHER 0x0BD0 -#define GL_STENCIL_TEST 0x0B90 -#define GL_DEPTH_TEST 0x0B71 -#define GL_SCISSOR_TEST 0x0C11 -#define GL_POLYGON_OFFSET_FILL 0x8037 -#define GL_SAMPLE_ALPHA_TO_COVERAGE 0x809E -#define GL_SAMPLE_COVERAGE 0x80A0 -#define GL_NO_ERROR 0 -#define GL_INVALID_ENUM 0x0500 -#define GL_INVALID_VALUE 0x0501 -#define GL_INVALID_OPERATION 0x0502 -#define GL_OUT_OF_MEMORY 0x0505 -#define GL_CW 0x0900 -#define GL_CCW 0x0901 -#define GL_LINE_WIDTH 0x0B21 -#define GL_ALIASED_POINT_SIZE_RANGE 0x846D -#define GL_ALIASED_LINE_WIDTH_RANGE 0x846E -#define GL_CULL_FACE_MODE 0x0B45 -#define GL_FRONT_FACE 0x0B46 -#define GL_DEPTH_RANGE 0x0B70 -#define GL_DEPTH_WRITEMASK 0x0B72 -#define GL_DEPTH_CLEAR_VALUE 0x0B73 -#define GL_DEPTH_FUNC 0x0B74 -#define GL_STENCIL_CLEAR_VALUE 0x0B91 -#define GL_STENCIL_FUNC 0x0B92 -#define GL_STENCIL_FAIL 0x0B94 -#define GL_STENCIL_PASS_DEPTH_FAIL 0x0B95 -#define GL_STENCIL_PASS_DEPTH_PASS 0x0B96 -#define GL_STENCIL_REF 0x0B97 -#define GL_STENCIL_VALUE_MASK 0x0B93 -#define GL_STENCIL_WRITEMASK 0x0B98 -#define GL_STENCIL_BACK_FUNC 0x8800 -#define GL_STENCIL_BACK_FAIL 0x8801 -#define GL_STENCIL_BACK_PASS_DEPTH_FAIL 0x8802 -#define GL_STENCIL_BACK_PASS_DEPTH_PASS 0x8803 -#define GL_STENCIL_BACK_REF 0x8CA3 -#define GL_STENCIL_BACK_VALUE_MASK 0x8CA4 -#define GL_STENCIL_BACK_WRITEMASK 0x8CA5 -#define GL_VIEWPORT 0x0BA2 -#define GL_SCISSOR_BOX 0x0C10 -#define GL_COLOR_CLEAR_VALUE 0x0C22 -#define GL_COLOR_WRITEMASK 0x0C23 -#define GL_UNPACK_ALIGNMENT 0x0CF5 -#define GL_PACK_ALIGNMENT 0x0D05 -#define GL_MAX_TEXTURE_SIZE 0x0D33 -#define GL_MAX_VIEWPORT_DIMS 0x0D3A -#define GL_SUBPIXEL_BITS 0x0D50 -#define GL_RED_BITS 0x0D52 -#define GL_GREEN_BITS 0x0D53 -#define GL_BLUE_BITS 0x0D54 -#define GL_ALPHA_BITS 0x0D55 -#define GL_DEPTH_BITS 0x0D56 -#define GL_STENCIL_BITS 0x0D57 -#define GL_POLYGON_OFFSET_UNITS 0x2A00 -#define GL_POLYGON_OFFSET_FACTOR 0x8038 -#define GL_TEXTURE_BINDING_2D 0x8069 -#define GL_SAMPLE_BUFFERS 0x80A8 -#define GL_SAMPLES 0x80A9 -#define GL_SAMPLE_COVERAGE_VALUE 0x80AA -#define GL_SAMPLE_COVERAGE_INVERT 0x80AB -#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2 -#define GL_COMPRESSED_TEXTURE_FORMATS 0x86A3 -#define GL_DONT_CARE 0x1100 -#define GL_FASTEST 0x1101 -#define GL_NICEST 0x1102 -#define GL_GENERATE_MIPMAP_HINT 0x8192 -#define GL_BYTE 0x1400 -#define GL_UNSIGNED_BYTE 0x1401 -#define GL_SHORT 0x1402 -#define GL_UNSIGNED_SHORT 0x1403 -#define GL_INT 0x1404 -#define GL_UNSIGNED_INT 0x1405 -#define GL_FLOAT 0x1406 -#define GL_FIXED 0x140C -#define GL_DEPTH_COMPONENT 0x1902 -#define GL_ALPHA 0x1906 -#define GL_RGB 0x1907 -#define GL_RGBA 0x1908 -#define GL_LUMINANCE 0x1909 -#define GL_LUMINANCE_ALPHA 0x190A -#define GL_UNSIGNED_SHORT_4_4_4_4 0x8033 -#define GL_UNSIGNED_SHORT_5_5_5_1 0x8034 -#define GL_UNSIGNED_SHORT_5_6_5 0x8363 -#define GL_FRAGMENT_SHADER 0x8B30 -#define GL_VERTEX_SHADER 0x8B31 -#define GL_MAX_VERTEX_ATTRIBS 0x8869 -#define GL_MAX_VERTEX_UNIFORM_VECTORS 0x8DFB -#define GL_MAX_VARYING_VECTORS 0x8DFC -#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x8B4D -#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS 0x8B4C -#define GL_MAX_TEXTURE_IMAGE_UNITS 0x8872 -#define GL_MAX_FRAGMENT_UNIFORM_VECTORS 0x8DFD -#define GL_SHADER_TYPE 0x8B4F -#define GL_DELETE_STATUS 0x8B80 -#define GL_LINK_STATUS 0x8B82 -#define GL_VALIDATE_STATUS 0x8B83 -#define GL_ATTACHED_SHADERS 0x8B85 -#define GL_ACTIVE_UNIFORMS 0x8B86 -#define GL_ACTIVE_UNIFORM_MAX_LENGTH 0x8B87 -#define GL_ACTIVE_ATTRIBUTES 0x8B89 -#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH 0x8B8A -#define GL_SHADING_LANGUAGE_VERSION 0x8B8C -#define GL_CURRENT_PROGRAM 0x8B8D -#define GL_NEVER 0x0200 -#define GL_LESS 0x0201 -#define GL_EQUAL 0x0202 -#define GL_LEQUAL 0x0203 -#define GL_GREATER 0x0204 -#define GL_NOTEQUAL 0x0205 -#define GL_GEQUAL 0x0206 -#define GL_ALWAYS 0x0207 -#define GL_KEEP 0x1E00 -#define GL_REPLACE 0x1E01 -#define GL_INCR 0x1E02 -#define GL_DECR 0x1E03 -#define GL_INVERT 0x150A -#define GL_INCR_WRAP 0x8507 -#define GL_DECR_WRAP 0x8508 -#define GL_VENDOR 0x1F00 -#define GL_RENDERER 0x1F01 -#define GL_VERSION 0x1F02 -#define GL_EXTENSIONS 0x1F03 -#define GL_NEAREST 0x2600 -#define GL_LINEAR 0x2601 -#define GL_NEAREST_MIPMAP_NEAREST 0x2700 -#define GL_LINEAR_MIPMAP_NEAREST 0x2701 -#define GL_NEAREST_MIPMAP_LINEAR 0x2702 -#define GL_LINEAR_MIPMAP_LINEAR 0x2703 -#define GL_TEXTURE_MAG_FILTER 0x2800 -#define GL_TEXTURE_MIN_FILTER 0x2801 -#define GL_TEXTURE_WRAP_S 0x2802 -#define GL_TEXTURE_WRAP_T 0x2803 -#define GL_TEXTURE 0x1702 -#define GL_TEXTURE_CUBE_MAP 0x8513 -#define GL_TEXTURE_BINDING_CUBE_MAP 0x8514 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_X 0x8515 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X 0x8516 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y 0x8517 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y 0x8518 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z 0x8519 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z 0x851A -#define GL_MAX_CUBE_MAP_TEXTURE_SIZE 0x851C -#define GL_TEXTURE0 0x84C0 -#define GL_TEXTURE1 0x84C1 -#define GL_TEXTURE2 0x84C2 -#define GL_TEXTURE3 0x84C3 -#define GL_TEXTURE4 0x84C4 -#define GL_TEXTURE5 0x84C5 -#define GL_TEXTURE6 0x84C6 -#define GL_TEXTURE7 0x84C7 -#define GL_TEXTURE8 0x84C8 -#define GL_TEXTURE9 0x84C9 -#define GL_TEXTURE10 0x84CA -#define GL_TEXTURE11 0x84CB -#define GL_TEXTURE12 0x84CC -#define GL_TEXTURE13 0x84CD -#define GL_TEXTURE14 0x84CE -#define GL_TEXTURE15 0x84CF -#define GL_TEXTURE16 0x84D0 -#define GL_TEXTURE17 0x84D1 -#define GL_TEXTURE18 0x84D2 -#define GL_TEXTURE19 0x84D3 -#define GL_TEXTURE20 0x84D4 -#define GL_TEXTURE21 0x84D5 -#define GL_TEXTURE22 0x84D6 -#define GL_TEXTURE23 0x84D7 -#define GL_TEXTURE24 0x84D8 -#define GL_TEXTURE25 0x84D9 -#define GL_TEXTURE26 0x84DA -#define GL_TEXTURE27 0x84DB -#define GL_TEXTURE28 0x84DC -#define GL_TEXTURE29 0x84DD -#define GL_TEXTURE30 0x84DE -#define GL_TEXTURE31 0x84DF -#define GL_ACTIVE_TEXTURE 0x84E0 -#define GL_REPEAT 0x2901 -#define GL_CLAMP_TO_EDGE 0x812F -#define GL_MIRRORED_REPEAT 0x8370 -#define GL_FLOAT_VEC2 0x8B50 -#define GL_FLOAT_VEC3 0x8B51 -#define GL_FLOAT_VEC4 0x8B52 -#define GL_INT_VEC2 0x8B53 -#define GL_INT_VEC3 0x8B54 -#define GL_INT_VEC4 0x8B55 -#define GL_BOOL 0x8B56 -#define GL_BOOL_VEC2 0x8B57 -#define GL_BOOL_VEC3 0x8B58 -#define GL_BOOL_VEC4 0x8B59 -#define GL_FLOAT_MAT2 0x8B5A -#define GL_FLOAT_MAT3 0x8B5B -#define GL_FLOAT_MAT4 0x8B5C -#define GL_SAMPLER_2D 0x8B5E -#define GL_SAMPLER_CUBE 0x8B60 -#define GL_VERTEX_ATTRIB_ARRAY_ENABLED 0x8622 -#define GL_VERTEX_ATTRIB_ARRAY_SIZE 0x8623 -#define GL_VERTEX_ATTRIB_ARRAY_STRIDE 0x8624 -#define GL_VERTEX_ATTRIB_ARRAY_TYPE 0x8625 -#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED 0x886A -#define GL_VERTEX_ATTRIB_ARRAY_POINTER 0x8645 -#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 0x889F -#define GL_IMPLEMENTATION_COLOR_READ_TYPE 0x8B9A -#define GL_IMPLEMENTATION_COLOR_READ_FORMAT 0x8B9B -#define GL_COMPILE_STATUS 0x8B81 -#define GL_INFO_LOG_LENGTH 0x8B84 -#define GL_SHADER_SOURCE_LENGTH 0x8B88 -#define GL_SHADER_COMPILER 0x8DFA -#define GL_SHADER_BINARY_FORMATS 0x8DF8 -#define GL_NUM_SHADER_BINARY_FORMATS 0x8DF9 -#define GL_LOW_FLOAT 0x8DF0 -#define GL_MEDIUM_FLOAT 0x8DF1 -#define GL_HIGH_FLOAT 0x8DF2 -#define GL_LOW_INT 0x8DF3 -#define GL_MEDIUM_INT 0x8DF4 -#define GL_HIGH_INT 0x8DF5 -#define GL_FRAMEBUFFER 0x8D40 -#define GL_RENDERBUFFER 0x8D41 -#define GL_RGBA4 0x8056 -#define GL_RGB5_A1 0x8057 -#define GL_RGB565 0x8D62 -#define GL_DEPTH_COMPONENT16 0x81A5 -#define GL_STENCIL_INDEX8 0x8D48 -#define GL_RENDERBUFFER_WIDTH 0x8D42 -#define GL_RENDERBUFFER_HEIGHT 0x8D43 -#define GL_RENDERBUFFER_INTERNAL_FORMAT 0x8D44 -#define GL_RENDERBUFFER_RED_SIZE 0x8D50 -#define GL_RENDERBUFFER_GREEN_SIZE 0x8D51 -#define GL_RENDERBUFFER_BLUE_SIZE 0x8D52 -#define GL_RENDERBUFFER_ALPHA_SIZE 0x8D53 -#define GL_RENDERBUFFER_DEPTH_SIZE 0x8D54 -#define GL_RENDERBUFFER_STENCIL_SIZE 0x8D55 -#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE 0x8CD0 -#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME 0x8CD1 -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL 0x8CD2 -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE 0x8CD3 -#define GL_COLOR_ATTACHMENT0 0x8CE0 -#define GL_DEPTH_ATTACHMENT 0x8D00 -#define GL_STENCIL_ATTACHMENT 0x8D20 -#define GL_NONE 0 -#define GL_FRAMEBUFFER_COMPLETE 0x8CD5 -#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT 0x8CD6 -#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT 0x8CD7 -#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS 0x8CD9 -#define GL_FRAMEBUFFER_UNSUPPORTED 0x8CDD -#define GL_FRAMEBUFFER_BINDING 0x8CA6 -#define GL_RENDERBUFFER_BINDING 0x8CA7 -#define GL_MAX_RENDERBUFFER_SIZE 0x84E8 -#define GL_INVALID_FRAMEBUFFER_OPERATION 0x0506 -GL_APICALL void GL_APIENTRY glActiveTexture (GLenum texture); -GL_APICALL void GL_APIENTRY glAttachShader (GLuint program, GLuint shader); -GL_APICALL void GL_APIENTRY glBindAttribLocation (GLuint program, GLuint index, const GLchar *name); -GL_APICALL void GL_APIENTRY glBindBuffer (GLenum target, GLuint buffer); -GL_APICALL void GL_APIENTRY glBindFramebuffer (GLenum target, GLuint framebuffer); -GL_APICALL void GL_APIENTRY glBindRenderbuffer (GLenum target, GLuint renderbuffer); -GL_APICALL void GL_APIENTRY glBindTexture (GLenum target, GLuint texture); -GL_APICALL void GL_APIENTRY glBlendColor (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha); -GL_APICALL void GL_APIENTRY glBlendEquation (GLenum mode); -GL_APICALL void GL_APIENTRY glBlendEquationSeparate (GLenum modeRGB, GLenum modeAlpha); -GL_APICALL void GL_APIENTRY glBlendFunc (GLenum sfactor, GLenum dfactor); -GL_APICALL void GL_APIENTRY glBlendFuncSeparate (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); -GL_APICALL void GL_APIENTRY glBufferData (GLenum target, GLsizeiptr size, const void *data, GLenum usage); -GL_APICALL void GL_APIENTRY glBufferSubData (GLenum target, GLintptr offset, GLsizeiptr size, const void *data); -GL_APICALL GLenum GL_APIENTRY glCheckFramebufferStatus (GLenum target); -GL_APICALL void GL_APIENTRY glClear (GLbitfield mask); -GL_APICALL void GL_APIENTRY glClearColor (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha); -GL_APICALL void GL_APIENTRY glClearDepthf (GLfloat d); -GL_APICALL void GL_APIENTRY glClearStencil (GLint s); -GL_APICALL void GL_APIENTRY glColorMask (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha); -GL_APICALL void GL_APIENTRY glCompileShader (GLuint shader); -GL_APICALL void GL_APIENTRY glCompressedTexImage2D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *data); -GL_APICALL void GL_APIENTRY glCompressedTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data); -GL_APICALL void GL_APIENTRY glCopyTexImage2D (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border); -GL_APICALL void GL_APIENTRY glCopyTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height); -GL_APICALL GLuint GL_APIENTRY glCreateProgram (void); -GL_APICALL GLuint GL_APIENTRY glCreateShader (GLenum type); -GL_APICALL void GL_APIENTRY glCullFace (GLenum mode); -GL_APICALL void GL_APIENTRY glDeleteBuffers (GLsizei n, const GLuint *buffers); -GL_APICALL void GL_APIENTRY glDeleteFramebuffers (GLsizei n, const GLuint *framebuffers); -GL_APICALL void GL_APIENTRY glDeleteProgram (GLuint program); -GL_APICALL void GL_APIENTRY glDeleteRenderbuffers (GLsizei n, const GLuint *renderbuffers); -GL_APICALL void GL_APIENTRY glDeleteShader (GLuint shader); -GL_APICALL void GL_APIENTRY glDeleteTextures (GLsizei n, const GLuint *textures); -GL_APICALL void GL_APIENTRY glDepthFunc (GLenum func); -GL_APICALL void GL_APIENTRY glDepthMask (GLboolean flag); -GL_APICALL void GL_APIENTRY glDepthRangef (GLfloat n, GLfloat f); -GL_APICALL void GL_APIENTRY glDetachShader (GLuint program, GLuint shader); -GL_APICALL void GL_APIENTRY glDisable (GLenum cap); -GL_APICALL void GL_APIENTRY glDisableVertexAttribArray (GLuint index); -GL_APICALL void GL_APIENTRY glDrawArrays (GLenum mode, GLint first, GLsizei count); -GL_APICALL void GL_APIENTRY glDrawElements (GLenum mode, GLsizei count, GLenum type, const void *indices); -GL_APICALL void GL_APIENTRY glEnable (GLenum cap); -GL_APICALL void GL_APIENTRY glEnableVertexAttribArray (GLuint index); -GL_APICALL void GL_APIENTRY glFinish (void); -GL_APICALL void GL_APIENTRY glFlush (void); -GL_APICALL void GL_APIENTRY glFramebufferRenderbuffer (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); -GL_APICALL void GL_APIENTRY glFramebufferTexture2D (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); -GL_APICALL void GL_APIENTRY glFrontFace (GLenum mode); -GL_APICALL void GL_APIENTRY glGenBuffers (GLsizei n, GLuint *buffers); -GL_APICALL void GL_APIENTRY glGenerateMipmap (GLenum target); -GL_APICALL void GL_APIENTRY glGenFramebuffers (GLsizei n, GLuint *framebuffers); -GL_APICALL void GL_APIENTRY glGenRenderbuffers (GLsizei n, GLuint *renderbuffers); -GL_APICALL void GL_APIENTRY glGenTextures (GLsizei n, GLuint *textures); -GL_APICALL void GL_APIENTRY glGetActiveAttrib (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name); -GL_APICALL void GL_APIENTRY glGetActiveUniform (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name); -GL_APICALL void GL_APIENTRY glGetAttachedShaders (GLuint program, GLsizei maxCount, GLsizei *count, GLuint *shaders); -GL_APICALL GLint GL_APIENTRY glGetAttribLocation (GLuint program, const GLchar *name); -GL_APICALL void GL_APIENTRY glGetBooleanv (GLenum pname, GLboolean *data); -GL_APICALL void GL_APIENTRY glGetBufferParameteriv (GLenum target, GLenum pname, GLint *params); -GL_APICALL GLenum GL_APIENTRY glGetError (void); -GL_APICALL void GL_APIENTRY glGetFloatv (GLenum pname, GLfloat *data); -GL_APICALL void GL_APIENTRY glGetFramebufferAttachmentParameteriv (GLenum target, GLenum attachment, GLenum pname, GLint *params); -GL_APICALL void GL_APIENTRY glGetIntegerv (GLenum pname, GLint *data); -GL_APICALL void GL_APIENTRY glGetProgramiv (GLuint program, GLenum pname, GLint *params); -GL_APICALL void GL_APIENTRY glGetProgramInfoLog (GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog); -GL_APICALL void GL_APIENTRY glGetRenderbufferParameteriv (GLenum target, GLenum pname, GLint *params); -GL_APICALL void GL_APIENTRY glGetShaderiv (GLuint shader, GLenum pname, GLint *params); -GL_APICALL void GL_APIENTRY glGetShaderInfoLog (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog); -GL_APICALL void GL_APIENTRY glGetShaderPrecisionFormat (GLenum shadertype, GLenum precisiontype, GLint *range, GLint *precision); -GL_APICALL void GL_APIENTRY glGetShaderSource (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source); -GL_APICALL const GLubyte *GL_APIENTRY glGetString (GLenum name); -GL_APICALL void GL_APIENTRY glGetTexParameterfv (GLenum target, GLenum pname, GLfloat *params); -GL_APICALL void GL_APIENTRY glGetTexParameteriv (GLenum target, GLenum pname, GLint *params); -GL_APICALL void GL_APIENTRY glGetUniformfv (GLuint program, GLint location, GLfloat *params); -GL_APICALL void GL_APIENTRY glGetUniformiv (GLuint program, GLint location, GLint *params); -GL_APICALL GLint GL_APIENTRY glGetUniformLocation (GLuint program, const GLchar *name); -GL_APICALL void GL_APIENTRY glGetVertexAttribfv (GLuint index, GLenum pname, GLfloat *params); -GL_APICALL void GL_APIENTRY glGetVertexAttribiv (GLuint index, GLenum pname, GLint *params); -GL_APICALL void GL_APIENTRY glGetVertexAttribPointerv (GLuint index, GLenum pname, void **pointer); -GL_APICALL void GL_APIENTRY glHint (GLenum target, GLenum mode); -GL_APICALL GLboolean GL_APIENTRY glIsBuffer (GLuint buffer); -GL_APICALL GLboolean GL_APIENTRY glIsEnabled (GLenum cap); -GL_APICALL GLboolean GL_APIENTRY glIsFramebuffer (GLuint framebuffer); -GL_APICALL GLboolean GL_APIENTRY glIsProgram (GLuint program); -GL_APICALL GLboolean GL_APIENTRY glIsRenderbuffer (GLuint renderbuffer); -GL_APICALL GLboolean GL_APIENTRY glIsShader (GLuint shader); -GL_APICALL GLboolean GL_APIENTRY glIsTexture (GLuint texture); -GL_APICALL void GL_APIENTRY glLineWidth (GLfloat width); -GL_APICALL void GL_APIENTRY glLinkProgram (GLuint program); -GL_APICALL void GL_APIENTRY glPixelStorei (GLenum pname, GLint param); -GL_APICALL void GL_APIENTRY glPolygonOffset (GLfloat factor, GLfloat units); -GL_APICALL void GL_APIENTRY glReadPixels (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, void *pixels); -GL_APICALL void GL_APIENTRY glReleaseShaderCompiler (void); -GL_APICALL void GL_APIENTRY glRenderbufferStorage (GLenum target, GLenum internalformat, GLsizei width, GLsizei height); -GL_APICALL void GL_APIENTRY glSampleCoverage (GLfloat value, GLboolean invert); -GL_APICALL void GL_APIENTRY glScissor (GLint x, GLint y, GLsizei width, GLsizei height); -GL_APICALL void GL_APIENTRY glShaderBinary (GLsizei count, const GLuint *shaders, GLenum binaryformat, const void *binary, GLsizei length); -GL_APICALL void GL_APIENTRY glShaderSource (GLuint shader, GLsizei count, const GLchar *const*string, const GLint *length); -GL_APICALL void GL_APIENTRY glStencilFunc (GLenum func, GLint ref, GLuint mask); -GL_APICALL void GL_APIENTRY glStencilFuncSeparate (GLenum face, GLenum func, GLint ref, GLuint mask); -GL_APICALL void GL_APIENTRY glStencilMask (GLuint mask); -GL_APICALL void GL_APIENTRY glStencilMaskSeparate (GLenum face, GLuint mask); -GL_APICALL void GL_APIENTRY glStencilOp (GLenum fail, GLenum zfail, GLenum zpass); -GL_APICALL void GL_APIENTRY glStencilOpSeparate (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass); -GL_APICALL void GL_APIENTRY glTexImage2D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void *pixels); -GL_APICALL void GL_APIENTRY glTexParameterf (GLenum target, GLenum pname, GLfloat param); -GL_APICALL void GL_APIENTRY glTexParameterfv (GLenum target, GLenum pname, const GLfloat *params); -GL_APICALL void GL_APIENTRY glTexParameteri (GLenum target, GLenum pname, GLint param); -GL_APICALL void GL_APIENTRY glTexParameteriv (GLenum target, GLenum pname, const GLint *params); -GL_APICALL void GL_APIENTRY glTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels); -GL_APICALL void GL_APIENTRY glUniform1f (GLint location, GLfloat v0); -GL_APICALL void GL_APIENTRY glUniform1fv (GLint location, GLsizei count, const GLfloat *value); -GL_APICALL void GL_APIENTRY glUniform1i (GLint location, GLint v0); -GL_APICALL void GL_APIENTRY glUniform1iv (GLint location, GLsizei count, const GLint *value); -GL_APICALL void GL_APIENTRY glUniform2f (GLint location, GLfloat v0, GLfloat v1); -GL_APICALL void GL_APIENTRY glUniform2fv (GLint location, GLsizei count, const GLfloat *value); -GL_APICALL void GL_APIENTRY glUniform2i (GLint location, GLint v0, GLint v1); -GL_APICALL void GL_APIENTRY glUniform2iv (GLint location, GLsizei count, const GLint *value); -GL_APICALL void GL_APIENTRY glUniform3f (GLint location, GLfloat v0, GLfloat v1, GLfloat v2); -GL_APICALL void GL_APIENTRY glUniform3fv (GLint location, GLsizei count, const GLfloat *value); -GL_APICALL void GL_APIENTRY glUniform3i (GLint location, GLint v0, GLint v1, GLint v2); -GL_APICALL void GL_APIENTRY glUniform3iv (GLint location, GLsizei count, const GLint *value); -GL_APICALL void GL_APIENTRY glUniform4f (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3); -GL_APICALL void GL_APIENTRY glUniform4fv (GLint location, GLsizei count, const GLfloat *value); -GL_APICALL void GL_APIENTRY glUniform4i (GLint location, GLint v0, GLint v1, GLint v2, GLint v3); -GL_APICALL void GL_APIENTRY glUniform4iv (GLint location, GLsizei count, const GLint *value); -GL_APICALL void GL_APIENTRY glUniformMatrix2fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GL_APICALL void GL_APIENTRY glUniformMatrix3fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GL_APICALL void GL_APIENTRY glUniformMatrix4fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GL_APICALL void GL_APIENTRY glUseProgram (GLuint program); -GL_APICALL void GL_APIENTRY glValidateProgram (GLuint program); -GL_APICALL void GL_APIENTRY glVertexAttrib1f (GLuint index, GLfloat x); -GL_APICALL void GL_APIENTRY glVertexAttrib1fv (GLuint index, const GLfloat *v); -GL_APICALL void GL_APIENTRY glVertexAttrib2f (GLuint index, GLfloat x, GLfloat y); -GL_APICALL void GL_APIENTRY glVertexAttrib2fv (GLuint index, const GLfloat *v); -GL_APICALL void GL_APIENTRY glVertexAttrib3f (GLuint index, GLfloat x, GLfloat y, GLfloat z); -GL_APICALL void GL_APIENTRY glVertexAttrib3fv (GLuint index, const GLfloat *v); -GL_APICALL void GL_APIENTRY glVertexAttrib4f (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -GL_APICALL void GL_APIENTRY glVertexAttrib4fv (GLuint index, const GLfloat *v); -GL_APICALL void GL_APIENTRY glVertexAttribPointer (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void *pointer); -GL_APICALL void GL_APIENTRY glViewport (GLint x, GLint y, GLsizei width, GLsizei height); -#endif /* GL_ES_VERSION_2_0 */ - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/third_party/mojo/src/mojo/public/c/gpu/GLES2/gl2ext.h b/third_party/mojo/src/mojo/public/c/gpu/GLES2/gl2ext.h deleted file mode 100644 index a3efa82cfd53d5..00000000000000 --- a/third_party/mojo/src/mojo/public/c/gpu/GLES2/gl2ext.h +++ /dev/null @@ -1,2026 +0,0 @@ -#ifndef __gl2ext_h_ -#define __gl2ext_h_ 1 - -#ifdef __cplusplus -extern "C" { -#endif - -/* -** Copyright (c) 2013-2014 The Khronos Group Inc. -** -** Permission is hereby granted, free of charge, to any person obtaining a -** copy of this software and/or associated documentation files (the -** "Materials"), to deal in the Materials without restriction, including -** without limitation the rights to use, copy, modify, merge, publish, -** distribute, sublicense, and/or sell copies of the Materials, and to -** permit persons to whom the Materials are furnished to do so, subject to -** the following conditions: -** -** The above copyright notice and this permission notice shall be included -** in all copies or substantial portions of the Materials. -** -** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. -*/ -/* -** This header is generated from the Khronos OpenGL / OpenGL ES XML -** API Registry. The current version of the Registry, generator scripts -** used to make the header, and the header can be found at -** http://www.opengl.org/registry/ -** -** Khronos $Revision: 28366 $ on $Date: 2014-10-20 11:29:02 +0200 (Mon, 20 Oct 2014) $ -*/ - -#ifndef GL_APIENTRYP -#define GL_APIENTRYP GL_APIENTRY* -#endif - -/* Generated on date 20141020 */ - -/* Generated C header for: - * API: gles2 - * Profile: common - * Versions considered: 2\.[0-9] - * Versions emitted: _nomatch_^ - * Default extensions included: gles2 - * Additional extensions included: _nomatch_^ - * Extensions removed: _nomatch_^ - */ - -#ifndef GL_KHR_blend_equation_advanced -#define GL_KHR_blend_equation_advanced 1 -#define GL_MULTIPLY_KHR 0x9294 -#define GL_SCREEN_KHR 0x9295 -#define GL_OVERLAY_KHR 0x9296 -#define GL_DARKEN_KHR 0x9297 -#define GL_LIGHTEN_KHR 0x9298 -#define GL_COLORDODGE_KHR 0x9299 -#define GL_COLORBURN_KHR 0x929A -#define GL_HARDLIGHT_KHR 0x929B -#define GL_SOFTLIGHT_KHR 0x929C -#define GL_DIFFERENCE_KHR 0x929E -#define GL_EXCLUSION_KHR 0x92A0 -#define GL_HSL_HUE_KHR 0x92AD -#define GL_HSL_SATURATION_KHR 0x92AE -#define GL_HSL_COLOR_KHR 0x92AF -#define GL_HSL_LUMINOSITY_KHR 0x92B0 -typedef void (GL_APIENTRYP PFNGLBLENDBARRIERKHRPROC) (void); -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glBlendBarrierKHR (void); -#endif -#endif /* GL_KHR_blend_equation_advanced */ - -#ifndef GL_KHR_blend_equation_advanced_coherent -#define GL_KHR_blend_equation_advanced_coherent 1 -#define GL_BLEND_ADVANCED_COHERENT_KHR 0x9285 -#endif /* GL_KHR_blend_equation_advanced_coherent */ - -#ifndef GL_KHR_context_flush_control -#define GL_KHR_context_flush_control 1 -#define GL_CONTEXT_RELEASE_BEHAVIOR_KHR 0x82FB -#define GL_CONTEXT_RELEASE_BEHAVIOR_FLUSH_KHR 0x82FC -#endif /* GL_KHR_context_flush_control */ - -#ifndef GL_KHR_debug -#define GL_KHR_debug 1 -typedef void (GL_APIENTRY *GLDEBUGPROCKHR)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,void *userParam); -//#define GL_SAMPLER 0x82E6 -#define GL_DEBUG_OUTPUT_SYNCHRONOUS_KHR 0x8242 -#define GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH_KHR 0x8243 -#define GL_DEBUG_CALLBACK_FUNCTION_KHR 0x8244 -#define GL_DEBUG_CALLBACK_USER_PARAM_KHR 0x8245 -#define GL_DEBUG_SOURCE_API_KHR 0x8246 -#define GL_DEBUG_SOURCE_WINDOW_SYSTEM_KHR 0x8247 -#define GL_DEBUG_SOURCE_SHADER_COMPILER_KHR 0x8248 -#define GL_DEBUG_SOURCE_THIRD_PARTY_KHR 0x8249 -#define GL_DEBUG_SOURCE_APPLICATION_KHR 0x824A -#define GL_DEBUG_SOURCE_OTHER_KHR 0x824B -#define GL_DEBUG_TYPE_ERROR_KHR 0x824C -#define GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR_KHR 0x824D -#define GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR_KHR 0x824E -#define GL_DEBUG_TYPE_PORTABILITY_KHR 0x824F -#define GL_DEBUG_TYPE_PERFORMANCE_KHR 0x8250 -#define GL_DEBUG_TYPE_OTHER_KHR 0x8251 -#define GL_DEBUG_TYPE_MARKER_KHR 0x8268 -#define GL_DEBUG_TYPE_PUSH_GROUP_KHR 0x8269 -#define GL_DEBUG_TYPE_POP_GROUP_KHR 0x826A -#define GL_DEBUG_SEVERITY_NOTIFICATION_KHR 0x826B -#define GL_MAX_DEBUG_GROUP_STACK_DEPTH_KHR 0x826C -#define GL_DEBUG_GROUP_STACK_DEPTH_KHR 0x826D -#define GL_BUFFER_KHR 0x82E0 -#define GL_SHADER_KHR 0x82E1 -#define GL_PROGRAM_KHR 0x82E2 -#define GL_VERTEX_ARRAY_KHR 0x8074 -#define GL_QUERY_KHR 0x82E3 -#define GL_SAMPLER_KHR 0x82E6 -#define GL_MAX_LABEL_LENGTH_KHR 0x82E8 -#define GL_MAX_DEBUG_MESSAGE_LENGTH_KHR 0x9143 -#define GL_MAX_DEBUG_LOGGED_MESSAGES_KHR 0x9144 -#define GL_DEBUG_LOGGED_MESSAGES_KHR 0x9145 -#define GL_DEBUG_SEVERITY_HIGH_KHR 0x9146 -#define GL_DEBUG_SEVERITY_MEDIUM_KHR 0x9147 -#define GL_DEBUG_SEVERITY_LOW_KHR 0x9148 -#define GL_DEBUG_OUTPUT_KHR 0x92E0 -#define GL_CONTEXT_FLAG_DEBUG_BIT_KHR 0x00000002 -#define GL_STACK_OVERFLOW_KHR 0x0503 -#define GL_STACK_UNDERFLOW_KHR 0x0504 -typedef void (GL_APIENTRYP PFNGLDEBUGMESSAGECONTROLKHRPROC) (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled); -typedef void (GL_APIENTRYP PFNGLDEBUGMESSAGEINSERTKHRPROC) (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf); -typedef void (GL_APIENTRYP PFNGLDEBUGMESSAGECALLBACKKHRPROC) (GLDEBUGPROCKHR callback, void *userParam); -typedef GLuint (GL_APIENTRYP PFNGLGETDEBUGMESSAGELOGKHRPROC) (GLuint count, GLsizei bufSize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog); -typedef void (GL_APIENTRYP PFNGLPUSHDEBUGGROUPKHRPROC) (GLenum source, GLuint id, GLsizei length, const GLchar *message); -typedef void (GL_APIENTRYP PFNGLPOPDEBUGGROUPKHRPROC) (void); -typedef void (GL_APIENTRYP PFNGLOBJECTLABELKHRPROC) (GLenum identifier, GLuint name, GLsizei length, const GLchar *label); -typedef void (GL_APIENTRYP PFNGLGETOBJECTLABELKHRPROC) (GLenum identifier, GLuint name, GLsizei bufSize, GLsizei *length, GLchar *label); -typedef void (GL_APIENTRYP PFNGLOBJECTPTRLABELKHRPROC) (const void *ptr, GLsizei length, const GLchar *label); -typedef void (GL_APIENTRYP PFNGLGETOBJECTPTRLABELKHRPROC) (const void *ptr, GLsizei bufSize, GLsizei *length, GLchar *label); -typedef void (GL_APIENTRYP PFNGLGETPOINTERVKHRPROC) (GLenum pname, void **params); -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glDebugMessageControlKHR (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled); -GL_APICALL void GL_APIENTRY glDebugMessageInsertKHR (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf); -GL_APICALL void GL_APIENTRY glDebugMessageCallbackKHR (GLDEBUGPROCKHR callback, const void *userParam); -GL_APICALL GLuint GL_APIENTRY glGetDebugMessageLogKHR (GLuint count, GLsizei bufSize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog); -GL_APICALL void GL_APIENTRY glPushDebugGroupKHR (GLenum source, GLuint id, GLsizei length, const GLchar *message); -GL_APICALL void GL_APIENTRY glPopDebugGroupKHR (void); -GL_APICALL void GL_APIENTRY glObjectLabelKHR (GLenum identifier, GLuint name, GLsizei length, const GLchar *label); -GL_APICALL void GL_APIENTRY glGetObjectLabelKHR (GLenum identifier, GLuint name, GLsizei bufSize, GLsizei *length, GLchar *label); -GL_APICALL void GL_APIENTRY glObjectPtrLabelKHR (const void *ptr, GLsizei length, const GLchar *label); -GL_APICALL void GL_APIENTRY glGetObjectPtrLabelKHR (const void *ptr, GLsizei bufSize, GLsizei *length, GLchar *label); -GL_APICALL void GL_APIENTRY glGetPointervKHR (GLenum pname, void **params); -#endif -#endif /* GL_KHR_debug */ - -#ifndef GL_KHR_robust_buffer_access_behavior -#define GL_KHR_robust_buffer_access_behavior 1 -#endif /* GL_KHR_robust_buffer_access_behavior */ - -#ifndef GL_KHR_robustness -#define GL_KHR_robustness 1 -#define GL_CONTEXT_ROBUST_ACCESS_KHR 0x90F3 -#define GL_LOSE_CONTEXT_ON_RESET_KHR 0x8252 -#define GL_GUILTY_CONTEXT_RESET_KHR 0x8253 -#define GL_INNOCENT_CONTEXT_RESET_KHR 0x8254 -#define GL_UNKNOWN_CONTEXT_RESET_KHR 0x8255 -#define GL_RESET_NOTIFICATION_STRATEGY_KHR 0x8256 -#define GL_NO_RESET_NOTIFICATION_KHR 0x8261 -#define GL_CONTEXT_LOST_KHR 0x0507 -typedef GLenum (GL_APIENTRYP PFNGLGETGRAPHICSRESETSTATUSKHRPROC) (void); -typedef void (GL_APIENTRYP PFNGLREADNPIXELSKHRPROC) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void *data); -typedef void (GL_APIENTRYP PFNGLGETNUNIFORMFVKHRPROC) (GLuint program, GLint location, GLsizei bufSize, GLfloat *params); -typedef void (GL_APIENTRYP PFNGLGETNUNIFORMIVKHRPROC) (GLuint program, GLint location, GLsizei bufSize, GLint *params); -typedef void (GL_APIENTRYP PFNGLGETNUNIFORMUIVKHRPROC) (GLuint program, GLint location, GLsizei bufSize, GLuint *params); -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL GLenum GL_APIENTRY glGetGraphicsResetStatusKHR (void); -GL_APICALL void GL_APIENTRY glReadnPixelsKHR (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void *data); -GL_APICALL void GL_APIENTRY glGetnUniformfvKHR (GLuint program, GLint location, GLsizei bufSize, GLfloat *params); -GL_APICALL void GL_APIENTRY glGetnUniformivKHR (GLuint program, GLint location, GLsizei bufSize, GLint *params); -GL_APICALL void GL_APIENTRY glGetnUniformuivKHR (GLuint program, GLint location, GLsizei bufSize, GLuint *params); -#endif -#endif /* GL_KHR_robustness */ - -#ifndef GL_KHR_texture_compression_astc_hdr -#define GL_KHR_texture_compression_astc_hdr 1 -#define GL_COMPRESSED_RGBA_ASTC_4x4_KHR 0x93B0 -#define GL_COMPRESSED_RGBA_ASTC_5x4_KHR 0x93B1 -#define GL_COMPRESSED_RGBA_ASTC_5x5_KHR 0x93B2 -#define GL_COMPRESSED_RGBA_ASTC_6x5_KHR 0x93B3 -#define GL_COMPRESSED_RGBA_ASTC_6x6_KHR 0x93B4 -#define GL_COMPRESSED_RGBA_ASTC_8x5_KHR 0x93B5 -#define GL_COMPRESSED_RGBA_ASTC_8x6_KHR 0x93B6 -#define GL_COMPRESSED_RGBA_ASTC_8x8_KHR 0x93B7 -#define GL_COMPRESSED_RGBA_ASTC_10x5_KHR 0x93B8 -#define GL_COMPRESSED_RGBA_ASTC_10x6_KHR 0x93B9 -#define GL_COMPRESSED_RGBA_ASTC_10x8_KHR 0x93BA -#define GL_COMPRESSED_RGBA_ASTC_10x10_KHR 0x93BB -#define GL_COMPRESSED_RGBA_ASTC_12x10_KHR 0x93BC -#define GL_COMPRESSED_RGBA_ASTC_12x12_KHR 0x93BD -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR 0x93D0 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR 0x93D1 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR 0x93D2 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR 0x93D3 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR 0x93D4 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR 0x93D5 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR 0x93D6 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR 0x93D7 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR 0x93D8 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR 0x93D9 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR 0x93DA -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR 0x93DB -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR 0x93DC -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR 0x93DD -#endif /* GL_KHR_texture_compression_astc_hdr */ - -#ifndef GL_KHR_texture_compression_astc_ldr -#define GL_KHR_texture_compression_astc_ldr 1 -#endif /* GL_KHR_texture_compression_astc_ldr */ - -#ifndef GL_OES_EGL_image -#define GL_OES_EGL_image 1 -typedef void *GLeglImageOES; -typedef void (GL_APIENTRYP PFNGLEGLIMAGETARGETTEXTURE2DOESPROC) (GLenum target, GLeglImageOES image); -typedef void (GL_APIENTRYP PFNGLEGLIMAGETARGETRENDERBUFFERSTORAGEOESPROC) (GLenum target, GLeglImageOES image); -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glEGLImageTargetTexture2DOES (GLenum target, GLeglImageOES image); -GL_APICALL void GL_APIENTRY glEGLImageTargetRenderbufferStorageOES (GLenum target, GLeglImageOES image); -#endif -#endif /* GL_OES_EGL_image */ - -#ifndef GL_OES_EGL_image_external -#define GL_OES_EGL_image_external 1 -#define GL_TEXTURE_EXTERNAL_OES 0x8D65 -#define GL_TEXTURE_BINDING_EXTERNAL_OES 0x8D67 -#define GL_REQUIRED_TEXTURE_IMAGE_UNITS_OES 0x8D68 -#define GL_SAMPLER_EXTERNAL_OES 0x8D66 -#endif /* GL_OES_EGL_image_external */ - -#ifndef GL_OES_compressed_ETC1_RGB8_sub_texture -#define GL_OES_compressed_ETC1_RGB8_sub_texture 1 -#endif /* GL_OES_compressed_ETC1_RGB8_sub_texture */ - -#ifndef GL_OES_compressed_ETC1_RGB8_texture -#define GL_OES_compressed_ETC1_RGB8_texture 1 -#define GL_ETC1_RGB8_OES 0x8D64 -#endif /* GL_OES_compressed_ETC1_RGB8_texture */ - -#ifndef GL_OES_compressed_paletted_texture -#define GL_OES_compressed_paletted_texture 1 -#define GL_PALETTE4_RGB8_OES 0x8B90 -#define GL_PALETTE4_RGBA8_OES 0x8B91 -#define GL_PALETTE4_R5_G6_B5_OES 0x8B92 -#define GL_PALETTE4_RGBA4_OES 0x8B93 -#define GL_PALETTE4_RGB5_A1_OES 0x8B94 -#define GL_PALETTE8_RGB8_OES 0x8B95 -#define GL_PALETTE8_RGBA8_OES 0x8B96 -#define GL_PALETTE8_R5_G6_B5_OES 0x8B97 -#define GL_PALETTE8_RGBA4_OES 0x8B98 -#define GL_PALETTE8_RGB5_A1_OES 0x8B99 -#endif /* GL_OES_compressed_paletted_texture */ - -#ifndef GL_OES_depth24 -#define GL_OES_depth24 1 -#define GL_DEPTH_COMPONENT24_OES 0x81A6 -#endif /* GL_OES_depth24 */ - -#ifndef GL_OES_depth32 -#define GL_OES_depth32 1 -#define GL_DEPTH_COMPONENT32_OES 0x81A7 -#endif /* GL_OES_depth32 */ - -#ifndef GL_OES_depth_texture -#define GL_OES_depth_texture 1 -#endif /* GL_OES_depth_texture */ - -#ifndef GL_OES_element_index_uint -#define GL_OES_element_index_uint 1 -#endif /* GL_OES_element_index_uint */ - -#ifndef GL_OES_fbo_render_mipmap -#define GL_OES_fbo_render_mipmap 1 -#endif /* GL_OES_fbo_render_mipmap */ - -#ifndef GL_OES_fragment_precision_high -#define GL_OES_fragment_precision_high 1 -#endif /* GL_OES_fragment_precision_high */ - -#ifndef GL_OES_get_program_binary -#define GL_OES_get_program_binary 1 -#define GL_PROGRAM_BINARY_LENGTH_OES 0x8741 -#define GL_NUM_PROGRAM_BINARY_FORMATS_OES 0x87FE -#define GL_PROGRAM_BINARY_FORMATS_OES 0x87FF -typedef void (GL_APIENTRYP PFNGLGETPROGRAMBINARYOESPROC) (GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, void *binary); -typedef void (GL_APIENTRYP PFNGLPROGRAMBINARYOESPROC) (GLuint program, GLenum binaryFormat, const void *binary, GLint length); -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glGetProgramBinaryOES (GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, void *binary); -GL_APICALL void GL_APIENTRY glProgramBinaryOES (GLuint program, GLenum binaryFormat, const void *binary, GLint length); -#endif -#endif /* GL_OES_get_program_binary */ - -#ifndef GL_OES_mapbuffer -#define GL_OES_mapbuffer 1 -#define GL_WRITE_ONLY_OES 0x88B9 -#define GL_BUFFER_ACCESS_OES 0x88BB -#define GL_BUFFER_MAPPED_OES 0x88BC -#define GL_BUFFER_MAP_POINTER_OES 0x88BD -typedef void *(GL_APIENTRYP PFNGLMAPBUFFEROESPROC) (GLenum target, GLenum access); -typedef GLboolean (GL_APIENTRYP PFNGLUNMAPBUFFEROESPROC) (GLenum target); -typedef void (GL_APIENTRYP PFNGLGETBUFFERPOINTERVOESPROC) (GLenum target, GLenum pname, void **params); -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void *GL_APIENTRY glMapBufferOES (GLenum target, GLenum access); -GL_APICALL GLboolean GL_APIENTRY glUnmapBufferOES (GLenum target); -GL_APICALL void GL_APIENTRY glGetBufferPointervOES (GLenum target, GLenum pname, void **params); -#endif -#endif /* GL_OES_mapbuffer */ - -#ifndef GL_OES_packed_depth_stencil -#define GL_OES_packed_depth_stencil 1 -#define GL_DEPTH_STENCIL_OES 0x84F9 -#define GL_UNSIGNED_INT_24_8_OES 0x84FA -#define GL_DEPTH24_STENCIL8_OES 0x88F0 -#endif /* GL_OES_packed_depth_stencil */ - -#ifndef GL_OES_required_internalformat -#define GL_OES_required_internalformat 1 -#define GL_ALPHA8_OES 0x803C -#define GL_DEPTH_COMPONENT16_OES 0x81A5 -#define GL_LUMINANCE4_ALPHA4_OES 0x8043 -#define GL_LUMINANCE8_ALPHA8_OES 0x8045 -#define GL_LUMINANCE8_OES 0x8040 -#define GL_RGBA4_OES 0x8056 -#define GL_RGB5_A1_OES 0x8057 -#define GL_RGB565_OES 0x8D62 -#define GL_RGB8_OES 0x8051 -#define GL_RGBA8_OES 0x8058 -#define GL_RGB10_EXT 0x8052 -#define GL_RGB10_A2_EXT 0x8059 -#endif /* GL_OES_required_internalformat */ - -#ifndef GL_OES_rgb8_rgba8 -#define GL_OES_rgb8_rgba8 1 -#endif /* GL_OES_rgb8_rgba8 */ - -#ifndef GL_OES_sample_shading -#define GL_OES_sample_shading 1 -#define GL_SAMPLE_SHADING_OES 0x8C36 -#define GL_MIN_SAMPLE_SHADING_VALUE_OES 0x8C37 -typedef void (GL_APIENTRYP PFNGLMINSAMPLESHADINGOESPROC) (GLfloat value); -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glMinSampleShadingOES (GLfloat value); -#endif -#endif /* GL_OES_sample_shading */ - -#ifndef GL_OES_sample_variables -#define GL_OES_sample_variables 1 -#endif /* GL_OES_sample_variables */ - -#ifndef GL_OES_shader_image_atomic -#define GL_OES_shader_image_atomic 1 -#endif /* GL_OES_shader_image_atomic */ - -#ifndef GL_OES_shader_multisample_interpolation -#define GL_OES_shader_multisample_interpolation 1 -#define GL_MIN_FRAGMENT_INTERPOLATION_OFFSET_OES 0x8E5B -#define GL_MAX_FRAGMENT_INTERPOLATION_OFFSET_OES 0x8E5C -#define GL_FRAGMENT_INTERPOLATION_OFFSET_BITS_OES 0x8E5D -#endif /* GL_OES_shader_multisample_interpolation */ - -#ifndef GL_OES_standard_derivatives -#define GL_OES_standard_derivatives 1 -#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT_OES 0x8B8B -#endif /* GL_OES_standard_derivatives */ - -#ifndef GL_OES_stencil1 -#define GL_OES_stencil1 1 -#define GL_STENCIL_INDEX1_OES 0x8D46 -#endif /* GL_OES_stencil1 */ - -#ifndef GL_OES_stencil4 -#define GL_OES_stencil4 1 -#define GL_STENCIL_INDEX4_OES 0x8D47 -#endif /* GL_OES_stencil4 */ - -#ifndef GL_OES_surfaceless_context -#define GL_OES_surfaceless_context 1 -#define GL_FRAMEBUFFER_UNDEFINED_OES 0x8219 -#endif /* GL_OES_surfaceless_context */ - -#ifndef GL_OES_texture_3D -#define GL_OES_texture_3D 1 -#define GL_TEXTURE_WRAP_R_OES 0x8072 -#define GL_TEXTURE_3D_OES 0x806F -#define GL_TEXTURE_BINDING_3D_OES 0x806A -#define GL_MAX_3D_TEXTURE_SIZE_OES 0x8073 -#define GL_SAMPLER_3D_OES 0x8B5F -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_OES 0x8CD4 -typedef void (GL_APIENTRYP PFNGLTEXIMAGE3DOESPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels); -typedef void (GL_APIENTRYP PFNGLTEXSUBIMAGE3DOESPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels); -typedef void (GL_APIENTRYP PFNGLCOPYTEXSUBIMAGE3DOESPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); -typedef void (GL_APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DOESPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data); -typedef void (GL_APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DOESPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data); -typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERTEXTURE3DOESPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); - -// Chromium-specific define to account for issues in gles2_conform_test -// TODO (bajones): This symbol should be updated to the correct version in the -// conformance test upstream and this hack removed. crbug.com/329708 -#define PFNGLFRAMEBUFFERTEXTURE3DOES PFNGLFRAMEBUFFERTEXTURE3DOESPROC - -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glTexImage3DOES (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels); -GL_APICALL void GL_APIENTRY glTexSubImage3DOES (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels); -GL_APICALL void GL_APIENTRY glCopyTexSubImage3DOES (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); -GL_APICALL void GL_APIENTRY glCompressedTexImage3DOES (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data); -GL_APICALL void GL_APIENTRY glCompressedTexSubImage3DOES (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data); -GL_APICALL void GL_APIENTRY glFramebufferTexture3DOES (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); -#endif -#endif /* GL_OES_texture_3D */ - -#ifndef GL_OES_texture_compression_astc -#define GL_OES_texture_compression_astc 1 -#define GL_COMPRESSED_RGBA_ASTC_3x3x3_OES 0x93C0 -#define GL_COMPRESSED_RGBA_ASTC_4x3x3_OES 0x93C1 -#define GL_COMPRESSED_RGBA_ASTC_4x4x3_OES 0x93C2 -#define GL_COMPRESSED_RGBA_ASTC_4x4x4_OES 0x93C3 -#define GL_COMPRESSED_RGBA_ASTC_5x4x4_OES 0x93C4 -#define GL_COMPRESSED_RGBA_ASTC_5x5x4_OES 0x93C5 -#define GL_COMPRESSED_RGBA_ASTC_5x5x5_OES 0x93C6 -#define GL_COMPRESSED_RGBA_ASTC_6x5x5_OES 0x93C7 -#define GL_COMPRESSED_RGBA_ASTC_6x6x5_OES 0x93C8 -#define GL_COMPRESSED_RGBA_ASTC_6x6x6_OES 0x93C9 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_3x3x3_OES 0x93E0 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x3x3_OES 0x93E1 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4x3_OES 0x93E2 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4x4_OES 0x93E3 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4x4_OES 0x93E4 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5x4_OES 0x93E5 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5x5_OES 0x93E6 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5x5_OES 0x93E7 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6x5_OES 0x93E8 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6x6_OES 0x93E9 -#endif /* GL_OES_texture_compression_astc */ - -#ifndef GL_OES_texture_float -#define GL_OES_texture_float 1 -#endif /* GL_OES_texture_float */ - -#ifndef GL_OES_texture_float_linear -#define GL_OES_texture_float_linear 1 -#endif /* GL_OES_texture_float_linear */ - -#ifndef GL_OES_texture_half_float -#define GL_OES_texture_half_float 1 -#define GL_HALF_FLOAT_OES 0x8D61 -#endif /* GL_OES_texture_half_float */ - -#ifndef GL_OES_texture_half_float_linear -#define GL_OES_texture_half_float_linear 1 -#endif /* GL_OES_texture_half_float_linear */ - -#ifndef GL_OES_texture_npot -#define GL_OES_texture_npot 1 -#endif /* GL_OES_texture_npot */ - -#ifndef GL_OES_texture_stencil8 -#define GL_OES_texture_stencil8 1 -#define GL_STENCIL_INDEX_OES 0x1901 -#define GL_STENCIL_INDEX8_OES 0x8D48 -#endif /* GL_OES_texture_stencil8 */ - -#ifndef GL_OES_texture_storage_multisample_2d_array -#define GL_OES_texture_storage_multisample_2d_array 1 -#define GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES 0x9102 -#define GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY_OES 0x9105 -#define GL_SAMPLER_2D_MULTISAMPLE_ARRAY_OES 0x910B -#define GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY_OES 0x910C -#define GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY_OES 0x910D -typedef void (GL_APIENTRYP PFNGLTEXSTORAGE3DMULTISAMPLEOESPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations); -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glTexStorage3DMultisampleOES (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations); -#endif -#endif /* GL_OES_texture_storage_multisample_2d_array */ - -#ifndef GL_OES_vertex_array_object -#define GL_OES_vertex_array_object 1 -#define GL_VERTEX_ARRAY_BINDING_OES 0x85B5 -typedef void (GL_APIENTRYP PFNGLBINDVERTEXARRAYOESPROC) (GLuint array); -typedef void (GL_APIENTRYP PFNGLDELETEVERTEXARRAYSOESPROC) (GLsizei n, const GLuint *arrays); -typedef void (GL_APIENTRYP PFNGLGENVERTEXARRAYSOESPROC) (GLsizei n, GLuint *arrays); -typedef GLboolean (GL_APIENTRYP PFNGLISVERTEXARRAYOESPROC) (GLuint array); -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glBindVertexArrayOES (GLuint array); -GL_APICALL void GL_APIENTRY glDeleteVertexArraysOES (GLsizei n, const GLuint *arrays); -GL_APICALL void GL_APIENTRY glGenVertexArraysOES (GLsizei n, GLuint *arrays); -GL_APICALL GLboolean GL_APIENTRY glIsVertexArrayOES (GLuint array); -#endif -#endif /* GL_OES_vertex_array_object */ - -#ifndef GL_OES_vertex_half_float -#define GL_OES_vertex_half_float 1 -#endif /* GL_OES_vertex_half_float */ - -#ifndef GL_OES_vertex_type_10_10_10_2 -#define GL_OES_vertex_type_10_10_10_2 1 -#define GL_UNSIGNED_INT_10_10_10_2_OES 0x8DF6 -#define GL_INT_10_10_10_2_OES 0x8DF7 -#endif /* GL_OES_vertex_type_10_10_10_2 */ - -#ifndef GL_AMD_compressed_3DC_texture -#define GL_AMD_compressed_3DC_texture 1 -#define GL_3DC_X_AMD 0x87F9 -#define GL_3DC_XY_AMD 0x87FA -#endif /* GL_AMD_compressed_3DC_texture */ - -#ifndef GL_AMD_compressed_ATC_texture -#define GL_AMD_compressed_ATC_texture 1 -#define GL_ATC_RGB_AMD 0x8C92 -#define GL_ATC_RGBA_EXPLICIT_ALPHA_AMD 0x8C93 -#define GL_ATC_RGBA_INTERPOLATED_ALPHA_AMD 0x87EE -#endif /* GL_AMD_compressed_ATC_texture */ - -#ifndef GL_AMD_performance_monitor -#define GL_AMD_performance_monitor 1 -#define GL_COUNTER_TYPE_AMD 0x8BC0 -#define GL_COUNTER_RANGE_AMD 0x8BC1 -#define GL_UNSIGNED_INT64_AMD 0x8BC2 -#define GL_PERCENTAGE_AMD 0x8BC3 -#define GL_PERFMON_RESULT_AVAILABLE_AMD 0x8BC4 -#define GL_PERFMON_RESULT_SIZE_AMD 0x8BC5 -#define GL_PERFMON_RESULT_AMD 0x8BC6 -typedef void (GL_APIENTRYP PFNGLGETPERFMONITORGROUPSAMDPROC) (GLint *numGroups, GLsizei groupsSize, GLuint *groups); -typedef void (GL_APIENTRYP PFNGLGETPERFMONITORCOUNTERSAMDPROC) (GLuint group, GLint *numCounters, GLint *maxActiveCounters, GLsizei counterSize, GLuint *counters); -typedef void (GL_APIENTRYP PFNGLGETPERFMONITORGROUPSTRINGAMDPROC) (GLuint group, GLsizei bufSize, GLsizei *length, GLchar *groupString); -typedef void (GL_APIENTRYP PFNGLGETPERFMONITORCOUNTERSTRINGAMDPROC) (GLuint group, GLuint counter, GLsizei bufSize, GLsizei *length, GLchar *counterString); -typedef void (GL_APIENTRYP PFNGLGETPERFMONITORCOUNTERINFOAMDPROC) (GLuint group, GLuint counter, GLenum pname, void *data); -typedef void (GL_APIENTRYP PFNGLGENPERFMONITORSAMDPROC) (GLsizei n, GLuint *monitors); -typedef void (GL_APIENTRYP PFNGLDELETEPERFMONITORSAMDPROC) (GLsizei n, GLuint *monitors); -typedef void (GL_APIENTRYP PFNGLSELECTPERFMONITORCOUNTERSAMDPROC) (GLuint monitor, GLboolean enable, GLuint group, GLint numCounters, GLuint *counterList); -typedef void (GL_APIENTRYP PFNGLBEGINPERFMONITORAMDPROC) (GLuint monitor); -typedef void (GL_APIENTRYP PFNGLENDPERFMONITORAMDPROC) (GLuint monitor); -typedef void (GL_APIENTRYP PFNGLGETPERFMONITORCOUNTERDATAAMDPROC) (GLuint monitor, GLenum pname, GLsizei dataSize, GLuint *data, GLint *bytesWritten); -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glGetPerfMonitorGroupsAMD (GLint *numGroups, GLsizei groupsSize, GLuint *groups); -GL_APICALL void GL_APIENTRY glGetPerfMonitorCountersAMD (GLuint group, GLint *numCounters, GLint *maxActiveCounters, GLsizei counterSize, GLuint *counters); -GL_APICALL void GL_APIENTRY glGetPerfMonitorGroupStringAMD (GLuint group, GLsizei bufSize, GLsizei *length, GLchar *groupString); -GL_APICALL void GL_APIENTRY glGetPerfMonitorCounterStringAMD (GLuint group, GLuint counter, GLsizei bufSize, GLsizei *length, GLchar *counterString); -GL_APICALL void GL_APIENTRY glGetPerfMonitorCounterInfoAMD (GLuint group, GLuint counter, GLenum pname, void *data); -GL_APICALL void GL_APIENTRY glGenPerfMonitorsAMD (GLsizei n, GLuint *monitors); -GL_APICALL void GL_APIENTRY glDeletePerfMonitorsAMD (GLsizei n, GLuint *monitors); -GL_APICALL void GL_APIENTRY glSelectPerfMonitorCountersAMD (GLuint monitor, GLboolean enable, GLuint group, GLint numCounters, GLuint *counterList); -GL_APICALL void GL_APIENTRY glBeginPerfMonitorAMD (GLuint monitor); -GL_APICALL void GL_APIENTRY glEndPerfMonitorAMD (GLuint monitor); -GL_APICALL void GL_APIENTRY glGetPerfMonitorCounterDataAMD (GLuint monitor, GLenum pname, GLsizei dataSize, GLuint *data, GLint *bytesWritten); -#endif -#endif /* GL_AMD_performance_monitor */ - -#ifndef GL_AMD_program_binary_Z400 -#define GL_AMD_program_binary_Z400 1 -#define GL_Z400_BINARY_AMD 0x8740 -#endif /* GL_AMD_program_binary_Z400 */ - -#ifndef GL_ANDROID_extension_pack_es31a -#define GL_ANDROID_extension_pack_es31a 1 -#endif /* GL_ANDROID_extension_pack_es31a */ - -#ifndef GL_ANGLE_depth_texture -#define GL_ANGLE_depth_texture 1 -#endif /* GL_ANGLE_depth_texture */ - -#ifndef GL_ANGLE_framebuffer_blit -#define GL_ANGLE_framebuffer_blit 1 -#define GL_READ_FRAMEBUFFER_ANGLE 0x8CA8 -#define GL_DRAW_FRAMEBUFFER_ANGLE 0x8CA9 -#define GL_DRAW_FRAMEBUFFER_BINDING_ANGLE 0x8CA6 -#define GL_READ_FRAMEBUFFER_BINDING_ANGLE 0x8CAA -typedef void (GL_APIENTRYP PFNGLBLITFRAMEBUFFERANGLEPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glBlitFramebufferANGLE (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); -#endif -#endif /* GL_ANGLE_framebuffer_blit */ - -#ifndef GL_ANGLE_framebuffer_multisample -#define GL_ANGLE_framebuffer_multisample 1 -#define GL_RENDERBUFFER_SAMPLES_ANGLE 0x8CAB -#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_ANGLE 0x8D56 -#define GL_MAX_SAMPLES_ANGLE 0x8D57 -typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEANGLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glRenderbufferStorageMultisampleANGLE (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); -#endif -#endif /* GL_ANGLE_framebuffer_multisample */ - -#ifndef GL_ANGLE_instanced_arrays -#define GL_ANGLE_instanced_arrays 1 -#define GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE 0x88FE -typedef void (GL_APIENTRYP PFNGLDRAWARRAYSINSTANCEDANGLEPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount); -typedef void (GL_APIENTRYP PFNGLDRAWELEMENTSINSTANCEDANGLEPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount); -typedef void (GL_APIENTRYP PFNGLVERTEXATTRIBDIVISORANGLEPROC) (GLuint index, GLuint divisor); -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glDrawArraysInstancedANGLE (GLenum mode, GLint first, GLsizei count, GLsizei primcount); -GL_APICALL void GL_APIENTRY glDrawElementsInstancedANGLE (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount); -GL_APICALL void GL_APIENTRY glVertexAttribDivisorANGLE (GLuint index, GLuint divisor); -#endif -#endif /* GL_ANGLE_instanced_arrays */ - -#ifndef GL_ANGLE_pack_reverse_row_order -#define GL_ANGLE_pack_reverse_row_order 1 -#define GL_PACK_REVERSE_ROW_ORDER_ANGLE 0x93A4 -#endif /* GL_ANGLE_pack_reverse_row_order */ - -#ifndef GL_ANGLE_program_binary -#define GL_ANGLE_program_binary 1 -#define GL_PROGRAM_BINARY_ANGLE 0x93A6 -#endif /* GL_ANGLE_program_binary */ - -#ifndef GL_ANGLE_texture_compression_dxt3 -#define GL_ANGLE_texture_compression_dxt3 1 -#define GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE 0x83F2 -#endif /* GL_ANGLE_texture_compression_dxt3 */ - -#ifndef GL_ANGLE_texture_compression_dxt5 -#define GL_ANGLE_texture_compression_dxt5 1 -#define GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE 0x83F3 -#endif /* GL_ANGLE_texture_compression_dxt5 */ - -#ifndef GL_ANGLE_texture_usage -#define GL_ANGLE_texture_usage 1 -#define GL_TEXTURE_USAGE_ANGLE 0x93A2 -#define GL_FRAMEBUFFER_ATTACHMENT_ANGLE 0x93A3 -#endif /* GL_ANGLE_texture_usage */ - -#ifndef GL_ANGLE_translated_shader_source -#define GL_ANGLE_translated_shader_source 1 -#define GL_TRANSLATED_SHADER_SOURCE_LENGTH_ANGLE 0x93A0 -typedef void (GL_APIENTRYP PFNGLGETTRANSLATEDSHADERSOURCEANGLEPROC) (GLuint shader, GLsizei bufsize, GLsizei *length, GLchar *source); -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glGetTranslatedShaderSourceANGLE (GLuint shader, GLsizei bufsize, GLsizei *length, GLchar *source); -#endif -#endif /* GL_ANGLE_translated_shader_source */ - -#ifndef GL_APPLE_clip_distance -#define GL_APPLE_clip_distance 1 -#define GL_MAX_CLIP_DISTANCES_APPLE 0x0D32 -#define GL_CLIP_DISTANCE0_APPLE 0x3000 -#define GL_CLIP_DISTANCE1_APPLE 0x3001 -#define GL_CLIP_DISTANCE2_APPLE 0x3002 -#define GL_CLIP_DISTANCE3_APPLE 0x3003 -#define GL_CLIP_DISTANCE4_APPLE 0x3004 -#define GL_CLIP_DISTANCE5_APPLE 0x3005 -#define GL_CLIP_DISTANCE6_APPLE 0x3006 -#define GL_CLIP_DISTANCE7_APPLE 0x3007 -#endif /* GL_APPLE_clip_distance */ - -#ifndef GL_APPLE_color_buffer_packed_float -#define GL_APPLE_color_buffer_packed_float 1 -#endif /* GL_APPLE_color_buffer_packed_float */ - -#ifndef GL_APPLE_copy_texture_levels -#define GL_APPLE_copy_texture_levels 1 -typedef void (GL_APIENTRYP PFNGLCOPYTEXTURELEVELSAPPLEPROC) (GLuint destinationTexture, GLuint sourceTexture, GLint sourceBaseLevel, GLsizei sourceLevelCount); -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glCopyTextureLevelsAPPLE (GLuint destinationTexture, GLuint sourceTexture, GLint sourceBaseLevel, GLsizei sourceLevelCount); -#endif -#endif /* GL_APPLE_copy_texture_levels */ - -#ifndef GL_APPLE_framebuffer_multisample -#define GL_APPLE_framebuffer_multisample 1 -#define GL_RENDERBUFFER_SAMPLES_APPLE 0x8CAB -#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_APPLE 0x8D56 -#define GL_MAX_SAMPLES_APPLE 0x8D57 -#define GL_READ_FRAMEBUFFER_APPLE 0x8CA8 -#define GL_DRAW_FRAMEBUFFER_APPLE 0x8CA9 -#define GL_DRAW_FRAMEBUFFER_BINDING_APPLE 0x8CA6 -#define GL_READ_FRAMEBUFFER_BINDING_APPLE 0x8CAA -typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEAPPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); -typedef void (GL_APIENTRYP PFNGLRESOLVEMULTISAMPLEFRAMEBUFFERAPPLEPROC) (void); -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glRenderbufferStorageMultisampleAPPLE (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); -GL_APICALL void GL_APIENTRY glResolveMultisampleFramebufferAPPLE (void); -#endif -#endif /* GL_APPLE_framebuffer_multisample */ - -#ifndef GL_APPLE_rgb_422 -#define GL_APPLE_rgb_422 1 -#define GL_RGB_422_APPLE 0x8A1F -#define GL_UNSIGNED_SHORT_8_8_APPLE 0x85BA -#define GL_UNSIGNED_SHORT_8_8_REV_APPLE 0x85BB -#define GL_RGB_RAW_422_APPLE 0x8A51 -#endif /* GL_APPLE_rgb_422 */ - -#ifndef GL_APPLE_sync -#define GL_APPLE_sync 1 -#define GL_SYNC_OBJECT_APPLE 0x8A53 -#define GL_MAX_SERVER_WAIT_TIMEOUT_APPLE 0x9111 -#define GL_OBJECT_TYPE_APPLE 0x9112 -#define GL_SYNC_CONDITION_APPLE 0x9113 -#define GL_SYNC_STATUS_APPLE 0x9114 -#define GL_SYNC_FLAGS_APPLE 0x9115 -#define GL_SYNC_FENCE_APPLE 0x9116 -#define GL_SYNC_GPU_COMMANDS_COMPLETE_APPLE 0x9117 -#define GL_UNSIGNALED_APPLE 0x9118 -#define GL_SIGNALED_APPLE 0x9119 -#define GL_ALREADY_SIGNALED_APPLE 0x911A -#define GL_TIMEOUT_EXPIRED_APPLE 0x911B -#define GL_CONDITION_SATISFIED_APPLE 0x911C -#define GL_WAIT_FAILED_APPLE 0x911D -#define GL_SYNC_FLUSH_COMMANDS_BIT_APPLE 0x00000001 -#define GL_TIMEOUT_IGNORED_APPLE 0xFFFFFFFFFFFFFFFFull -typedef GLsync (GL_APIENTRYP PFNGLFENCESYNCAPPLEPROC) (GLenum condition, GLbitfield flags); -typedef GLboolean (GL_APIENTRYP PFNGLISSYNCAPPLEPROC) (GLsync sync); -typedef void (GL_APIENTRYP PFNGLDELETESYNCAPPLEPROC) (GLsync sync); -typedef GLenum (GL_APIENTRYP PFNGLCLIENTWAITSYNCAPPLEPROC) (GLsync sync, GLbitfield flags, GLuint64 timeout); -typedef void (GL_APIENTRYP PFNGLWAITSYNCAPPLEPROC) (GLsync sync, GLbitfield flags, GLuint64 timeout); -typedef void (GL_APIENTRYP PFNGLGETINTEGER64VAPPLEPROC) (GLenum pname, GLint64 *params); -typedef void (GL_APIENTRYP PFNGLGETSYNCIVAPPLEPROC) (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values); -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL GLsync GL_APIENTRY glFenceSyncAPPLE (GLenum condition, GLbitfield flags); -GL_APICALL GLboolean GL_APIENTRY glIsSyncAPPLE (GLsync sync); -GL_APICALL void GL_APIENTRY glDeleteSyncAPPLE (GLsync sync); -GL_APICALL GLenum GL_APIENTRY glClientWaitSyncAPPLE (GLsync sync, GLbitfield flags, GLuint64 timeout); -GL_APICALL void GL_APIENTRY glWaitSyncAPPLE (GLsync sync, GLbitfield flags, GLuint64 timeout); -GL_APICALL void GL_APIENTRY glGetInteger64vAPPLE (GLenum pname, GLint64 *params); -GL_APICALL void GL_APIENTRY glGetSyncivAPPLE (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values); -#endif -#endif /* GL_APPLE_sync */ - -#ifndef GL_APPLE_texture_format_BGRA8888 -#define GL_APPLE_texture_format_BGRA8888 1 -#define GL_BGRA_EXT 0x80E1 -#define GL_BGRA8_EXT 0x93A1 -#endif /* GL_APPLE_texture_format_BGRA8888 */ - -#ifndef GL_APPLE_texture_max_level -#define GL_APPLE_texture_max_level 1 -#define GL_TEXTURE_MAX_LEVEL_APPLE 0x813D -#endif /* GL_APPLE_texture_max_level */ - -#ifndef GL_APPLE_texture_packed_float -#define GL_APPLE_texture_packed_float 1 -#define GL_UNSIGNED_INT_10F_11F_11F_REV_APPLE 0x8C3B -#define GL_UNSIGNED_INT_5_9_9_9_REV_APPLE 0x8C3E -#define GL_R11F_G11F_B10F_APPLE 0x8C3A -#define GL_RGB9_E5_APPLE 0x8C3D -#endif /* GL_APPLE_texture_packed_float */ - -#ifndef GL_ARM_mali_program_binary -#define GL_ARM_mali_program_binary 1 -#define GL_MALI_PROGRAM_BINARY_ARM 0x8F61 -#endif /* GL_ARM_mali_program_binary */ - -#ifndef GL_ARM_mali_shader_binary -#define GL_ARM_mali_shader_binary 1 -#define GL_MALI_SHADER_BINARY_ARM 0x8F60 -#endif /* GL_ARM_mali_shader_binary */ - -#ifndef GL_ARM_rgba8 -#define GL_ARM_rgba8 1 -#endif /* GL_ARM_rgba8 */ - -#ifndef GL_ARM_shader_framebuffer_fetch -#define GL_ARM_shader_framebuffer_fetch 1 -#define GL_FETCH_PER_SAMPLE_ARM 0x8F65 -#define GL_FRAGMENT_SHADER_FRAMEBUFFER_FETCH_MRT_ARM 0x8F66 -#endif /* GL_ARM_shader_framebuffer_fetch */ - -#ifndef GL_ARM_shader_framebuffer_fetch_depth_stencil -#define GL_ARM_shader_framebuffer_fetch_depth_stencil 1 -#endif /* GL_ARM_shader_framebuffer_fetch_depth_stencil */ - -#ifndef GL_DMP_program_binary -#define GL_DMP_program_binary 1 -#define GL_SMAPHS30_PROGRAM_BINARY_DMP 0x9251 -#define GL_SMAPHS_PROGRAM_BINARY_DMP 0x9252 -#define GL_DMP_PROGRAM_BINARY_DMP 0x9253 -#endif /* GL_DMP_program_binary */ - -#ifndef GL_DMP_shader_binary -#define GL_DMP_shader_binary 1 -#define GL_SHADER_BINARY_DMP 0x9250 -#endif /* GL_DMP_shader_binary */ - -#ifndef GL_EXT_blend_minmax -#define GL_EXT_blend_minmax 1 -#define GL_MIN_EXT 0x8007 -#define GL_MAX_EXT 0x8008 -#endif /* GL_EXT_blend_minmax */ - -#ifndef GL_EXT_color_buffer_half_float -#define GL_EXT_color_buffer_half_float 1 -#define GL_RGBA16F_EXT 0x881A -#define GL_RGB16F_EXT 0x881B -#define GL_RG16F_EXT 0x822F -#define GL_R16F_EXT 0x822D -#define GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE_EXT 0x8211 -#define GL_UNSIGNED_NORMALIZED_EXT 0x8C17 -#endif /* GL_EXT_color_buffer_half_float */ - -#ifndef GL_EXT_copy_image -#define GL_EXT_copy_image 1 -typedef void (GL_APIENTRYP PFNGLCOPYIMAGESUBDATAEXTPROC) (GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth); -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glCopyImageSubDataEXT (GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth); -#endif -#endif /* GL_EXT_copy_image */ - -#ifndef GL_EXT_debug_label -#define GL_EXT_debug_label 1 -#define GL_PROGRAM_PIPELINE_OBJECT_EXT 0x8A4F -#define GL_PROGRAM_OBJECT_EXT 0x8B40 -#define GL_SHADER_OBJECT_EXT 0x8B48 -#define GL_BUFFER_OBJECT_EXT 0x9151 -#define GL_QUERY_OBJECT_EXT 0x9153 -#define GL_VERTEX_ARRAY_OBJECT_EXT 0x9154 -#define GL_TRANSFORM_FEEDBACK 0x8E22 -typedef void (GL_APIENTRYP PFNGLLABELOBJECTEXTPROC) (GLenum type, GLuint object, GLsizei length, const GLchar *label); -typedef void (GL_APIENTRYP PFNGLGETOBJECTLABELEXTPROC) (GLenum type, GLuint object, GLsizei bufSize, GLsizei *length, GLchar *label); -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glLabelObjectEXT (GLenum type, GLuint object, GLsizei length, const GLchar *label); -GL_APICALL void GL_APIENTRY glGetObjectLabelEXT (GLenum type, GLuint object, GLsizei bufSize, GLsizei *length, GLchar *label); -#endif -#endif /* GL_EXT_debug_label */ - -#ifndef GL_EXT_debug_marker -#define GL_EXT_debug_marker 1 -typedef void (GL_APIENTRYP PFNGLINSERTEVENTMARKEREXTPROC) (GLsizei length, const GLchar *marker); -typedef void (GL_APIENTRYP PFNGLPUSHGROUPMARKEREXTPROC) (GLsizei length, const GLchar *marker); -typedef void (GL_APIENTRYP PFNGLPOPGROUPMARKEREXTPROC) (void); -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glInsertEventMarkerEXT (GLsizei length, const GLchar *marker); -GL_APICALL void GL_APIENTRY glPushGroupMarkerEXT (GLsizei length, const GLchar *marker); -GL_APICALL void GL_APIENTRY glPopGroupMarkerEXT (void); -#endif -#endif /* GL_EXT_debug_marker */ - -#ifndef GL_EXT_discard_framebuffer -#define GL_EXT_discard_framebuffer 1 -#define GL_COLOR_EXT 0x1800 -#define GL_DEPTH_EXT 0x1801 -#define GL_STENCIL_EXT 0x1802 -typedef void (GL_APIENTRYP PFNGLDISCARDFRAMEBUFFEREXTPROC) (GLenum target, GLsizei numAttachments, const GLenum *attachments); -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glDiscardFramebufferEXT (GLenum target, GLsizei numAttachments, const GLenum *attachments); -#endif -#endif /* GL_EXT_discard_framebuffer */ - -#ifndef GL_EXT_disjoint_timer_query -#define GL_EXT_disjoint_timer_query 1 -#define GL_QUERY_COUNTER_BITS_EXT 0x8864 -#define GL_CURRENT_QUERY_EXT 0x8865 -#define GL_QUERY_RESULT_EXT 0x8866 -#define GL_QUERY_RESULT_AVAILABLE_EXT 0x8867 -#define GL_TIME_ELAPSED_EXT 0x88BF -#define GL_TIMESTAMP_EXT 0x8E28 -#define GL_GPU_DISJOINT_EXT 0x8FBB -typedef void (GL_APIENTRYP PFNGLGENQUERIESEXTPROC) (GLsizei n, GLuint *ids); -typedef void (GL_APIENTRYP PFNGLDELETEQUERIESEXTPROC) (GLsizei n, const GLuint *ids); -typedef GLboolean (GL_APIENTRYP PFNGLISQUERYEXTPROC) (GLuint id); -typedef void (GL_APIENTRYP PFNGLBEGINQUERYEXTPROC) (GLenum target, GLuint id); -typedef void (GL_APIENTRYP PFNGLENDQUERYEXTPROC) (GLenum target); -typedef void (GL_APIENTRYP PFNGLQUERYCOUNTEREXTPROC) (GLuint id, GLenum target); -typedef void (GL_APIENTRYP PFNGLGETQUERYIVEXTPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (GL_APIENTRYP PFNGLGETQUERYOBJECTIVEXTPROC) (GLuint id, GLenum pname, GLint *params); -typedef void (GL_APIENTRYP PFNGLGETQUERYOBJECTUIVEXTPROC) (GLuint id, GLenum pname, GLuint *params); -typedef void (GL_APIENTRYP PFNGLGETQUERYOBJECTI64VEXTPROC) (GLuint id, GLenum pname, GLint64 *params); -typedef void (GL_APIENTRYP PFNGLGETQUERYOBJECTUI64VEXTPROC) (GLuint id, GLenum pname, GLuint64 *params); -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glGenQueriesEXT (GLsizei n, GLuint *ids); -GL_APICALL void GL_APIENTRY glDeleteQueriesEXT (GLsizei n, const GLuint *ids); -GL_APICALL GLboolean GL_APIENTRY glIsQueryEXT (GLuint id); -GL_APICALL void GL_APIENTRY glBeginQueryEXT (GLenum target, GLuint id); -GL_APICALL void GL_APIENTRY glEndQueryEXT (GLenum target); -GL_APICALL void GL_APIENTRY glQueryCounterEXT (GLuint id, GLenum target); -GL_APICALL void GL_APIENTRY glGetQueryivEXT (GLenum target, GLenum pname, GLint *params); -GL_APICALL void GL_APIENTRY glGetQueryObjectivEXT (GLuint id, GLenum pname, GLint *params); -GL_APICALL void GL_APIENTRY glGetQueryObjectuivEXT (GLuint id, GLenum pname, GLuint *params); -GL_APICALL void GL_APIENTRY glGetQueryObjecti64vEXT (GLuint id, GLenum pname, GLint64 *params); -GL_APICALL void GL_APIENTRY glGetQueryObjectui64vEXT (GLuint id, GLenum pname, GLuint64 *params); -#endif -#endif /* GL_EXT_disjoint_timer_query */ - -#ifndef GL_EXT_draw_buffers -#define GL_EXT_draw_buffers 1 -#define GL_MAX_COLOR_ATTACHMENTS_EXT 0x8CDF -#define GL_MAX_DRAW_BUFFERS_EXT 0x8824 -#define GL_DRAW_BUFFER0_EXT 0x8825 -#define GL_DRAW_BUFFER1_EXT 0x8826 -#define GL_DRAW_BUFFER2_EXT 0x8827 -#define GL_DRAW_BUFFER3_EXT 0x8828 -#define GL_DRAW_BUFFER4_EXT 0x8829 -#define GL_DRAW_BUFFER5_EXT 0x882A -#define GL_DRAW_BUFFER6_EXT 0x882B -#define GL_DRAW_BUFFER7_EXT 0x882C -#define GL_DRAW_BUFFER8_EXT 0x882D -#define GL_DRAW_BUFFER9_EXT 0x882E -#define GL_DRAW_BUFFER10_EXT 0x882F -#define GL_DRAW_BUFFER11_EXT 0x8830 -#define GL_DRAW_BUFFER12_EXT 0x8831 -#define GL_DRAW_BUFFER13_EXT 0x8832 -#define GL_DRAW_BUFFER14_EXT 0x8833 -#define GL_DRAW_BUFFER15_EXT 0x8834 -#define GL_COLOR_ATTACHMENT0_EXT 0x8CE0 -#define GL_COLOR_ATTACHMENT1_EXT 0x8CE1 -#define GL_COLOR_ATTACHMENT2_EXT 0x8CE2 -#define GL_COLOR_ATTACHMENT3_EXT 0x8CE3 -#define GL_COLOR_ATTACHMENT4_EXT 0x8CE4 -#define GL_COLOR_ATTACHMENT5_EXT 0x8CE5 -#define GL_COLOR_ATTACHMENT6_EXT 0x8CE6 -#define GL_COLOR_ATTACHMENT7_EXT 0x8CE7 -#define GL_COLOR_ATTACHMENT8_EXT 0x8CE8 -#define GL_COLOR_ATTACHMENT9_EXT 0x8CE9 -#define GL_COLOR_ATTACHMENT10_EXT 0x8CEA -#define GL_COLOR_ATTACHMENT11_EXT 0x8CEB -#define GL_COLOR_ATTACHMENT12_EXT 0x8CEC -#define GL_COLOR_ATTACHMENT13_EXT 0x8CED -#define GL_COLOR_ATTACHMENT14_EXT 0x8CEE -#define GL_COLOR_ATTACHMENT15_EXT 0x8CEF -typedef void (GL_APIENTRYP PFNGLDRAWBUFFERSEXTPROC) (GLsizei n, const GLenum *bufs); -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glDrawBuffersEXT (GLsizei n, const GLenum *bufs); -#endif -#endif /* GL_EXT_draw_buffers */ - -#ifndef GL_EXT_draw_buffers_indexed -#define GL_EXT_draw_buffers_indexed 1 -#define GL_MIN 0x8007 -#define GL_MAX 0x8008 -typedef void (GL_APIENTRYP PFNGLENABLEIEXTPROC) (GLenum target, GLuint index); -typedef void (GL_APIENTRYP PFNGLDISABLEIEXTPROC) (GLenum target, GLuint index); -typedef void (GL_APIENTRYP PFNGLBLENDEQUATIONIEXTPROC) (GLuint buf, GLenum mode); -typedef void (GL_APIENTRYP PFNGLBLENDEQUATIONSEPARATEIEXTPROC) (GLuint buf, GLenum modeRGB, GLenum modeAlpha); -typedef void (GL_APIENTRYP PFNGLBLENDFUNCIEXTPROC) (GLuint buf, GLenum src, GLenum dst); -typedef void (GL_APIENTRYP PFNGLBLENDFUNCSEPARATEIEXTPROC) (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha); -typedef void (GL_APIENTRYP PFNGLCOLORMASKIEXTPROC) (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a); -typedef GLboolean (GL_APIENTRYP PFNGLISENABLEDIEXTPROC) (GLenum target, GLuint index); -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glEnableiEXT (GLenum target, GLuint index); -GL_APICALL void GL_APIENTRY glDisableiEXT (GLenum target, GLuint index); -GL_APICALL void GL_APIENTRY glBlendEquationiEXT (GLuint buf, GLenum mode); -GL_APICALL void GL_APIENTRY glBlendEquationSeparateiEXT (GLuint buf, GLenum modeRGB, GLenum modeAlpha); -GL_APICALL void GL_APIENTRY glBlendFunciEXT (GLuint buf, GLenum src, GLenum dst); -GL_APICALL void GL_APIENTRY glBlendFuncSeparateiEXT (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha); -GL_APICALL void GL_APIENTRY glColorMaskiEXT (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a); -GL_APICALL GLboolean GL_APIENTRY glIsEnablediEXT (GLenum target, GLuint index); -#endif -#endif /* GL_EXT_draw_buffers_indexed */ - -#ifndef GL_EXT_draw_instanced -#define GL_EXT_draw_instanced 1 -typedef void (GL_APIENTRYP PFNGLDRAWARRAYSINSTANCEDEXTPROC) (GLenum mode, GLint start, GLsizei count, GLsizei primcount); -typedef void (GL_APIENTRYP PFNGLDRAWELEMENTSINSTANCEDEXTPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount); -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glDrawArraysInstancedEXT (GLenum mode, GLint start, GLsizei count, GLsizei primcount); -GL_APICALL void GL_APIENTRY glDrawElementsInstancedEXT (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount); -#endif -#endif /* GL_EXT_draw_instanced */ - -#ifndef GL_EXT_geometry_point_size -#define GL_EXT_geometry_point_size 1 -#endif /* GL_EXT_geometry_point_size */ - -#ifndef GL_EXT_geometry_shader -#define GL_EXT_geometry_shader 1 -#define GL_GEOMETRY_SHADER_EXT 0x8DD9 -#define GL_GEOMETRY_SHADER_BIT_EXT 0x00000004 -#define GL_GEOMETRY_LINKED_VERTICES_OUT_EXT 0x8916 -#define GL_GEOMETRY_LINKED_INPUT_TYPE_EXT 0x8917 -#define GL_GEOMETRY_LINKED_OUTPUT_TYPE_EXT 0x8918 -#define GL_GEOMETRY_SHADER_INVOCATIONS_EXT 0x887F -#define GL_LAYER_PROVOKING_VERTEX_EXT 0x825E -#ifndef GL_EXT_geometry_shader4 -#define GL_LINES_ADJACENCY_EXT 0x000A -#define GL_LINE_STRIP_ADJACENCY_EXT 0x000B -#define GL_TRIANGLES_ADJACENCY_EXT 0x000C -#define GL_TRIANGLE_STRIP_ADJACENCY_EXT 0x000D -#endif /* GL_EXT_geometry_shader4 */ -#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_EXT 0x8DDF -#define GL_MAX_GEOMETRY_UNIFORM_BLOCKS_EXT 0x8A2C -#define GL_MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS_EXT 0x8A32 -#define GL_MAX_GEOMETRY_INPUT_COMPONENTS_EXT 0x9123 -#define GL_MAX_GEOMETRY_OUTPUT_COMPONENTS_EXT 0x9124 -#define GL_MAX_GEOMETRY_OUTPUT_VERTICES_EXT 0x8DE0 -#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_EXT 0x8DE1 -#define GL_MAX_GEOMETRY_SHADER_INVOCATIONS_EXT 0x8E5A -#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT 0x8C29 -#define GL_MAX_GEOMETRY_ATOMIC_COUNTER_BUFFERS_EXT 0x92CF -#define GL_MAX_GEOMETRY_ATOMIC_COUNTERS_EXT 0x92D5 -#define GL_MAX_GEOMETRY_IMAGE_UNIFORMS_EXT 0x90CD -#define GL_MAX_GEOMETRY_SHADER_STORAGE_BLOCKS_EXT 0x90D7 -#define GL_FIRST_VERTEX_CONVENTION_EXT 0x8E4D -#define GL_LAST_VERTEX_CONVENTION_EXT 0x8E4E -#define GL_UNDEFINED_VERTEX_EXT 0x8260 -#define GL_PRIMITIVES_GENERATED_EXT 0x8C87 -#define GL_FRAMEBUFFER_DEFAULT_LAYERS_EXT 0x9312 -#define GL_MAX_FRAMEBUFFER_LAYERS_EXT 0x9317 -#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT 0x8DA8 -#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED_EXT 0x8DA7 -#define GL_REFERENCED_BY_GEOMETRY_SHADER_EXT 0x9309 -typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERTEXTUREEXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level); -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glFramebufferTextureEXT (GLenum target, GLenum attachment, GLuint texture, GLint level); -#endif -#endif /* GL_EXT_geometry_shader */ - -#ifndef GL_EXT_gpu_shader5 -#define GL_EXT_gpu_shader5 1 -#endif /* GL_EXT_gpu_shader5 */ - -#ifndef GL_EXT_instanced_arrays -#define GL_EXT_instanced_arrays 1 -#define GL_VERTEX_ATTRIB_ARRAY_DIVISOR_EXT 0x88FE -typedef void (GL_APIENTRYP PFNGLVERTEXATTRIBDIVISOREXTPROC) (GLuint index, GLuint divisor); -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glVertexAttribDivisorEXT (GLuint index, GLuint divisor); -#endif -#endif /* GL_EXT_instanced_arrays */ - -#ifndef GL_EXT_map_buffer_range -#define GL_EXT_map_buffer_range 1 -#define GL_MAP_READ_BIT_EXT 0x0001 -#define GL_MAP_WRITE_BIT_EXT 0x0002 -#define GL_MAP_INVALIDATE_RANGE_BIT_EXT 0x0004 -#define GL_MAP_INVALIDATE_BUFFER_BIT_EXT 0x0008 -#define GL_MAP_FLUSH_EXPLICIT_BIT_EXT 0x0010 -#define GL_MAP_UNSYNCHRONIZED_BIT_EXT 0x0020 -typedef void *(GL_APIENTRYP PFNGLMAPBUFFERRANGEEXTPROC) (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access); -typedef void (GL_APIENTRYP PFNGLFLUSHMAPPEDBUFFERRANGEEXTPROC) (GLenum target, GLintptr offset, GLsizeiptr length); -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void *GL_APIENTRY glMapBufferRangeEXT (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access); -GL_APICALL void GL_APIENTRY glFlushMappedBufferRangeEXT (GLenum target, GLintptr offset, GLsizeiptr length); -#endif -#endif /* GL_EXT_map_buffer_range */ - -#ifndef GL_EXT_multi_draw_arrays -#define GL_EXT_multi_draw_arrays 1 -typedef void (GL_APIENTRYP PFNGLMULTIDRAWARRAYSEXTPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount); -typedef void (GL_APIENTRYP PFNGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei primcount); -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glMultiDrawArraysEXT (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount); -GL_APICALL void GL_APIENTRY glMultiDrawElementsEXT (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei primcount); -#endif -#endif /* GL_EXT_multi_draw_arrays */ - -#ifndef GL_EXT_multisampled_render_to_texture -#define GL_EXT_multisampled_render_to_texture 1 -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_SAMPLES_EXT 0x8D6C -#define GL_RENDERBUFFER_SAMPLES_EXT 0x8CAB -#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT 0x8D56 -#define GL_MAX_SAMPLES_EXT 0x8D57 -typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); -typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DMULTISAMPLEEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLsizei samples); -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glRenderbufferStorageMultisampleEXT (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); -GL_APICALL void GL_APIENTRY glFramebufferTexture2DMultisampleEXT (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLsizei samples); -#endif -#endif /* GL_EXT_multisampled_render_to_texture */ - -#ifndef GL_EXT_multiview_draw_buffers -#define GL_EXT_multiview_draw_buffers 1 -#define GL_COLOR_ATTACHMENT_EXT 0x90F0 -#define GL_MULTIVIEW_EXT 0x90F1 -#define GL_DRAW_BUFFER_EXT 0x0C01 -#define GL_READ_BUFFER_EXT 0x0C02 -#define GL_MAX_MULTIVIEW_BUFFERS_EXT 0x90F2 -typedef void (GL_APIENTRYP PFNGLREADBUFFERINDEXEDEXTPROC) (GLenum src, GLint index); -typedef void (GL_APIENTRYP PFNGLDRAWBUFFERSINDEXEDEXTPROC) (GLint n, const GLenum *location, const GLint *indices); -typedef void (GL_APIENTRYP PFNGLGETINTEGERI_VEXTPROC) (GLenum target, GLuint index, GLint *data); -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glReadBufferIndexedEXT (GLenum src, GLint index); -GL_APICALL void GL_APIENTRY glDrawBuffersIndexedEXT (GLint n, const GLenum *location, const GLint *indices); -GL_APICALL void GL_APIENTRY glGetIntegeri_vEXT (GLenum target, GLuint index, GLint *data); -#endif -#endif /* GL_EXT_multiview_draw_buffers */ - -#ifndef GL_EXT_occlusion_query_boolean -#define GL_EXT_occlusion_query_boolean 1 -#define GL_ANY_SAMPLES_PASSED_EXT 0x8C2F -#define GL_ANY_SAMPLES_PASSED_CONSERVATIVE_EXT 0x8D6A -#endif /* GL_EXT_occlusion_query_boolean */ - -#ifndef GL_EXT_primitive_bounding_box -#define GL_EXT_primitive_bounding_box 1 -#define GL_PRIMITIVE_BOUNDING_BOX_EXT 0x92BE -typedef void (GL_APIENTRYP PFNGLPRIMITIVEBOUNDINGBOXEXTPROC) (GLfloat minX, GLfloat minY, GLfloat minZ, GLfloat minW, GLfloat maxX, GLfloat maxY, GLfloat maxZ, GLfloat maxW); -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glPrimitiveBoundingBoxEXT (GLfloat minX, GLfloat minY, GLfloat minZ, GLfloat minW, GLfloat maxX, GLfloat maxY, GLfloat maxZ, GLfloat maxW); -#endif -#endif /* GL_EXT_primitive_bounding_box */ - -#ifndef GL_EXT_pvrtc_sRGB -#define GL_EXT_pvrtc_sRGB 1 -#define GL_COMPRESSED_SRGB_PVRTC_2BPPV1_EXT 0x8A54 -#define GL_COMPRESSED_SRGB_PVRTC_4BPPV1_EXT 0x8A55 -#define GL_COMPRESSED_SRGB_ALPHA_PVRTC_2BPPV1_EXT 0x8A56 -#define GL_COMPRESSED_SRGB_ALPHA_PVRTC_4BPPV1_EXT 0x8A57 -#define GL_COMPRESSED_SRGB_ALPHA_PVRTC_2BPPV2_IMG 0x93F0 -#define GL_COMPRESSED_SRGB_ALPHA_PVRTC_4BPPV2_IMG 0x93F1 -#endif /* GL_EXT_pvrtc_sRGB */ - -#ifndef GL_EXT_read_format_bgra -#define GL_EXT_read_format_bgra 1 -#define GL_UNSIGNED_SHORT_4_4_4_4_REV_EXT 0x8365 -#define GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT 0x8366 -#endif /* GL_EXT_read_format_bgra */ - -#ifndef GL_EXT_robustness -#define GL_EXT_robustness 1 -#define GL_GUILTY_CONTEXT_RESET_EXT 0x8253 -#define GL_INNOCENT_CONTEXT_RESET_EXT 0x8254 -#define GL_UNKNOWN_CONTEXT_RESET_EXT 0x8255 -#define GL_CONTEXT_ROBUST_ACCESS_EXT 0x90F3 -#define GL_RESET_NOTIFICATION_STRATEGY_EXT 0x8256 -#define GL_LOSE_CONTEXT_ON_RESET_EXT 0x8252 -#define GL_NO_RESET_NOTIFICATION_EXT 0x8261 -typedef GLenum (GL_APIENTRYP PFNGLGETGRAPHICSRESETSTATUSEXTPROC) (void); -typedef void (GL_APIENTRYP PFNGLREADNPIXELSEXTPROC) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void *data); -typedef void (GL_APIENTRYP PFNGLGETNUNIFORMFVEXTPROC) (GLuint program, GLint location, GLsizei bufSize, GLfloat *params); -typedef void (GL_APIENTRYP PFNGLGETNUNIFORMIVEXTPROC) (GLuint program, GLint location, GLsizei bufSize, GLint *params); -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL GLenum GL_APIENTRY glGetGraphicsResetStatusEXT (void); -GL_APICALL void GL_APIENTRY glReadnPixelsEXT (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void *data); -GL_APICALL void GL_APIENTRY glGetnUniformfvEXT (GLuint program, GLint location, GLsizei bufSize, GLfloat *params); -GL_APICALL void GL_APIENTRY glGetnUniformivEXT (GLuint program, GLint location, GLsizei bufSize, GLint *params); -#endif -#endif /* GL_EXT_robustness */ - -#ifndef GL_EXT_sRGB -#define GL_EXT_sRGB 1 -#define GL_SRGB_EXT 0x8C40 -#define GL_SRGB_ALPHA_EXT 0x8C42 -#define GL_SRGB8_ALPHA8_EXT 0x8C43 -#define GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING_EXT 0x8210 -#endif /* GL_EXT_sRGB */ - -#ifndef GL_EXT_sRGB_write_control -#define GL_EXT_sRGB_write_control 1 -#define GL_FRAMEBUFFER_SRGB_EXT 0x8DB9 -#endif /* GL_EXT_sRGB_write_control */ - -#ifndef GL_EXT_separate_shader_objects -#define GL_EXT_separate_shader_objects 1 -#define GL_ACTIVE_PROGRAM_EXT 0x8259 -#define GL_VERTEX_SHADER_BIT_EXT 0x00000001 -#define GL_FRAGMENT_SHADER_BIT_EXT 0x00000002 -#define GL_ALL_SHADER_BITS_EXT 0xFFFFFFFF -#define GL_PROGRAM_SEPARABLE_EXT 0x8258 -#define GL_PROGRAM_PIPELINE_BINDING_EXT 0x825A -typedef void (GL_APIENTRYP PFNGLACTIVESHADERPROGRAMEXTPROC) (GLuint pipeline, GLuint program); -typedef void (GL_APIENTRYP PFNGLBINDPROGRAMPIPELINEEXTPROC) (GLuint pipeline); -typedef GLuint (GL_APIENTRYP PFNGLCREATESHADERPROGRAMVEXTPROC) (GLenum type, GLsizei count, const GLchar **strings); -typedef void (GL_APIENTRYP PFNGLDELETEPROGRAMPIPELINESEXTPROC) (GLsizei n, const GLuint *pipelines); -typedef void (GL_APIENTRYP PFNGLGENPROGRAMPIPELINESEXTPROC) (GLsizei n, GLuint *pipelines); -typedef void (GL_APIENTRYP PFNGLGETPROGRAMPIPELINEINFOLOGEXTPROC) (GLuint pipeline, GLsizei bufSize, GLsizei *length, GLchar *infoLog); -typedef void (GL_APIENTRYP PFNGLGETPROGRAMPIPELINEIVEXTPROC) (GLuint pipeline, GLenum pname, GLint *params); -typedef GLboolean (GL_APIENTRYP PFNGLISPROGRAMPIPELINEEXTPROC) (GLuint pipeline); -typedef void (GL_APIENTRYP PFNGLPROGRAMPARAMETERIEXTPROC) (GLuint program, GLenum pname, GLint value); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM1FEXTPROC) (GLuint program, GLint location, GLfloat v0); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM1FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM1IEXTPROC) (GLuint program, GLint location, GLint v0); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM1IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM2FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM2FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM2IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM2IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM3FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM3FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM3IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM3IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM4FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM4FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM4IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM4IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (GL_APIENTRYP PFNGLUSEPROGRAMSTAGESEXTPROC) (GLuint pipeline, GLbitfield stages, GLuint program); -typedef void (GL_APIENTRYP PFNGLVALIDATEPROGRAMPIPELINEEXTPROC) (GLuint pipeline); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM1UIEXTPROC) (GLuint program, GLint location, GLuint v0); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM2UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM3UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM4UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM1UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM2UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM3UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM4UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glActiveShaderProgramEXT (GLuint pipeline, GLuint program); -GL_APICALL void GL_APIENTRY glBindProgramPipelineEXT (GLuint pipeline); -GL_APICALL GLuint GL_APIENTRY glCreateShaderProgramvEXT (GLenum type, GLsizei count, const GLchar **strings); -GL_APICALL void GL_APIENTRY glDeleteProgramPipelinesEXT (GLsizei n, const GLuint *pipelines); -GL_APICALL void GL_APIENTRY glGenProgramPipelinesEXT (GLsizei n, GLuint *pipelines); -GL_APICALL void GL_APIENTRY glGetProgramPipelineInfoLogEXT (GLuint pipeline, GLsizei bufSize, GLsizei *length, GLchar *infoLog); -GL_APICALL void GL_APIENTRY glGetProgramPipelineivEXT (GLuint pipeline, GLenum pname, GLint *params); -GL_APICALL GLboolean GL_APIENTRY glIsProgramPipelineEXT (GLuint pipeline); -GL_APICALL void GL_APIENTRY glProgramParameteriEXT (GLuint program, GLenum pname, GLint value); -GL_APICALL void GL_APIENTRY glProgramUniform1fEXT (GLuint program, GLint location, GLfloat v0); -GL_APICALL void GL_APIENTRY glProgramUniform1fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value); -GL_APICALL void GL_APIENTRY glProgramUniform1iEXT (GLuint program, GLint location, GLint v0); -GL_APICALL void GL_APIENTRY glProgramUniform1ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value); -GL_APICALL void GL_APIENTRY glProgramUniform2fEXT (GLuint program, GLint location, GLfloat v0, GLfloat v1); -GL_APICALL void GL_APIENTRY glProgramUniform2fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value); -GL_APICALL void GL_APIENTRY glProgramUniform2iEXT (GLuint program, GLint location, GLint v0, GLint v1); -GL_APICALL void GL_APIENTRY glProgramUniform2ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value); -GL_APICALL void GL_APIENTRY glProgramUniform3fEXT (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2); -GL_APICALL void GL_APIENTRY glProgramUniform3fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value); -GL_APICALL void GL_APIENTRY glProgramUniform3iEXT (GLuint program, GLint location, GLint v0, GLint v1, GLint v2); -GL_APICALL void GL_APIENTRY glProgramUniform3ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value); -GL_APICALL void GL_APIENTRY glProgramUniform4fEXT (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3); -GL_APICALL void GL_APIENTRY glProgramUniform4fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value); -GL_APICALL void GL_APIENTRY glProgramUniform4iEXT (GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3); -GL_APICALL void GL_APIENTRY glProgramUniform4ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value); -GL_APICALL void GL_APIENTRY glProgramUniformMatrix2fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GL_APICALL void GL_APIENTRY glProgramUniformMatrix3fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GL_APICALL void GL_APIENTRY glProgramUniformMatrix4fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GL_APICALL void GL_APIENTRY glUseProgramStagesEXT (GLuint pipeline, GLbitfield stages, GLuint program); -GL_APICALL void GL_APIENTRY glValidateProgramPipelineEXT (GLuint pipeline); -GL_APICALL void GL_APIENTRY glProgramUniform1uiEXT (GLuint program, GLint location, GLuint v0); -GL_APICALL void GL_APIENTRY glProgramUniform2uiEXT (GLuint program, GLint location, GLuint v0, GLuint v1); -GL_APICALL void GL_APIENTRY glProgramUniform3uiEXT (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2); -GL_APICALL void GL_APIENTRY glProgramUniform4uiEXT (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3); -GL_APICALL void GL_APIENTRY glProgramUniform1uivEXT (GLuint program, GLint location, GLsizei count, const GLuint *value); -GL_APICALL void GL_APIENTRY glProgramUniform2uivEXT (GLuint program, GLint location, GLsizei count, const GLuint *value); -GL_APICALL void GL_APIENTRY glProgramUniform3uivEXT (GLuint program, GLint location, GLsizei count, const GLuint *value); -GL_APICALL void GL_APIENTRY glProgramUniform4uivEXT (GLuint program, GLint location, GLsizei count, const GLuint *value); -GL_APICALL void GL_APIENTRY glProgramUniformMatrix2x3fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GL_APICALL void GL_APIENTRY glProgramUniformMatrix3x2fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GL_APICALL void GL_APIENTRY glProgramUniformMatrix2x4fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GL_APICALL void GL_APIENTRY glProgramUniformMatrix4x2fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GL_APICALL void GL_APIENTRY glProgramUniformMatrix3x4fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GL_APICALL void GL_APIENTRY glProgramUniformMatrix4x3fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -#endif -#endif /* GL_EXT_separate_shader_objects */ - -#ifndef GL_EXT_shader_framebuffer_fetch -#define GL_EXT_shader_framebuffer_fetch 1 -#define GL_FRAGMENT_SHADER_DISCARDS_SAMPLES_EXT 0x8A52 -#endif /* GL_EXT_shader_framebuffer_fetch */ - -#ifndef GL_EXT_shader_implicit_conversions -#define GL_EXT_shader_implicit_conversions 1 -#endif /* GL_EXT_shader_implicit_conversions */ - -#ifndef GL_EXT_shader_integer_mix -#define GL_EXT_shader_integer_mix 1 -#endif /* GL_EXT_shader_integer_mix */ - -#ifndef GL_EXT_shader_io_blocks -#define GL_EXT_shader_io_blocks 1 -#endif /* GL_EXT_shader_io_blocks */ - -#ifndef GL_EXT_shader_pixel_local_storage -#define GL_EXT_shader_pixel_local_storage 1 -#define GL_MAX_SHADER_PIXEL_LOCAL_STORAGE_FAST_SIZE_EXT 0x8F63 -#define GL_MAX_SHADER_PIXEL_LOCAL_STORAGE_SIZE_EXT 0x8F67 -#define GL_SHADER_PIXEL_LOCAL_STORAGE_EXT 0x8F64 -#endif /* GL_EXT_shader_pixel_local_storage */ - -#ifndef GL_EXT_shader_texture_lod -#define GL_EXT_shader_texture_lod 1 -#endif /* GL_EXT_shader_texture_lod */ - -#ifndef GL_EXT_shadow_samplers -#define GL_EXT_shadow_samplers 1 -#define GL_TEXTURE_COMPARE_MODE_EXT 0x884C -#define GL_TEXTURE_COMPARE_FUNC_EXT 0x884D -#define GL_COMPARE_REF_TO_TEXTURE_EXT 0x884E -#define GL_SAMPLER_2D_SHADOW_EXT 0x8B62 -#endif /* GL_EXT_shadow_samplers */ - -#ifndef GL_EXT_tessellation_point_size -#define GL_EXT_tessellation_point_size 1 -#endif /* GL_EXT_tessellation_point_size */ - -#ifndef GL_EXT_tessellation_shader -#define GL_EXT_tessellation_shader 1 -#define GL_PATCHES_EXT 0x000E -#define GL_PATCH_VERTICES_EXT 0x8E72 -#define GL_TESS_CONTROL_OUTPUT_VERTICES_EXT 0x8E75 -#define GL_TESS_GEN_MODE_EXT 0x8E76 -#define GL_TESS_GEN_SPACING_EXT 0x8E77 -#define GL_TESS_GEN_VERTEX_ORDER_EXT 0x8E78 -#define GL_TESS_GEN_POINT_MODE_EXT 0x8E79 -#define GL_ISOLINES_EXT 0x8E7A -#define GL_QUADS_EXT 0x0007 -#define GL_FRACTIONAL_ODD_EXT 0x8E7B -#define GL_FRACTIONAL_EVEN_EXT 0x8E7C -#define GL_MAX_PATCH_VERTICES_EXT 0x8E7D -#define GL_MAX_TESS_GEN_LEVEL_EXT 0x8E7E -#define GL_MAX_TESS_CONTROL_UNIFORM_COMPONENTS_EXT 0x8E7F -#define GL_MAX_TESS_EVALUATION_UNIFORM_COMPONENTS_EXT 0x8E80 -#define GL_MAX_TESS_CONTROL_TEXTURE_IMAGE_UNITS_EXT 0x8E81 -#define GL_MAX_TESS_EVALUATION_TEXTURE_IMAGE_UNITS_EXT 0x8E82 -#define GL_MAX_TESS_CONTROL_OUTPUT_COMPONENTS_EXT 0x8E83 -#define GL_MAX_TESS_PATCH_COMPONENTS_EXT 0x8E84 -#define GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS_EXT 0x8E85 -#define GL_MAX_TESS_EVALUATION_OUTPUT_COMPONENTS_EXT 0x8E86 -#define GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS_EXT 0x8E89 -#define GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS_EXT 0x8E8A -#define GL_MAX_TESS_CONTROL_INPUT_COMPONENTS_EXT 0x886C -#define GL_MAX_TESS_EVALUATION_INPUT_COMPONENTS_EXT 0x886D -#define GL_MAX_COMBINED_TESS_CONTROL_UNIFORM_COMPONENTS_EXT 0x8E1E -#define GL_MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS_EXT 0x8E1F -#define GL_MAX_TESS_CONTROL_ATOMIC_COUNTER_BUFFERS_EXT 0x92CD -#define GL_MAX_TESS_EVALUATION_ATOMIC_COUNTER_BUFFERS_EXT 0x92CE -#define GL_MAX_TESS_CONTROL_ATOMIC_COUNTERS_EXT 0x92D3 -#define GL_MAX_TESS_EVALUATION_ATOMIC_COUNTERS_EXT 0x92D4 -#define GL_MAX_TESS_CONTROL_IMAGE_UNIFORMS_EXT 0x90CB -#define GL_MAX_TESS_EVALUATION_IMAGE_UNIFORMS_EXT 0x90CC -#define GL_MAX_TESS_CONTROL_SHADER_STORAGE_BLOCKS_EXT 0x90D8 -#define GL_MAX_TESS_EVALUATION_SHADER_STORAGE_BLOCKS_EXT 0x90D9 -#define GL_PRIMITIVE_RESTART_FOR_PATCHES_SUPPORTED 0x8221 -#define GL_IS_PER_PATCH_EXT 0x92E7 -#define GL_REFERENCED_BY_TESS_CONTROL_SHADER_EXT 0x9307 -#define GL_REFERENCED_BY_TESS_EVALUATION_SHADER_EXT 0x9308 -#define GL_TESS_CONTROL_SHADER_EXT 0x8E88 -#define GL_TESS_EVALUATION_SHADER_EXT 0x8E87 -#define GL_TESS_CONTROL_SHADER_BIT_EXT 0x00000008 -#define GL_TESS_EVALUATION_SHADER_BIT_EXT 0x00000010 -typedef void (GL_APIENTRYP PFNGLPATCHPARAMETERIEXTPROC) (GLenum pname, GLint value); -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glPatchParameteriEXT (GLenum pname, GLint value); -#endif -#endif /* GL_EXT_tessellation_shader */ - -#ifndef GL_EXT_texture_border_clamp -#define GL_EXT_texture_border_clamp 1 -#define GL_TEXTURE_BORDER_COLOR_EXT 0x1004 -#define GL_CLAMP_TO_BORDER_EXT 0x812D -typedef void (GL_APIENTRYP PFNGLTEXPARAMETERIIVEXTPROC) (GLenum target, GLenum pname, const GLint *params); -typedef void (GL_APIENTRYP PFNGLTEXPARAMETERIUIVEXTPROC) (GLenum target, GLenum pname, const GLuint *params); -typedef void (GL_APIENTRYP PFNGLGETTEXPARAMETERIIVEXTPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (GL_APIENTRYP PFNGLGETTEXPARAMETERIUIVEXTPROC) (GLenum target, GLenum pname, GLuint *params); -typedef void (GL_APIENTRYP PFNGLSAMPLERPARAMETERIIVEXTPROC) (GLuint sampler, GLenum pname, const GLint *param); -typedef void (GL_APIENTRYP PFNGLSAMPLERPARAMETERIUIVEXTPROC) (GLuint sampler, GLenum pname, const GLuint *param); -typedef void (GL_APIENTRYP PFNGLGETSAMPLERPARAMETERIIVEXTPROC) (GLuint sampler, GLenum pname, GLint *params); -typedef void (GL_APIENTRYP PFNGLGETSAMPLERPARAMETERIUIVEXTPROC) (GLuint sampler, GLenum pname, GLuint *params); -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glTexParameterIivEXT (GLenum target, GLenum pname, const GLint *params); -GL_APICALL void GL_APIENTRY glTexParameterIuivEXT (GLenum target, GLenum pname, const GLuint *params); -GL_APICALL void GL_APIENTRY glGetTexParameterIivEXT (GLenum target, GLenum pname, GLint *params); -GL_APICALL void GL_APIENTRY glGetTexParameterIuivEXT (GLenum target, GLenum pname, GLuint *params); -GL_APICALL void GL_APIENTRY glSamplerParameterIivEXT (GLuint sampler, GLenum pname, const GLint *param); -GL_APICALL void GL_APIENTRY glSamplerParameterIuivEXT (GLuint sampler, GLenum pname, const GLuint *param); -GL_APICALL void GL_APIENTRY glGetSamplerParameterIivEXT (GLuint sampler, GLenum pname, GLint *params); -GL_APICALL void GL_APIENTRY glGetSamplerParameterIuivEXT (GLuint sampler, GLenum pname, GLuint *params); -#endif -#endif /* GL_EXT_texture_border_clamp */ - -#ifndef GL_EXT_texture_buffer -#define GL_EXT_texture_buffer 1 -#define GL_TEXTURE_BUFFER_EXT 0x8C2A -#define GL_TEXTURE_BUFFER_BINDING_EXT 0x8C2A -#define GL_MAX_TEXTURE_BUFFER_SIZE_EXT 0x8C2B -#define GL_TEXTURE_BINDING_BUFFER_EXT 0x8C2C -#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING_EXT 0x8C2D -#define GL_TEXTURE_BUFFER_OFFSET_ALIGNMENT_EXT 0x919F -#define GL_SAMPLER_BUFFER_EXT 0x8DC2 -#define GL_INT_SAMPLER_BUFFER_EXT 0x8DD0 -#define GL_UNSIGNED_INT_SAMPLER_BUFFER_EXT 0x8DD8 -#define GL_IMAGE_BUFFER_EXT 0x9051 -#define GL_INT_IMAGE_BUFFER_EXT 0x905C -#define GL_UNSIGNED_INT_IMAGE_BUFFER_EXT 0x9067 -#define GL_TEXTURE_BUFFER_OFFSET_EXT 0x919D -#define GL_TEXTURE_BUFFER_SIZE_EXT 0x919E -typedef void (GL_APIENTRYP PFNGLTEXBUFFEREXTPROC) (GLenum target, GLenum internalformat, GLuint buffer); -typedef void (GL_APIENTRYP PFNGLTEXBUFFERRANGEEXTPROC) (GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size); -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glTexBufferEXT (GLenum target, GLenum internalformat, GLuint buffer); -GL_APICALL void GL_APIENTRY glTexBufferRangeEXT (GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size); -#endif -#endif /* GL_EXT_texture_buffer */ - -#ifndef GL_EXT_texture_compression_dxt1 -#define GL_EXT_texture_compression_dxt1 1 -#define GL_COMPRESSED_RGB_S3TC_DXT1_EXT 0x83F0 -#define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT 0x83F1 -#endif /* GL_EXT_texture_compression_dxt1 */ - -#ifndef GL_EXT_texture_compression_s3tc -#define GL_EXT_texture_compression_s3tc 1 -#define GL_COMPRESSED_RGBA_S3TC_DXT3_EXT 0x83F2 -#define GL_COMPRESSED_RGBA_S3TC_DXT5_EXT 0x83F3 -#endif /* GL_EXT_texture_compression_s3tc */ - -#ifndef GL_EXT_texture_cube_map_array -#define GL_EXT_texture_cube_map_array 1 -#define GL_TEXTURE_CUBE_MAP_ARRAY_EXT 0x9009 -#define GL_TEXTURE_BINDING_CUBE_MAP_ARRAY_EXT 0x900A -#define GL_SAMPLER_CUBE_MAP_ARRAY_EXT 0x900C -#define GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW_EXT 0x900D -#define GL_INT_SAMPLER_CUBE_MAP_ARRAY_EXT 0x900E -#define GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY_EXT 0x900F -#define GL_IMAGE_CUBE_MAP_ARRAY_EXT 0x9054 -#define GL_INT_IMAGE_CUBE_MAP_ARRAY_EXT 0x905F -#define GL_UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY_EXT 0x906A -#endif /* GL_EXT_texture_cube_map_array */ - -#ifndef GL_EXT_texture_filter_anisotropic -#define GL_EXT_texture_filter_anisotropic 1 -#define GL_TEXTURE_MAX_ANISOTROPY_EXT 0x84FE -#define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF -#endif /* GL_EXT_texture_filter_anisotropic */ - -#ifndef GL_EXT_texture_format_BGRA8888 -#define GL_EXT_texture_format_BGRA8888 1 -#endif /* GL_EXT_texture_format_BGRA8888 */ - -#ifndef GL_EXT_texture_rg -#define GL_EXT_texture_rg 1 -#define GL_RED_EXT 0x1903 -#define GL_RG_EXT 0x8227 -#define GL_R8_EXT 0x8229 -#define GL_RG8_EXT 0x822B -#endif /* GL_EXT_texture_rg */ - -#ifndef GL_EXT_texture_sRGB_decode -#define GL_EXT_texture_sRGB_decode 1 -#define GL_TEXTURE_SRGB_DECODE_EXT 0x8A48 -#define GL_DECODE_EXT 0x8A49 -#define GL_SKIP_DECODE_EXT 0x8A4A -#endif /* GL_EXT_texture_sRGB_decode */ - -#ifndef GL_EXT_texture_storage -#define GL_EXT_texture_storage 1 -#define GL_TEXTURE_IMMUTABLE_FORMAT_EXT 0x912F -#define GL_ALPHA8_EXT 0x803C -#define GL_LUMINANCE8_EXT 0x8040 -#define GL_LUMINANCE8_ALPHA8_EXT 0x8045 -#define GL_RGBA32F_EXT 0x8814 -#define GL_RGB32F_EXT 0x8815 -#define GL_ALPHA32F_EXT 0x8816 -#define GL_LUMINANCE32F_EXT 0x8818 -#define GL_LUMINANCE_ALPHA32F_EXT 0x8819 -#define GL_ALPHA16F_EXT 0x881C -#define GL_LUMINANCE16F_EXT 0x881E -#define GL_LUMINANCE_ALPHA16F_EXT 0x881F -#define GL_R32F_EXT 0x822E -#define GL_RG32F_EXT 0x8230 -typedef void (GL_APIENTRYP PFNGLTEXSTORAGE1DEXTPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width); -typedef void (GL_APIENTRYP PFNGLTEXSTORAGE2DEXTPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height); -typedef void (GL_APIENTRYP PFNGLTEXSTORAGE3DEXTPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth); -typedef void (GL_APIENTRYP PFNGLTEXTURESTORAGE1DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width); -typedef void (GL_APIENTRYP PFNGLTEXTURESTORAGE2DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height); -typedef void (GL_APIENTRYP PFNGLTEXTURESTORAGE3DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth); -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glTexStorage1DEXT (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width); -GL_APICALL void GL_APIENTRY glTexStorage2DEXT (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height); -GL_APICALL void GL_APIENTRY glTexStorage3DEXT (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth); -GL_APICALL void GL_APIENTRY glTextureStorage1DEXT (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width); -GL_APICALL void GL_APIENTRY glTextureStorage2DEXT (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height); -GL_APICALL void GL_APIENTRY glTextureStorage3DEXT (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth); -#endif -#endif /* GL_EXT_texture_storage */ - -#ifndef GL_EXT_texture_type_2_10_10_10_REV -#define GL_EXT_texture_type_2_10_10_10_REV 1 -#define GL_UNSIGNED_INT_2_10_10_10_REV_EXT 0x8368 -#endif /* GL_EXT_texture_type_2_10_10_10_REV */ - -#ifndef GL_EXT_texture_view -#define GL_EXT_texture_view 1 -#define GL_TEXTURE_VIEW_MIN_LEVEL_EXT 0x82DB -#define GL_TEXTURE_VIEW_NUM_LEVELS_EXT 0x82DC -#define GL_TEXTURE_VIEW_MIN_LAYER_EXT 0x82DD -#define GL_TEXTURE_VIEW_NUM_LAYERS_EXT 0x82DE -#define GL_TEXTURE_IMMUTABLE_LEVELS 0x82DF -typedef void (GL_APIENTRYP PFNGLTEXTUREVIEWEXTPROC) (GLuint texture, GLenum target, GLuint origtexture, GLenum internalformat, GLuint minlevel, GLuint numlevels, GLuint minlayer, GLuint numlayers); -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glTextureViewEXT (GLuint texture, GLenum target, GLuint origtexture, GLenum internalformat, GLuint minlevel, GLuint numlevels, GLuint minlayer, GLuint numlayers); -#endif -#endif /* GL_EXT_texture_view */ - -#ifndef GL_EXT_unpack_subimage -#define GL_EXT_unpack_subimage 1 -#define GL_UNPACK_ROW_LENGTH_EXT 0x0CF2 -#define GL_UNPACK_SKIP_ROWS_EXT 0x0CF3 -#define GL_UNPACK_SKIP_PIXELS_EXT 0x0CF4 -#endif /* GL_EXT_unpack_subimage */ - -#ifndef GL_FJ_shader_binary_GCCSO -#define GL_FJ_shader_binary_GCCSO 1 -#define GL_GCCSO_SHADER_BINARY_FJ 0x9260 -#endif /* GL_FJ_shader_binary_GCCSO */ - -#ifndef GL_IMG_multisampled_render_to_texture -#define GL_IMG_multisampled_render_to_texture 1 -#define GL_RENDERBUFFER_SAMPLES_IMG 0x9133 -#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_IMG 0x9134 -#define GL_MAX_SAMPLES_IMG 0x9135 -#define GL_TEXTURE_SAMPLES_IMG 0x9136 -typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEIMGPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); -typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DMULTISAMPLEIMGPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLsizei samples); -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glRenderbufferStorageMultisampleIMG (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); -GL_APICALL void GL_APIENTRY glFramebufferTexture2DMultisampleIMG (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLsizei samples); -#endif -#endif /* GL_IMG_multisampled_render_to_texture */ - -#ifndef GL_IMG_program_binary -#define GL_IMG_program_binary 1 -#define GL_SGX_PROGRAM_BINARY_IMG 0x9130 -#endif /* GL_IMG_program_binary */ - -#ifndef GL_IMG_read_format -#define GL_IMG_read_format 1 -#define GL_BGRA_IMG 0x80E1 -#define GL_UNSIGNED_SHORT_4_4_4_4_REV_IMG 0x8365 -#endif /* GL_IMG_read_format */ - -#ifndef GL_IMG_shader_binary -#define GL_IMG_shader_binary 1 -#define GL_SGX_BINARY_IMG 0x8C0A -#endif /* GL_IMG_shader_binary */ - -#ifndef GL_IMG_texture_compression_pvrtc -#define GL_IMG_texture_compression_pvrtc 1 -#define GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG 0x8C00 -#define GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG 0x8C01 -#define GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG 0x8C02 -#define GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG 0x8C03 -#endif /* GL_IMG_texture_compression_pvrtc */ - -#ifndef GL_IMG_texture_compression_pvrtc2 -#define GL_IMG_texture_compression_pvrtc2 1 -#define GL_COMPRESSED_RGBA_PVRTC_2BPPV2_IMG 0x9137 -#define GL_COMPRESSED_RGBA_PVRTC_4BPPV2_IMG 0x9138 -#endif /* GL_IMG_texture_compression_pvrtc2 */ - -#ifndef GL_INTEL_performance_query -#define GL_INTEL_performance_query 1 -#define GL_PERFQUERY_SINGLE_CONTEXT_INTEL 0x00000000 -#define GL_PERFQUERY_GLOBAL_CONTEXT_INTEL 0x00000001 -#define GL_PERFQUERY_WAIT_INTEL 0x83FB -#define GL_PERFQUERY_FLUSH_INTEL 0x83FA -#define GL_PERFQUERY_DONOT_FLUSH_INTEL 0x83F9 -#define GL_PERFQUERY_COUNTER_EVENT_INTEL 0x94F0 -#define GL_PERFQUERY_COUNTER_DURATION_NORM_INTEL 0x94F1 -#define GL_PERFQUERY_COUNTER_DURATION_RAW_INTEL 0x94F2 -#define GL_PERFQUERY_COUNTER_THROUGHPUT_INTEL 0x94F3 -#define GL_PERFQUERY_COUNTER_RAW_INTEL 0x94F4 -#define GL_PERFQUERY_COUNTER_TIMESTAMP_INTEL 0x94F5 -#define GL_PERFQUERY_COUNTER_DATA_UINT32_INTEL 0x94F8 -#define GL_PERFQUERY_COUNTER_DATA_UINT64_INTEL 0x94F9 -#define GL_PERFQUERY_COUNTER_DATA_FLOAT_INTEL 0x94FA -#define GL_PERFQUERY_COUNTER_DATA_DOUBLE_INTEL 0x94FB -#define GL_PERFQUERY_COUNTER_DATA_BOOL32_INTEL 0x94FC -#define GL_PERFQUERY_QUERY_NAME_LENGTH_MAX_INTEL 0x94FD -#define GL_PERFQUERY_COUNTER_NAME_LENGTH_MAX_INTEL 0x94FE -#define GL_PERFQUERY_COUNTER_DESC_LENGTH_MAX_INTEL 0x94FF -#define GL_PERFQUERY_GPA_EXTENDED_COUNTERS_INTEL 0x9500 -typedef void (GL_APIENTRYP PFNGLBEGINPERFQUERYINTELPROC) (GLuint queryHandle); -typedef void (GL_APIENTRYP PFNGLCREATEPERFQUERYINTELPROC) (GLuint queryId, GLuint *queryHandle); -typedef void (GL_APIENTRYP PFNGLDELETEPERFQUERYINTELPROC) (GLuint queryHandle); -typedef void (GL_APIENTRYP PFNGLENDPERFQUERYINTELPROC) (GLuint queryHandle); -typedef void (GL_APIENTRYP PFNGLGETFIRSTPERFQUERYIDINTELPROC) (GLuint *queryId); -typedef void (GL_APIENTRYP PFNGLGETNEXTPERFQUERYIDINTELPROC) (GLuint queryId, GLuint *nextQueryId); -typedef void (GL_APIENTRYP PFNGLGETPERFCOUNTERINFOINTELPROC) (GLuint queryId, GLuint counterId, GLuint counterNameLength, GLchar *counterName, GLuint counterDescLength, GLchar *counterDesc, GLuint *counterOffset, GLuint *counterDataSize, GLuint *counterTypeEnum, GLuint *counterDataTypeEnum, GLuint64 *rawCounterMaxValue); -typedef void (GL_APIENTRYP PFNGLGETPERFQUERYDATAINTELPROC) (GLuint queryHandle, GLuint flags, GLsizei dataSize, GLvoid *data, GLuint *bytesWritten); -typedef void (GL_APIENTRYP PFNGLGETPERFQUERYIDBYNAMEINTELPROC) (GLchar *queryName, GLuint *queryId); -typedef void (GL_APIENTRYP PFNGLGETPERFQUERYINFOINTELPROC) (GLuint queryId, GLuint queryNameLength, GLchar *queryName, GLuint *dataSize, GLuint *noCounters, GLuint *noInstances, GLuint *capsMask); -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glBeginPerfQueryINTEL (GLuint queryHandle); -GL_APICALL void GL_APIENTRY glCreatePerfQueryINTEL (GLuint queryId, GLuint *queryHandle); -GL_APICALL void GL_APIENTRY glDeletePerfQueryINTEL (GLuint queryHandle); -GL_APICALL void GL_APIENTRY glEndPerfQueryINTEL (GLuint queryHandle); -GL_APICALL void GL_APIENTRY glGetFirstPerfQueryIdINTEL (GLuint *queryId); -GL_APICALL void GL_APIENTRY glGetNextPerfQueryIdINTEL (GLuint queryId, GLuint *nextQueryId); -GL_APICALL void GL_APIENTRY glGetPerfCounterInfoINTEL (GLuint queryId, GLuint counterId, GLuint counterNameLength, GLchar *counterName, GLuint counterDescLength, GLchar *counterDesc, GLuint *counterOffset, GLuint *counterDataSize, GLuint *counterTypeEnum, GLuint *counterDataTypeEnum, GLuint64 *rawCounterMaxValue); -GL_APICALL void GL_APIENTRY glGetPerfQueryDataINTEL (GLuint queryHandle, GLuint flags, GLsizei dataSize, GLvoid *data, GLuint *bytesWritten); -GL_APICALL void GL_APIENTRY glGetPerfQueryIdByNameINTEL (GLchar *queryName, GLuint *queryId); -GL_APICALL void GL_APIENTRY glGetPerfQueryInfoINTEL (GLuint queryId, GLuint queryNameLength, GLchar *queryName, GLuint *dataSize, GLuint *noCounters, GLuint *noInstances, GLuint *capsMask); -#endif -#endif /* GL_INTEL_performance_query */ - -#ifndef GL_NV_blend_equation_advanced -#define GL_NV_blend_equation_advanced 1 -#define GL_BLEND_OVERLAP_NV 0x9281 -#define GL_BLEND_PREMULTIPLIED_SRC_NV 0x9280 -#define GL_BLUE_NV 0x1905 -#define GL_COLORBURN_NV 0x929A -#define GL_COLORDODGE_NV 0x9299 -#define GL_CONJOINT_NV 0x9284 -#define GL_CONTRAST_NV 0x92A1 -#define GL_DARKEN_NV 0x9297 -#define GL_DIFFERENCE_NV 0x929E -#define GL_DISJOINT_NV 0x9283 -#define GL_DST_ATOP_NV 0x928F -#define GL_DST_IN_NV 0x928B -#define GL_DST_NV 0x9287 -#define GL_DST_OUT_NV 0x928D -#define GL_DST_OVER_NV 0x9289 -#define GL_EXCLUSION_NV 0x92A0 -#define GL_GREEN_NV 0x1904 -#define GL_HARDLIGHT_NV 0x929B -#define GL_HARDMIX_NV 0x92A9 -#define GL_HSL_COLOR_NV 0x92AF -#define GL_HSL_HUE_NV 0x92AD -#define GL_HSL_LUMINOSITY_NV 0x92B0 -#define GL_HSL_SATURATION_NV 0x92AE -#define GL_INVERT_OVG_NV 0x92B4 -#define GL_INVERT_RGB_NV 0x92A3 -#define GL_LIGHTEN_NV 0x9298 -#define GL_LINEARBURN_NV 0x92A5 -#define GL_LINEARDODGE_NV 0x92A4 -#define GL_LINEARLIGHT_NV 0x92A7 -#define GL_MINUS_CLAMPED_NV 0x92B3 -#define GL_MINUS_NV 0x929F -#define GL_MULTIPLY_NV 0x9294 -#define GL_OVERLAY_NV 0x9296 -#define GL_PINLIGHT_NV 0x92A8 -#define GL_PLUS_CLAMPED_ALPHA_NV 0x92B2 -#define GL_PLUS_CLAMPED_NV 0x92B1 -#define GL_PLUS_DARKER_NV 0x9292 -#define GL_PLUS_NV 0x9291 -#define GL_RED_NV 0x1903 -#define GL_SCREEN_NV 0x9295 -#define GL_SOFTLIGHT_NV 0x929C -#define GL_SRC_ATOP_NV 0x928E -#define GL_SRC_IN_NV 0x928A -#define GL_SRC_NV 0x9286 -#define GL_SRC_OUT_NV 0x928C -#define GL_SRC_OVER_NV 0x9288 -#define GL_UNCORRELATED_NV 0x9282 -#define GL_VIVIDLIGHT_NV 0x92A6 -#define GL_XOR_NV 0x1506 -typedef void (GL_APIENTRYP PFNGLBLENDPARAMETERINVPROC) (GLenum pname, GLint value); -typedef void (GL_APIENTRYP PFNGLBLENDBARRIERNVPROC) (void); -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glBlendParameteriNV (GLenum pname, GLint value); -GL_APICALL void GL_APIENTRY glBlendBarrierNV (void); -#endif -#endif /* GL_NV_blend_equation_advanced */ - -#ifndef GL_NV_blend_equation_advanced_coherent -#define GL_NV_blend_equation_advanced_coherent 1 -#define GL_BLEND_ADVANCED_COHERENT_NV 0x9285 -#endif /* GL_NV_blend_equation_advanced_coherent */ - -#ifndef GL_NV_copy_buffer -#define GL_NV_copy_buffer 1 -#define GL_COPY_READ_BUFFER_NV 0x8F36 -#define GL_COPY_WRITE_BUFFER_NV 0x8F37 -typedef void (GL_APIENTRYP PFNGLCOPYBUFFERSUBDATANVPROC) (GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size); -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glCopyBufferSubDataNV (GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size); -#endif -#endif /* GL_NV_copy_buffer */ - -#ifndef GL_NV_coverage_sample -#define GL_NV_coverage_sample 1 -#define GL_COVERAGE_COMPONENT_NV 0x8ED0 -#define GL_COVERAGE_COMPONENT4_NV 0x8ED1 -#define GL_COVERAGE_ATTACHMENT_NV 0x8ED2 -#define GL_COVERAGE_BUFFERS_NV 0x8ED3 -#define GL_COVERAGE_SAMPLES_NV 0x8ED4 -#define GL_COVERAGE_ALL_FRAGMENTS_NV 0x8ED5 -#define GL_COVERAGE_EDGE_FRAGMENTS_NV 0x8ED6 -#define GL_COVERAGE_AUTOMATIC_NV 0x8ED7 -#define GL_COVERAGE_BUFFER_BIT_NV 0x00008000 -typedef void (GL_APIENTRYP PFNGLCOVERAGEMASKNVPROC) (GLboolean mask); -typedef void (GL_APIENTRYP PFNGLCOVERAGEOPERATIONNVPROC) (GLenum operation); -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glCoverageMaskNV (GLboolean mask); -GL_APICALL void GL_APIENTRY glCoverageOperationNV (GLenum operation); -#endif -#endif /* GL_NV_coverage_sample */ - -#ifndef GL_NV_depth_nonlinear -#define GL_NV_depth_nonlinear 1 -#define GL_DEPTH_COMPONENT16_NONLINEAR_NV 0x8E2C -#endif /* GL_NV_depth_nonlinear */ - -#ifndef GL_NV_draw_buffers -#define GL_NV_draw_buffers 1 -#define GL_MAX_DRAW_BUFFERS_NV 0x8824 -#define GL_DRAW_BUFFER0_NV 0x8825 -#define GL_DRAW_BUFFER1_NV 0x8826 -#define GL_DRAW_BUFFER2_NV 0x8827 -#define GL_DRAW_BUFFER3_NV 0x8828 -#define GL_DRAW_BUFFER4_NV 0x8829 -#define GL_DRAW_BUFFER5_NV 0x882A -#define GL_DRAW_BUFFER6_NV 0x882B -#define GL_DRAW_BUFFER7_NV 0x882C -#define GL_DRAW_BUFFER8_NV 0x882D -#define GL_DRAW_BUFFER9_NV 0x882E -#define GL_DRAW_BUFFER10_NV 0x882F -#define GL_DRAW_BUFFER11_NV 0x8830 -#define GL_DRAW_BUFFER12_NV 0x8831 -#define GL_DRAW_BUFFER13_NV 0x8832 -#define GL_DRAW_BUFFER14_NV 0x8833 -#define GL_DRAW_BUFFER15_NV 0x8834 -#define GL_COLOR_ATTACHMENT0_NV 0x8CE0 -#define GL_COLOR_ATTACHMENT1_NV 0x8CE1 -#define GL_COLOR_ATTACHMENT2_NV 0x8CE2 -#define GL_COLOR_ATTACHMENT3_NV 0x8CE3 -#define GL_COLOR_ATTACHMENT4_NV 0x8CE4 -#define GL_COLOR_ATTACHMENT5_NV 0x8CE5 -#define GL_COLOR_ATTACHMENT6_NV 0x8CE6 -#define GL_COLOR_ATTACHMENT7_NV 0x8CE7 -#define GL_COLOR_ATTACHMENT8_NV 0x8CE8 -#define GL_COLOR_ATTACHMENT9_NV 0x8CE9 -#define GL_COLOR_ATTACHMENT10_NV 0x8CEA -#define GL_COLOR_ATTACHMENT11_NV 0x8CEB -#define GL_COLOR_ATTACHMENT12_NV 0x8CEC -#define GL_COLOR_ATTACHMENT13_NV 0x8CED -#define GL_COLOR_ATTACHMENT14_NV 0x8CEE -#define GL_COLOR_ATTACHMENT15_NV 0x8CEF -typedef void (GL_APIENTRYP PFNGLDRAWBUFFERSNVPROC) (GLsizei n, const GLenum *bufs); -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glDrawBuffersNV (GLsizei n, const GLenum *bufs); -#endif -#endif /* GL_NV_draw_buffers */ - -#ifndef GL_NV_draw_instanced -#define GL_NV_draw_instanced 1 -typedef void (GL_APIENTRYP PFNGLDRAWARRAYSINSTANCEDNVPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount); -typedef void (GL_APIENTRYP PFNGLDRAWELEMENTSINSTANCEDNVPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount); -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glDrawArraysInstancedNV (GLenum mode, GLint first, GLsizei count, GLsizei primcount); -GL_APICALL void GL_APIENTRY glDrawElementsInstancedNV (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount); -#endif -#endif /* GL_NV_draw_instanced */ - -#ifndef GL_NV_explicit_attrib_location -#define GL_NV_explicit_attrib_location 1 -#endif /* GL_NV_explicit_attrib_location */ - -#ifndef GL_NV_fbo_color_attachments -#define GL_NV_fbo_color_attachments 1 -#define GL_MAX_COLOR_ATTACHMENTS_NV 0x8CDF -#endif /* GL_NV_fbo_color_attachments */ - -#ifndef GL_NV_fence -#define GL_NV_fence 1 -#define GL_ALL_COMPLETED_NV 0x84F2 -#define GL_FENCE_STATUS_NV 0x84F3 -#define GL_FENCE_CONDITION_NV 0x84F4 -typedef void (GL_APIENTRYP PFNGLDELETEFENCESNVPROC) (GLsizei n, const GLuint *fences); -typedef void (GL_APIENTRYP PFNGLGENFENCESNVPROC) (GLsizei n, GLuint *fences); -typedef GLboolean (GL_APIENTRYP PFNGLISFENCENVPROC) (GLuint fence); -typedef GLboolean (GL_APIENTRYP PFNGLTESTFENCENVPROC) (GLuint fence); -typedef void (GL_APIENTRYP PFNGLGETFENCEIVNVPROC) (GLuint fence, GLenum pname, GLint *params); -typedef void (GL_APIENTRYP PFNGLFINISHFENCENVPROC) (GLuint fence); -typedef void (GL_APIENTRYP PFNGLSETFENCENVPROC) (GLuint fence, GLenum condition); -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glDeleteFencesNV (GLsizei n, const GLuint *fences); -GL_APICALL void GL_APIENTRY glGenFencesNV (GLsizei n, GLuint *fences); -GL_APICALL GLboolean GL_APIENTRY glIsFenceNV (GLuint fence); -GL_APICALL GLboolean GL_APIENTRY glTestFenceNV (GLuint fence); -GL_APICALL void GL_APIENTRY glGetFenceivNV (GLuint fence, GLenum pname, GLint *params); -GL_APICALL void GL_APIENTRY glFinishFenceNV (GLuint fence); -GL_APICALL void GL_APIENTRY glSetFenceNV (GLuint fence, GLenum condition); -#endif -#endif /* GL_NV_fence */ - -#ifndef GL_NV_framebuffer_blit -#define GL_NV_framebuffer_blit 1 -#define GL_READ_FRAMEBUFFER_NV 0x8CA8 -#define GL_DRAW_FRAMEBUFFER_NV 0x8CA9 -#define GL_DRAW_FRAMEBUFFER_BINDING_NV 0x8CA6 -#define GL_READ_FRAMEBUFFER_BINDING_NV 0x8CAA -typedef void (GL_APIENTRYP PFNGLBLITFRAMEBUFFERNVPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glBlitFramebufferNV (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); -#endif -#endif /* GL_NV_framebuffer_blit */ - -#ifndef GL_NV_framebuffer_multisample -#define GL_NV_framebuffer_multisample 1 -#define GL_RENDERBUFFER_SAMPLES_NV 0x8CAB -#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_NV 0x8D56 -#define GL_MAX_SAMPLES_NV 0x8D57 -typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLENVPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glRenderbufferStorageMultisampleNV (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); -#endif -#endif /* GL_NV_framebuffer_multisample */ - -#ifndef GL_NV_generate_mipmap_sRGB -#define GL_NV_generate_mipmap_sRGB 1 -#endif /* GL_NV_generate_mipmap_sRGB */ - -#ifndef GL_NV_instanced_arrays -#define GL_NV_instanced_arrays 1 -#define GL_VERTEX_ATTRIB_ARRAY_DIVISOR_NV 0x88FE -typedef void (GL_APIENTRYP PFNGLVERTEXATTRIBDIVISORNVPROC) (GLuint index, GLuint divisor); -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glVertexAttribDivisorNV (GLuint index, GLuint divisor); -#endif -#endif /* GL_NV_instanced_arrays */ - -#ifndef GL_NV_non_square_matrices -#define GL_NV_non_square_matrices 1 -#define GL_FLOAT_MAT2x3_NV 0x8B65 -#define GL_FLOAT_MAT2x4_NV 0x8B66 -#define GL_FLOAT_MAT3x2_NV 0x8B67 -#define GL_FLOAT_MAT3x4_NV 0x8B68 -#define GL_FLOAT_MAT4x2_NV 0x8B69 -#define GL_FLOAT_MAT4x3_NV 0x8B6A -typedef void (GL_APIENTRYP PFNGLUNIFORMMATRIX2X3FVNVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (GL_APIENTRYP PFNGLUNIFORMMATRIX3X2FVNVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (GL_APIENTRYP PFNGLUNIFORMMATRIX2X4FVNVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (GL_APIENTRYP PFNGLUNIFORMMATRIX4X2FVNVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (GL_APIENTRYP PFNGLUNIFORMMATRIX3X4FVNVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (GL_APIENTRYP PFNGLUNIFORMMATRIX4X3FVNVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glUniformMatrix2x3fvNV (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GL_APICALL void GL_APIENTRY glUniformMatrix3x2fvNV (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GL_APICALL void GL_APIENTRY glUniformMatrix2x4fvNV (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GL_APICALL void GL_APIENTRY glUniformMatrix4x2fvNV (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GL_APICALL void GL_APIENTRY glUniformMatrix3x4fvNV (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GL_APICALL void GL_APIENTRY glUniformMatrix4x3fvNV (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -#endif -#endif /* GL_NV_non_square_matrices */ - -#ifndef GL_NV_read_buffer -#define GL_NV_read_buffer 1 -#define GL_READ_BUFFER_NV 0x0C02 -typedef void (GL_APIENTRYP PFNGLREADBUFFERNVPROC) (GLenum mode); -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glReadBufferNV (GLenum mode); -#endif -#endif /* GL_NV_read_buffer */ - -#ifndef GL_NV_read_buffer_front -#define GL_NV_read_buffer_front 1 -#endif /* GL_NV_read_buffer_front */ - -#ifndef GL_NV_read_depth -#define GL_NV_read_depth 1 -#endif /* GL_NV_read_depth */ - -#ifndef GL_NV_read_depth_stencil -#define GL_NV_read_depth_stencil 1 -#endif /* GL_NV_read_depth_stencil */ - -#ifndef GL_NV_read_stencil -#define GL_NV_read_stencil 1 -#endif /* GL_NV_read_stencil */ - -#ifndef GL_NV_sRGB_formats -#define GL_NV_sRGB_formats 1 -#define GL_SLUMINANCE_NV 0x8C46 -#define GL_SLUMINANCE_ALPHA_NV 0x8C44 -#define GL_SRGB8_NV 0x8C41 -#define GL_SLUMINANCE8_NV 0x8C47 -#define GL_SLUMINANCE8_ALPHA8_NV 0x8C45 -#define GL_COMPRESSED_SRGB_S3TC_DXT1_NV 0x8C4C -#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_NV 0x8C4D -#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_NV 0x8C4E -#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_NV 0x8C4F -#define GL_ETC1_SRGB8_NV 0x88EE -#endif /* GL_NV_sRGB_formats */ - -#ifndef GL_NV_shadow_samplers_array -#define GL_NV_shadow_samplers_array 1 -#define GL_SAMPLER_2D_ARRAY_SHADOW_NV 0x8DC4 -#endif /* GL_NV_shadow_samplers_array */ - -#ifndef GL_NV_shadow_samplers_cube -#define GL_NV_shadow_samplers_cube 1 -#define GL_SAMPLER_CUBE_SHADOW_NV 0x8DC5 -#endif /* GL_NV_shadow_samplers_cube */ - -#ifndef GL_NV_texture_border_clamp -#define GL_NV_texture_border_clamp 1 -#define GL_TEXTURE_BORDER_COLOR_NV 0x1004 -#define GL_CLAMP_TO_BORDER_NV 0x812D -#endif /* GL_NV_texture_border_clamp */ - -#ifndef GL_NV_texture_compression_s3tc_update -#define GL_NV_texture_compression_s3tc_update 1 -#endif /* GL_NV_texture_compression_s3tc_update */ - -#ifndef GL_NV_texture_npot_2D_mipmap -#define GL_NV_texture_npot_2D_mipmap 1 -#endif /* GL_NV_texture_npot_2D_mipmap */ - -#ifndef GL_QCOM_alpha_test -#define GL_QCOM_alpha_test 1 -#define GL_ALPHA_TEST_QCOM 0x0BC0 -#define GL_ALPHA_TEST_FUNC_QCOM 0x0BC1 -#define GL_ALPHA_TEST_REF_QCOM 0x0BC2 -typedef void (GL_APIENTRYP PFNGLALPHAFUNCQCOMPROC) (GLenum func, GLclampf ref); -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glAlphaFuncQCOM (GLenum func, GLclampf ref); -#endif -#endif /* GL_QCOM_alpha_test */ - -#ifndef GL_QCOM_binning_control -#define GL_QCOM_binning_control 1 -#define GL_BINNING_CONTROL_HINT_QCOM 0x8FB0 -#define GL_CPU_OPTIMIZED_QCOM 0x8FB1 -#define GL_GPU_OPTIMIZED_QCOM 0x8FB2 -#define GL_RENDER_DIRECT_TO_FRAMEBUFFER_QCOM 0x8FB3 -#endif /* GL_QCOM_binning_control */ - -#ifndef GL_QCOM_driver_control -#define GL_QCOM_driver_control 1 -typedef void (GL_APIENTRYP PFNGLGETDRIVERCONTROLSQCOMPROC) (GLint *num, GLsizei size, GLuint *driverControls); -typedef void (GL_APIENTRYP PFNGLGETDRIVERCONTROLSTRINGQCOMPROC) (GLuint driverControl, GLsizei bufSize, GLsizei *length, GLchar *driverControlString); -typedef void (GL_APIENTRYP PFNGLENABLEDRIVERCONTROLQCOMPROC) (GLuint driverControl); -typedef void (GL_APIENTRYP PFNGLDISABLEDRIVERCONTROLQCOMPROC) (GLuint driverControl); -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glGetDriverControlsQCOM (GLint *num, GLsizei size, GLuint *driverControls); -GL_APICALL void GL_APIENTRY glGetDriverControlStringQCOM (GLuint driverControl, GLsizei bufSize, GLsizei *length, GLchar *driverControlString); -GL_APICALL void GL_APIENTRY glEnableDriverControlQCOM (GLuint driverControl); -GL_APICALL void GL_APIENTRY glDisableDriverControlQCOM (GLuint driverControl); -#endif -#endif /* GL_QCOM_driver_control */ - -#ifndef GL_QCOM_extended_get -#define GL_QCOM_extended_get 1 -#define GL_TEXTURE_WIDTH_QCOM 0x8BD2 -#define GL_TEXTURE_HEIGHT_QCOM 0x8BD3 -#define GL_TEXTURE_DEPTH_QCOM 0x8BD4 -#define GL_TEXTURE_INTERNAL_FORMAT_QCOM 0x8BD5 -#define GL_TEXTURE_FORMAT_QCOM 0x8BD6 -#define GL_TEXTURE_TYPE_QCOM 0x8BD7 -#define GL_TEXTURE_IMAGE_VALID_QCOM 0x8BD8 -#define GL_TEXTURE_NUM_LEVELS_QCOM 0x8BD9 -#define GL_TEXTURE_TARGET_QCOM 0x8BDA -#define GL_TEXTURE_OBJECT_VALID_QCOM 0x8BDB -#define GL_STATE_RESTORE 0x8BDC -typedef void (GL_APIENTRYP PFNGLEXTGETTEXTURESQCOMPROC) (GLuint *textures, GLint maxTextures, GLint *numTextures); -typedef void (GL_APIENTRYP PFNGLEXTGETBUFFERSQCOMPROC) (GLuint *buffers, GLint maxBuffers, GLint *numBuffers); -typedef void (GL_APIENTRYP PFNGLEXTGETRENDERBUFFERSQCOMPROC) (GLuint *renderbuffers, GLint maxRenderbuffers, GLint *numRenderbuffers); -typedef void (GL_APIENTRYP PFNGLEXTGETFRAMEBUFFERSQCOMPROC) (GLuint *framebuffers, GLint maxFramebuffers, GLint *numFramebuffers); -typedef void (GL_APIENTRYP PFNGLEXTGETTEXLEVELPARAMETERIVQCOMPROC) (GLuint texture, GLenum face, GLint level, GLenum pname, GLint *params); -typedef void (GL_APIENTRYP PFNGLEXTTEXOBJECTSTATEOVERRIDEIQCOMPROC) (GLenum target, GLenum pname, GLint param); -typedef void (GL_APIENTRYP PFNGLEXTGETTEXSUBIMAGEQCOMPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, void *texels); -typedef void (GL_APIENTRYP PFNGLEXTGETBUFFERPOINTERVQCOMPROC) (GLenum target, void **params); -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glExtGetTexturesQCOM (GLuint *textures, GLint maxTextures, GLint *numTextures); -GL_APICALL void GL_APIENTRY glExtGetBuffersQCOM (GLuint *buffers, GLint maxBuffers, GLint *numBuffers); -GL_APICALL void GL_APIENTRY glExtGetRenderbuffersQCOM (GLuint *renderbuffers, GLint maxRenderbuffers, GLint *numRenderbuffers); -GL_APICALL void GL_APIENTRY glExtGetFramebuffersQCOM (GLuint *framebuffers, GLint maxFramebuffers, GLint *numFramebuffers); -GL_APICALL void GL_APIENTRY glExtGetTexLevelParameterivQCOM (GLuint texture, GLenum face, GLint level, GLenum pname, GLint *params); -GL_APICALL void GL_APIENTRY glExtTexObjectStateOverrideiQCOM (GLenum target, GLenum pname, GLint param); -GL_APICALL void GL_APIENTRY glExtGetTexSubImageQCOM (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, void *texels); -GL_APICALL void GL_APIENTRY glExtGetBufferPointervQCOM (GLenum target, void **params); -#endif -#endif /* GL_QCOM_extended_get */ - -#ifndef GL_QCOM_extended_get2 -#define GL_QCOM_extended_get2 1 -typedef void (GL_APIENTRYP PFNGLEXTGETSHADERSQCOMPROC) (GLuint *shaders, GLint maxShaders, GLint *numShaders); -typedef void (GL_APIENTRYP PFNGLEXTGETPROGRAMSQCOMPROC) (GLuint *programs, GLint maxPrograms, GLint *numPrograms); -typedef GLboolean (GL_APIENTRYP PFNGLEXTISPROGRAMBINARYQCOMPROC) (GLuint program); -typedef void (GL_APIENTRYP PFNGLEXTGETPROGRAMBINARYSOURCEQCOMPROC) (GLuint program, GLenum shadertype, GLchar *source, GLint *length); -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glExtGetShadersQCOM (GLuint *shaders, GLint maxShaders, GLint *numShaders); -GL_APICALL void GL_APIENTRY glExtGetProgramsQCOM (GLuint *programs, GLint maxPrograms, GLint *numPrograms); -GL_APICALL GLboolean GL_APIENTRY glExtIsProgramBinaryQCOM (GLuint program); -GL_APICALL void GL_APIENTRY glExtGetProgramBinarySourceQCOM (GLuint program, GLenum shadertype, GLchar *source, GLint *length); -#endif -#endif /* GL_QCOM_extended_get2 */ - -#ifndef GL_QCOM_perfmon_global_mode -#define GL_QCOM_perfmon_global_mode 1 -#define GL_PERFMON_GLOBAL_MODE_QCOM 0x8FA0 -#endif /* GL_QCOM_perfmon_global_mode */ - -#ifndef GL_QCOM_tiled_rendering -#define GL_QCOM_tiled_rendering 1 -#define GL_COLOR_BUFFER_BIT0_QCOM 0x00000001 -#define GL_COLOR_BUFFER_BIT1_QCOM 0x00000002 -#define GL_COLOR_BUFFER_BIT2_QCOM 0x00000004 -#define GL_COLOR_BUFFER_BIT3_QCOM 0x00000008 -#define GL_COLOR_BUFFER_BIT4_QCOM 0x00000010 -#define GL_COLOR_BUFFER_BIT5_QCOM 0x00000020 -#define GL_COLOR_BUFFER_BIT6_QCOM 0x00000040 -#define GL_COLOR_BUFFER_BIT7_QCOM 0x00000080 -#define GL_DEPTH_BUFFER_BIT0_QCOM 0x00000100 -#define GL_DEPTH_BUFFER_BIT1_QCOM 0x00000200 -#define GL_DEPTH_BUFFER_BIT2_QCOM 0x00000400 -#define GL_DEPTH_BUFFER_BIT3_QCOM 0x00000800 -#define GL_DEPTH_BUFFER_BIT4_QCOM 0x00001000 -#define GL_DEPTH_BUFFER_BIT5_QCOM 0x00002000 -#define GL_DEPTH_BUFFER_BIT6_QCOM 0x00004000 -#define GL_DEPTH_BUFFER_BIT7_QCOM 0x00008000 -#define GL_STENCIL_BUFFER_BIT0_QCOM 0x00010000 -#define GL_STENCIL_BUFFER_BIT1_QCOM 0x00020000 -#define GL_STENCIL_BUFFER_BIT2_QCOM 0x00040000 -#define GL_STENCIL_BUFFER_BIT3_QCOM 0x00080000 -#define GL_STENCIL_BUFFER_BIT4_QCOM 0x00100000 -#define GL_STENCIL_BUFFER_BIT5_QCOM 0x00200000 -#define GL_STENCIL_BUFFER_BIT6_QCOM 0x00400000 -#define GL_STENCIL_BUFFER_BIT7_QCOM 0x00800000 -#define GL_MULTISAMPLE_BUFFER_BIT0_QCOM 0x01000000 -#define GL_MULTISAMPLE_BUFFER_BIT1_QCOM 0x02000000 -#define GL_MULTISAMPLE_BUFFER_BIT2_QCOM 0x04000000 -#define GL_MULTISAMPLE_BUFFER_BIT3_QCOM 0x08000000 -#define GL_MULTISAMPLE_BUFFER_BIT4_QCOM 0x10000000 -#define GL_MULTISAMPLE_BUFFER_BIT5_QCOM 0x20000000 -#define GL_MULTISAMPLE_BUFFER_BIT6_QCOM 0x40000000 -#define GL_MULTISAMPLE_BUFFER_BIT7_QCOM 0x80000000 -typedef void (GL_APIENTRYP PFNGLSTARTTILINGQCOMPROC) (GLuint x, GLuint y, GLuint width, GLuint height, GLbitfield preserveMask); -typedef void (GL_APIENTRYP PFNGLENDTILINGQCOMPROC) (GLbitfield preserveMask); -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glStartTilingQCOM (GLuint x, GLuint y, GLuint width, GLuint height, GLbitfield preserveMask); -GL_APICALL void GL_APIENTRY glEndTilingQCOM (GLbitfield preserveMask); -#endif -#endif /* GL_QCOM_tiled_rendering */ - -#ifndef GL_QCOM_writeonly_rendering -#define GL_QCOM_writeonly_rendering 1 -#define GL_WRITEONLY_RENDERING_QCOM 0x8823 -#endif /* GL_QCOM_writeonly_rendering */ - -#ifndef GL_VIV_shader_binary -#define GL_VIV_shader_binary 1 -#define GL_SHADER_BINARY_VIV 0x8FC4 -#endif /* GL_VIV_shader_binary */ - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/third_party/mojo/src/mojo/public/c/gpu/GLES2/gl2extmojo.h b/third_party/mojo/src/mojo/public/c/gpu/GLES2/gl2extmojo.h deleted file mode 100644 index 929cb080b622b9..00000000000000 --- a/third_party/mojo/src/mojo/public/c/gpu/GLES2/gl2extmojo.h +++ /dev/null @@ -1,788 +0,0 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// This file contains Mojo-specific GLES2 extensions declarations. - -#ifndef GPU_GLES2_GL2EXTMOJO_H_ -#define GPU_GLES2_GL2EXTMOJO_H_ - -#include -#include - -#ifdef __cplusplus -extern "C" { -#endif - -/* GL_CHROMIUM_iosurface */ -#ifndef GL_CHROMIUM_iosurface -#define GL_CHROMIUM_iosurface 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glTexImageIOSurface2DCHROMIUM( - GLenum target, GLsizei width, GLsizei height, GLuint ioSurfaceId, - GLuint plane); -#endif -typedef void (GL_APIENTRYP PFNGLTEXIMAGEIOSURFACE2DCHROMIUMPROC) ( - GLenum target, GLsizei width, GLsizei height, GLuint ioSurfaceId, - GLuint plane); -#endif /* GL_CHROMIUM_iosurface */ - -/* GL_CHROMIUM_gpu_memory_manager */ -#ifndef GL_CHROMIUM_gpu_memory_manager -#define GL_CHROMIUM_gpu_memory_manager 1 - -#ifndef GL_TEXTURE_POOL_UNMANAGED_CHROMIUM -#define GL_TEXTURE_POOL_UNMANAGED_CHROMIUM 0x6002 -#endif - -#ifndef GL_TEXTURE_POOL_CHROMIUM -#define GL_TEXTURE_POOL_CHROMIUM 0x6000 -#endif - -#ifndef GL_TEXTURE_POOL_MANAGED_CHROMIUM -#define GL_TEXTURE_POOL_MANAGED_CHROMIUM 0x6001 -#endif -#endif /* GL_CHROMIUM_gpu_memory_manager */ - -/* GL_CHROMIUM_texture_mailbox */ -#ifndef GL_CHROMIUM_texture_mailbox -#define GL_CHROMIUM_texture_mailbox 1 - -#ifndef GL_MAILBOX_SIZE_CHROMIUM -#define GL_MAILBOX_SIZE_CHROMIUM 64 -#endif -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glGenMailboxCHROMIUM(GLbyte* mailbox); -GL_APICALL void GL_APIENTRY glProduceTextureCHROMIUM( - GLenum target, const GLbyte* mailbox); -GL_APICALL void GL_APIENTRY glProduceTextureDirectCHROMIUM( - GLuint texture, GLenum target, const GLbyte* mailbox); -GL_APICALL void GL_APIENTRY glConsumeTextureCHROMIUM( - GLenum target, const GLbyte* mailbox); -GL_APICALL GLuint GL_APIENTRY glCreateAndConsumeTextureCHROMIUM( - GLenum target, const GLbyte* mailbox); -#endif -typedef void (GL_APIENTRYP PFNGLGENMAILBOXCHROMIUMPROC) (GLbyte* mailbox); -typedef void (GL_APIENTRYP PFNGLPRODUCETEXTURECHROMIUMPROC) ( - GLenum target, const GLbyte* mailbox); -typedef void (GL_APIENTRYP PFNGLPRODUCETEXTUREDIRECTCHROMIUMPROC) ( - GLuint texture, GLenum target, const GLbyte* mailbox); -typedef void (GL_APIENTRYP PFNGLCONSUMETEXTURECHROMIUMPROC) ( - GLenum target, const GLbyte* mailbox); -typedef GLuint (GL_APIENTRYP PFNGLCREATEANDCONSUMETEXTURECHROMIUMPROC) ( - GLenum target, const GLbyte* mailbox); -#endif /* GL_CHROMIUM_texture_mailbox */ - -/* GL_CHROMIUM_pixel_transfer_buffer_object */ -#ifndef GL_CHROMIUM_pixel_transfer_buffer_object -#define GL_CHROMIUM_pixel_transfer_buffer_object 1 - -#ifndef GL_PIXEL_UNPACK_TRANSFER_BUFFER_CHROMIUM -// TODO(reveman): Get official numbers for this constants. -#define GL_PIXEL_UNPACK_TRANSFER_BUFFER_CHROMIUM 0x78EC -#define GL_PIXEL_PACK_TRANSFER_BUFFER_CHROMIUM 0x78ED - -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void* GL_APIENTRY glMapBufferCHROMIUM(GLuint target,GLenum access); -GL_APICALL GLboolean GL_APIENTRY glUnmapBufferCHROMIUM(GLuint target); -#endif -typedef void* (GL_APIENTRY PFNGLMAPBUFFERCHROMIUM) ( - GLuint target,GLenum access); -typedef GLboolean (GL_APIENTRY PFNGLUNMAPBUFFERCHROMIUM) (GLuint target); -#endif /* GL_CHROMIUM_pixel_transfer_buffer_object */ - -#ifndef GL_PIXEL_UNPACK_TRANSFER_BUFFER_BINDING_CHROMIUM -// TODO(reveman): Get official numbers for this constants. -#define GL_PIXEL_UNPACK_TRANSFER_BUFFER_BINDING_CHROMIUM 0x78EF -#define GL_PIXEL_PACK_TRANSFER_BUFFER_BINDING_CHROMIUM 0x78EE -#endif - -#ifndef GL_STREAM_READ -#define GL_STREAM_READ 0x88E1 -#endif -#endif /* GL_CHROMIUM_pixel_transfer_buffer_object */ - -/* GL_CHROMIUM_image */ -#ifndef GL_CHROMIUM_image -#define GL_CHROMIUM_image 1 - -typedef struct _ClientBuffer* ClientBuffer; - -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL GLuint GL_APIENTRY glCreateImageCHROMIUM(ClientBuffer buffer, - GLsizei width, - GLsizei height, - GLenum internalformat); -GL_APICALL void GL_APIENTRY glDestroyImageCHROMIUM(GLuint image_id); -#endif -typedef GLuint(GL_APIENTRYP PFNGLCREATEIMAGECHROMIUMPROC)( - ClientBuffer buffer, - GLsizei width, - GLsizei height, - GLenum internalformat); -typedef void ( - GL_APIENTRYP PFNGLDESTROYIMAGECHROMIUMPROC)(GLuint image_id); -#endif /* GL_CHROMIUM_image */ - - /* GL_CHROMIUM_gpu_memory_buffer_image */ -#ifndef GL_CHROMIUM_gpu_memory_buffer_image -#define GL_CHROMIUM_gpu_memory_buffer_image 1 - -#ifndef GL_READ_WRITE_CHROMIUM -#define GL_READ_WRITE_CHROMIUM 0x78F2 -#endif - -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL GLuint GL_APIENTRY glCreateGpuMemoryBufferImageCHROMIUM( - GLsizei width, - GLsizei height, - GLenum internalformat, - GLenum usage); -#endif -typedef GLuint(GL_APIENTRYP PFNGLCREATEGPUMEMORYBUFFERIMAGECHROMIUMPROC)( - GLsizei width, - GLsizei height, - GLenum internalformat, - GLenum usage); -#endif /* GL_CHROMIUM_gpu_memory_buffer_image */ - -/* GL_CHROMIUM_map_sub */ -#ifndef GL_CHROMIUM_map_sub -#define GL_CHROMIUM_map_sub 1 - -#ifndef GL_READ_ONLY -#define GL_READ_ONLY 0x88B8 -#endif - -#ifndef GL_WRITE_ONLY -#define GL_WRITE_ONLY 0x88B9 -#endif -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void* GL_APIENTRY glMapBufferSubDataCHROMIUM( - GLuint target, GLintptr offset, GLsizeiptr size, GLenum access); -GL_APICALL void GL_APIENTRY glUnmapBufferSubDataCHROMIUM(const void* mem); -GL_APICALL void* GL_APIENTRY glMapTexSubImage2DCHROMIUM( - GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, - GLsizei height, GLenum format, GLenum type, GLenum access); -GL_APICALL void GL_APIENTRY glUnmapTexSubImage2DCHROMIUM(const void* mem); -#endif -typedef void* (GL_APIENTRYP PFNGLMAPBUFFERSUBDATACHROMIUMPROC) ( - GLuint target, GLintptr offset, GLsizeiptr size, GLenum access); -typedef void ( - GL_APIENTRYP PFNGLUNMAPBUFFERSUBDATACHROMIUMPROC) (const void* mem); -typedef void* (GL_APIENTRYP PFNGLMAPTEXSUBIMAGE2DCHROMIUMPROC) ( - GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, - GLsizei height, GLenum format, GLenum type, GLenum access); -typedef void ( - GL_APIENTRYP PFNGLUNMAPTEXSUBIMAGE2DCHROMIUMPROC) (const void* mem); -#endif /* GL_CHROMIUM_map_sub */ - -/* GL_CHROMIUM_request_extension */ -#ifndef GL_CHROMIUM_request_extension -#define GL_CHROMIUM_request_extension 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL const GLchar* GL_APIENTRY glGetRequestableExtensionsCHROMIUM(); -GL_APICALL void GL_APIENTRY glRequestExtensionCHROMIUM(const char* extension); -#endif -typedef const GLchar* (GL_APIENTRYP PFNGLGETREQUESTABLEEXTENSIONSCHROMIUMPROC) ( - ); -typedef void (GL_APIENTRYP PFNGLREQUESTEXTENSIONCHROMIUMPROC) ( - const char* extension); -#endif /* GL_CHROMIUM_request_extension */ - -/* GL_CHROMIUM_get_error_query */ -#ifndef GL_CHROMIUM_get_error_query -#define GL_CHROMIUM_get_error_query 1 - -#ifndef GL_GET_ERROR_QUERY_CHROMIUM -// TODO(gman): Get official numbers for this constants. -#define GL_GET_ERROR_QUERY_CHROMIUM 0x6003 -#endif -#endif /* GL_CHROMIUM_get_error_query */ - -/* GL_CHROMIUM_texture_from_image */ -#ifndef GL_CHROMIUM_texture_from_image -#define GL_CHROMIUM_texture_from_image 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glBindTexImage2DCHROMIUM( - GLenum target, GLint imageId); -GL_APICALL void GL_APIENTRY glReleaseTexImage2DCHROMIUM( - GLenum target, GLint imageId); -#endif -typedef void (GL_APIENTRYP PFNGLBINDTEXIMAGE2DCHROMIUMPROC) ( - GLenum target, GLint imageId); -typedef void (GL_APIENTRYP PFNGLRELEASETEXIMAGE2DCHROMIUMPROC) ( - GLenum target, GLint imageId); -#endif /* GL_CHROMIUM_texture_from_image */ - -/* GL_CHROMIUM_rate_limit_offscreen_context */ -#ifndef GL_CHROMIUM_rate_limit_offscreen_context -#define GL_CHROMIUM_rate_limit_offscreen_context 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glRateLimitOffscreenContextCHROMIUM(); -#endif -typedef void (GL_APIENTRYP PFNGLRATELIMITOFFSCREENCONTEXTCHROMIUMPROC) (); -#endif /* GL_CHROMIUM_rate_limit_offscreen_context */ - -/* GL_CHROMIUM_post_sub_buffer */ -#ifndef GL_CHROMIUM_post_sub_buffer -#define GL_CHROMIUM_post_sub_buffer 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glPostSubBufferCHROMIUM( - GLint x, GLint y, GLint width, GLint height); -#endif -typedef void (GL_APIENTRYP PFNGLPOSTSUBBUFFERCHROMIUMPROC) ( - GLint x, GLint y, GLint width, GLint height); -#endif /* GL_CHROMIUM_post_sub_buffer */ - -/* GL_CHROMIUM_bind_uniform_location */ -#ifndef GL_CHROMIUM_bind_uniform_location -#define GL_CHROMIUM_bind_uniform_location 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glBindUniformLocationCHROMIUM( - GLuint program, GLint location, const char* name); -#endif -typedef void (GL_APIENTRYP PFNGLBINDUNIFORMLOCATIONCHROMIUMPROC) ( - GLuint program, GLint location, const char* name); -#endif /* GL_CHROMIUM_bind_uniform_location */ - -/* GL_CHROMIUM_command_buffer_query */ -#ifndef GL_CHROMIUM_command_buffer_query -#define GL_CHROMIUM_command_buffer_query 1 - -#ifndef GL_COMMANDS_ISSUED_CHROMIUM -// TODO(gman): Get official numbers for this constants. -#define GL_COMMANDS_ISSUED_CHROMIUM 0x6004 -#endif -#endif /* GL_CHROMIUM_command_buffer_query */ - -/* GL_CHROMIUM_framebuffer_multisample */ -#ifndef GL_CHROMIUM_framebuffer_multisample -#define GL_CHROMIUM_framebuffer_multisample 1 - -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glRenderbufferStorageMultisampleCHROMIUM (GLenum, GLsizei, GLenum, GLsizei, GLsizei); -GL_APICALL void GL_APIENTRY glBlitFramebufferCHROMIUM (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); -#endif -typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLECHROMIUMPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); -typedef void (GL_APIENTRYP PFNGLBLITFRAMEBUFFERCHROMIUMPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); - -#ifndef GL_FRAMEBUFFER_BINDING_EXT -#define GL_FRAMEBUFFER_BINDING_EXT GL_FRAMEBUFFER_BINDING -#endif - -#ifndef GL_DRAW_FRAMEBUFFER_BINDING_EXT -#define GL_DRAW_FRAMEBUFFER_BINDING_EXT GL_DRAW_FRAMEBUFFER_BINDING -#endif - -#ifndef GL_RENDERBUFFER_BINDING_EXT -#define GL_RENDERBUFFER_BINDING_EXT GL_RENDERBUFFER_BINDING -#endif - -#ifndef GL_RENDERBUFFER_SAMPLES -#define GL_RENDERBUFFER_SAMPLES 0x8CAB -#endif - -#ifndef GL_READ_FRAMEBUFFER_EXT -#define GL_READ_FRAMEBUFFER_EXT GL_READ_FRAMEBUFFER -#endif - -#ifndef GL_RENDERBUFFER_SAMPLES_EXT -#define GL_RENDERBUFFER_SAMPLES_EXT GL_RENDERBUFFER_SAMPLES -#endif - -#ifndef GL_RENDERBUFFER_BINDING -#define GL_RENDERBUFFER_BINDING 0x8CA7 -#endif - -#ifndef GL_READ_FRAMEBUFFER_BINDING -#define GL_READ_FRAMEBUFFER_BINDING 0x8CAA -#endif - -#ifndef GL_MAX_SAMPLES -#define GL_MAX_SAMPLES 0x8D57 -#endif - -#ifndef GL_READ_FRAMEBUFFER_BINDING_EXT -#define GL_READ_FRAMEBUFFER_BINDING_EXT GL_READ_FRAMEBUFFER_BINDING -#endif - -#ifndef GL_DRAW_FRAMEBUFFER_BINDING -#define GL_DRAW_FRAMEBUFFER_BINDING 0x8CA6 -#endif - -#ifndef GL_MAX_SAMPLES_EXT -#define GL_MAX_SAMPLES_EXT GL_MAX_SAMPLES -#endif - -#ifndef GL_DRAW_FRAMEBUFFER -#define GL_DRAW_FRAMEBUFFER 0x8CA9 -#endif - -#ifndef GL_READ_FRAMEBUFFER -#define GL_READ_FRAMEBUFFER 0x8CA8 -#endif - -#ifndef GL_DRAW_FRAMEBUFFER_EXT -#define GL_DRAW_FRAMEBUFFER_EXT GL_DRAW_FRAMEBUFFER -#endif - -#ifndef GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE -#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE 0x8D56 -#endif - -#ifndef GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT -#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE // NOLINT -#endif - -#ifndef GL_FRAMEBUFFER_BINDING -#define GL_FRAMEBUFFER_BINDING 0x8CA6 -#endif -#endif /* GL_CHROMIUM_framebuffer_multisample */ - -/* GL_CHROMIUM_texture_compression_dxt3 */ -#ifndef GL_CHROMIUM_texture_compression_dxt3 -#define GL_CHROMIUM_texture_compression_dxt3 1 - -#ifndef GL_COMPRESSED_RGBA_S3TC_DXT3_EXT -#define GL_COMPRESSED_RGBA_S3TC_DXT3_EXT 0x83F2 -#endif -#endif /* GL_CHROMIUM_texture_compression_dxt3 */ - -/* GL_CHROMIUM_texture_compression_dxt5 */ -#ifndef GL_CHROMIUM_texture_compression_dxt5 -#define GL_CHROMIUM_texture_compression_dxt5 1 - -#ifndef GL_COMPRESSED_RGBA_S3TC_DXT5_EXT -#define GL_COMPRESSED_RGBA_S3TC_DXT5_EXT 0x83F3 -#endif -#endif /* GL_CHROMIUM_texture_compression_dxt5 */ - -/* GL_CHROMIUM_async_pixel_transfers */ -#ifndef GL_CHROMIUM_async_pixel_transfers -#define GL_CHROMIUM_async_pixel_transfers 1 - -#ifndef GL_ASYNC_PIXEL_PACK_COMPLETED_CHROMIUM -#define GL_ASYNC_PIXEL_PACK_COMPLETED_CHROMIUM 0x6006 -#endif -#endif /* GL_CHROMIUM_async_pixel_transfers */ - -#ifndef GL_BIND_GENERATES_RESOURCE_CHROMIUM -#define GL_BIND_GENERATES_RESOURCE_CHROMIUM 0x9244 -#endif - -/* GL_CHROMIUM_copy_texture */ -#ifndef GL_CHROMIUM_copy_texture -#define GL_CHROMIUM_copy_texture 1 - -#ifndef GL_UNPACK_COLORSPACE_CONVERSION_CHROMIUM -#define GL_UNPACK_COLORSPACE_CONVERSION_CHROMIUM 0x9243 -#endif - -#ifndef GL_UNPACK_UNPREMULTIPLY_ALPHA_CHROMIUM -#define GL_UNPACK_UNPREMULTIPLY_ALPHA_CHROMIUM 0x9242 -#endif - -#ifndef GL_UNPACK_PREMULTIPLY_ALPHA_CHROMIUM -#define GL_UNPACK_PREMULTIPLY_ALPHA_CHROMIUM 0x9241 -#endif -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glCopyTextureCHROMIUM(GLenum target, - GLenum source_id, - GLenum dest_id, - GLint internalformat, - GLenum dest_type); - -GL_APICALL void GL_APIENTRY glCopySubTextureCHROMIUM(GLenum target, - GLenum source_id, - GLenum dest_id, - GLint xoffset, - GLint yoffset); -#endif -typedef void(GL_APIENTRYP PFNGLCOPYTEXTURECHROMIUMPROC)(GLenum target, - GLenum source_id, - GLenum dest_id, - GLint internalformat, - GLenum dest_type); - -typedef void(GL_APIENTRYP PFNGLCOPYSUBTEXTURECHROMIUMPROC)(GLenum target, - GLenum source_id, - GLenum dest_id, - GLint xoffset, - GLint yoffset); -#endif /* GL_CHROMIUM_copy_texture */ - -/* GL_CHROMIUM_lose_context */ -#ifndef GL_CHROMIUM_lose_context -#define GL_CHROMIUM_lose_context 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glLoseContextCHROMIUM(GLenum current, GLenum other); -#endif -typedef void (GL_APIENTRYP PFNGLLOSECONTEXTCHROMIUMPROC) ( - GLenum current, GLenum other); -#endif /* GL_CHROMIUM_lose_context */ - -/* GL_CHROMIUM_flipy */ -#ifndef GL_CHROMIUM_flipy -#define GL_CHROMIUM_flipy 1 - -#ifndef GL_UNPACK_FLIP_Y_CHROMIUM -#define GL_UNPACK_FLIP_Y_CHROMIUM 0x9240 -#endif -#endif /* GL_CHROMIUM_flipy */ - -/* GL_ARB_texture_rectangle */ -#ifndef GL_ARB_texture_rectangle -#define GL_ARB_texture_rectangle 1 - -#ifndef GL_SAMPLER_2D_RECT_ARB -#define GL_SAMPLER_2D_RECT_ARB 0x8B63 -#endif - -#ifndef GL_TEXTURE_BINDING_RECTANGLE_ARB -#define GL_TEXTURE_BINDING_RECTANGLE_ARB 0x84F6 -#endif - -#ifndef GL_TEXTURE_RECTANGLE_ARB -#define GL_TEXTURE_RECTANGLE_ARB 0x84F5 -#endif -#endif /* GL_ARB_texture_rectangle */ - -/* GL_CHROMIUM_enable_feature */ -#ifndef GL_CHROMIUM_enable_feature -#define GL_CHROMIUM_enable_feature 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL GLboolean GL_APIENTRY glEnableFeatureCHROMIUM(const char* feature); -#endif -typedef GLboolean (GL_APIENTRYP PFNGLENABLEFEATURECHROMIUMPROC) ( - const char* feature); -#endif /* GL_CHROMIUM_enable_feature */ - -/* GL_CHROMIUM_command_buffer_latency_query */ -#ifndef GL_CHROMIUM_command_buffer_latency_query -#define GL_CHROMIUM_command_buffer_latency_query 1 - -#ifndef GL_LATENCY_QUERY_CHROMIUM -// TODO(gman): Get official numbers for these constants. -#define GL_LATENCY_QUERY_CHROMIUM 0x6007 -#endif -#endif /* GL_CHROMIUM_command_buffer_latency_query */ - -/* GL_ARB_robustness */ -#ifndef GL_ARB_robustness -#define GL_ARB_robustness 1 - -#ifndef GL_GUILTY_CONTEXT_RESET_ARB -#define GL_GUILTY_CONTEXT_RESET_ARB 0x8253 -#endif - -#ifndef GL_UNKNOWN_CONTEXT_RESET_ARB -#define GL_UNKNOWN_CONTEXT_RESET_ARB 0x8255 -#endif - -#ifndef GL_INNOCENT_CONTEXT_RESET_ARB -#define GL_INNOCENT_CONTEXT_RESET_ARB 0x8254 -#endif -#endif /* GL_ARB_robustness */ - -/* GL_EXT_framebuffer_blit */ -#ifndef GL_EXT_framebuffer_blit -#define GL_EXT_framebuffer_blit 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glBlitFramebufferEXT( - GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, - GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); -#endif -typedef void (GL_APIENTRYP PFNGLBLITFRAMEBUFFEREXTPROC) ( - GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, - GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); -#endif /* GL_EXT_framebuffer_blit */ - -/* GL_EXT_draw_buffers */ -#ifndef GL_EXT_draw_buffers -#define GL_EXT_draw_buffers 1 - -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glDrawBuffersEXT( - GLsizei n, const GLenum* bufs); -#endif -typedef void (GL_APIENTRYP PFNGLDRAWBUFFERSEXTPROC) ( - GLsizei n, const GLenum* bufs); - -#ifndef GL_COLOR_ATTACHMENT0_EXT -#define GL_COLOR_ATTACHMENT0_EXT 0x8CE0 -#endif -#ifndef GL_COLOR_ATTACHMENT1_EXT -#define GL_COLOR_ATTACHMENT1_EXT 0x8CE1 -#endif -#ifndef GL_COLOR_ATTACHMENT2_EXT -#define GL_COLOR_ATTACHMENT2_EXT 0x8CE2 -#endif -#ifndef GL_COLOR_ATTACHMENT3_EXT -#define GL_COLOR_ATTACHMENT3_EXT 0x8CE3 -#endif -#ifndef GL_COLOR_ATTACHMENT4_EXT -#define GL_COLOR_ATTACHMENT4_EXT 0x8CE4 -#endif -#ifndef GL_COLOR_ATTACHMENT5_EXT -#define GL_COLOR_ATTACHMENT5_EXT 0x8CE5 -#endif -#ifndef GL_COLOR_ATTACHMENT6_EXT -#define GL_COLOR_ATTACHMENT6_EXT 0x8CE6 -#endif -#ifndef GL_COLOR_ATTACHMENT7_EXT -#define GL_COLOR_ATTACHMENT7_EXT 0x8CE7 -#endif -#ifndef GL_COLOR_ATTACHMENT8_EXT -#define GL_COLOR_ATTACHMENT8_EXT 0x8CE8 -#endif -#ifndef GL_COLOR_ATTACHMENT9_EXT -#define GL_COLOR_ATTACHMENT9_EXT 0x8CE9 -#endif -#ifndef GL_COLOR_ATTACHMENT10_EXT -#define GL_COLOR_ATTACHMENT10_EXT 0x8CEA -#endif -#ifndef GL_COLOR_ATTACHMENT11_EXT -#define GL_COLOR_ATTACHMENT11_EXT 0x8CEB -#endif -#ifndef GL_COLOR_ATTACHMENT12_EXT -#define GL_COLOR_ATTACHMENT12_EXT 0x8CEC -#endif -#ifndef GL_COLOR_ATTACHMENT13_EXT -#define GL_COLOR_ATTACHMENT13_EXT 0x8CED -#endif -#ifndef GL_COLOR_ATTACHMENT14_EXT -#define GL_COLOR_ATTACHMENT14_EXT 0x8CEE -#endif -#ifndef GL_COLOR_ATTACHMENT15_EXT -#define GL_COLOR_ATTACHMENT15_EXT 0x8CEF -#endif - -#ifndef GL_DRAW_BUFFER0_EXT -#define GL_DRAW_BUFFER0_EXT 0x8825 -#endif -#ifndef GL_DRAW_BUFFER1_EXT -#define GL_DRAW_BUFFER1_EXT 0x8826 -#endif -#ifndef GL_DRAW_BUFFER2_EXT -#define GL_DRAW_BUFFER2_EXT 0x8827 -#endif -#ifndef GL_DRAW_BUFFER3_EXT -#define GL_DRAW_BUFFER3_EXT 0x8828 -#endif -#ifndef GL_DRAW_BUFFER4_EXT -#define GL_DRAW_BUFFER4_EXT 0x8829 -#endif -#ifndef GL_DRAW_BUFFER5_EXT -#define GL_DRAW_BUFFER5_EXT 0x882A -#endif -#ifndef GL_DRAW_BUFFER6_EXT -#define GL_DRAW_BUFFER6_EXT 0x882B -#endif -#ifndef GL_DRAW_BUFFER7_EXT -#define GL_DRAW_BUFFER7_EXT 0x882C -#endif -#ifndef GL_DRAW_BUFFER8_EXT -#define GL_DRAW_BUFFER8_EXT 0x882D -#endif -#ifndef GL_DRAW_BUFFER9_EXT -#define GL_DRAW_BUFFER9_EXT 0x882E -#endif -#ifndef GL_DRAW_BUFFER10_EXT -#define GL_DRAW_BUFFER10_EXT 0x882F -#endif -#ifndef GL_DRAW_BUFFER11_EXT -#define GL_DRAW_BUFFER11_EXT 0x8830 -#endif -#ifndef GL_DRAW_BUFFER12_EXT -#define GL_DRAW_BUFFER12_EXT 0x8831 -#endif -#ifndef GL_DRAW_BUFFER13_EXT -#define GL_DRAW_BUFFER13_EXT 0x8832 -#endif -#ifndef GL_DRAW_BUFFER14_EXT -#define GL_DRAW_BUFFER14_EXT 0x8833 -#endif -#ifndef GL_DRAW_BUFFER15_EXT -#define GL_DRAW_BUFFER15_EXT 0x8834 -#endif - -#ifndef GL_MAX_COLOR_ATTACHMENTS_EXT -#define GL_MAX_COLOR_ATTACHMENTS_EXT 0x8CDF -#endif - -#ifndef GL_MAX_DRAW_BUFFERS_EXT -#define GL_MAX_DRAW_BUFFERS_EXT 0x8824 -#endif - -#endif /* GL_EXT_draw_buffers */ - -/* GL_CHROMIUM_resize */ -#ifndef GL_CHROMIUM_resize -#define GL_CHROMIUM_resize 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glResizeCHROMIUM( - GLuint width, GLuint height, GLfloat scale_factor); -#endif -typedef void (GL_APIENTRYP PFNGLRESIZECHROMIUMPROC) ( - GLuint width, GLuint height); -#endif /* GL_CHROMIUM_resize */ - -/* GL_CHROMIUM_get_multiple */ -#ifndef GL_CHROMIUM_get_multiple -#define GL_CHROMIUM_get_multiple 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glGetProgramInfoCHROMIUM( - GLuint program, GLsizei bufsize, GLsizei* size, void* info); -#endif -typedef void (GL_APIENTRYP PFNGLGETPROGRAMINFOCHROMIUMPROC) ( - GLuint program, GLsizei bufsize, GLsizei* size, void* info); -#endif /* GL_CHROMIUM_get_multiple */ - -/* GL_CHROMIUM_sync_point */ -#ifndef GL_CHROMIUM_sync_point -#define GL_CHROMIUM_sync_point 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL GLuint GL_APIENTRY glInsertSyncPointCHROMIUM(); -GL_APICALL GLuint64 GL_APIENTRY glInsertFenceSyncCHROMIUM(); -GL_APICALL void GL_APIENTRY glGenSyncTokenCHROMIUM(GLuint64 fence_sync, - GLbyte* sync_token); -GL_APICALL void GL_APIENTRY glWaitSyncTokenCHROMIUM(const GLbyte* sync_token); -#endif -typedef GLuint (GL_APIENTRYP PFNGLINSERTSYNCPOINTCHROMIUMPROC) (); -typedef GLuint64 (GL_APIENTRYP PFNGLINSERTFENCESYNCCHROMIUMPROC) (); -typedef void (GL_APIENTRYP PFNGLGENSYNCTOKENCHROMIUMPROC) (GLuint64 fence_sync, - GLbyte* sync_token); -typedef void (GL_APIENTRYP PFNGLWAITSYNCTOKENCHROMIUM) ( - const GLbyte* sync_tokens); -#endif /* GL_CHROMIUM_sync_point */ - -#ifndef GL_CHROMIUM_color_buffer_float_rgba -#define GL_CHROMIUM_color_buffer_float_rgba 1 -#ifndef GL_RGBA32F -#define GL_RGBA32F 0x8814 -#endif -#endif /* GL_CHROMIUM_color_buffer_float_rgba */ - -#ifndef GL_CHROMIUM_color_buffer_float_rgb -#define GL_CHROMIUM_color_buffer_float_rgb 1 -#ifndef GL_RGB32F -#define GL_RGB32F 0x8815 -#endif -#endif /* GL_CHROMIUM_color_buffer_float_rgb */ - -/* GL_CHROMIUM_schedule_overlay_plane */ -#ifndef GL_CHROMIUM_schedule_overlay_plane -#define GL_CHROMIUM_schedule_overlay_plane 1 - -#ifndef GL_OVERLAY_TRANSFORM_NONE_CHROMIUM -#define GL_OVERLAY_TRANSFORM_NONE_CHROMIUM 0x9245 -#endif - -#ifndef GL_OVERLAY_TRANSFORM_FLIP_HORIZONTAL_CHROMIUM -#define GL_OVERLAY_TRANSFORM_FLIP_HORIZONTAL_CHROMIUM 0x9246 -#endif - -#ifndef GL_OVERLAY_TRANSFORM_FLIP_VERTICAL_CHROMIUM -#define GL_OVERLAY_TRANSFORM_FLIP_VERTICAL_CHROMIUM 0x9247 -#endif - -#ifndef GL_OVERLAY_TRANSFORM_ROTATE_90_CHROMIUM -#define GL_OVERLAY_TRANSFORM_ROTATE_90_CHROMIUM 0x9248 -#endif - -#ifndef GL_OVERLAY_TRANSFORM_ROTATE_180_CHROMIUM -#define GL_OVERLAY_TRANSFORM_ROTATE_180_CHROMIUM 0x9249 -#endif - -#ifndef GL_OVERLAY_TRANSFORM_ROTATE_270_CHROMIUM -#define GL_OVERLAY_TRANSFORM_ROTATE_270_CHROMIUM 0x924A -#endif - -/* GL_CHROMIUM_subscribe_uniform */ -#ifndef GL_CHROMIUM_subscribe_uniform -#define GL_CHROMIUM_subscribe_uniform 1 - -#ifndef GL_SUBSCRIBED_VALUES_BUFFER_CHROMIUM -#define GL_SUBSCRIBED_VALUES_BUFFER_CHROMIUM 0x924B -#endif - -#ifndef GL_MOUSE_POSITION_CHROMIUM -#define GL_MOUSE_POSITION_CHROMIUM 0x924C -#endif - -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY -glGenValuebuffersCHROMIUM(GLsizei n, GLuint* buffers); -GL_APICALL void GL_APIENTRY -glDeleteValuebuffersCHROMIUM(GLsizei n, const GLuint* valuebuffers); -GL_APICALL GLboolean GL_APIENTRY glIsValuebufferCHROMIUM(GLuint valuebuffer); -GL_APICALL void GL_APIENTRY -glBindValuebufferCHROMIUM(GLenum target, GLuint valuebuffer); -GL_APICALL void GL_APIENTRY -glSubscribeValueCHROMIUM(GLenum target, GLenum subscription); -GL_APICALL void GL_APIENTRY glPopulateSubscribedValuesCHROMIUM(GLenum target); -GL_APICALL void GL_APIENTRY glUniformValuebufferCHROMIUM(GLint location, - GLenum target, - GLenum subscription); -#endif -#endif /* GL_CHROMIUM_subscribe_uniform */ - -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY - glScheduleOverlayPlaneCHROMIUM(GLint plane_z_order, - GLenum plane_transform, - GLuint overlay_texture_id, - GLint bounds_x, - GLint bounds_y, - GLint bounds_width, - GLint bounds_height, - GLfloat uv_x, - GLfloat uv_y, - GLfloat uv_width, - GLfloat uv_height); -#endif -typedef void(GL_APIENTRYP PFNGLSCHEDULEOVERLAYPLANECHROMIUMPROC)( - GLint plane_z_order, - GLenum plane_transform, - GLuint overlay_texture_id, - GLint bounds_x, - GLint bounds_y, - GLint bounds_width, - GLint bounds_height, - GLfloat uv_x, - GLfloat uv_y, - GLfloat uv_width, - GLfloat uv_height); -#endif /* GL_CHROMIUM_schedule_overlay_plane */ - -/* GL_CHROMIUM_sync_query */ -#ifndef GL_CHROMIUM_sync_query -#define GL_CHROMIUM_sync_query 1 - -#ifndef GL_COMMANDS_COMPLETED_CHROMIUM -#define GL_COMMANDS_COMPLETED_CHROMIUM 0x84F7 -#endif -#endif /* GL_CHROMIUM_sync_query */ - -#ifndef GL_CHROMIUM_path_rendering -#define GL_CHROMIUM_path_rendering 1 - -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY - glMatrixLoadfCHROMIUM(GLenum mode, const GLfloat* m); -GL_APICALL void GL_APIENTRY glMatrixLoadIdentityCHROMIUM(GLenum mode); -#endif - -typedef void(GL_APIENTRYP PFNGLMATRIXLOADFCHROMIUMPROC)(GLenum matrixMode, - const GLfloat* m); -typedef void(GL_APIENTRYP PFNGLMATRIXLOADIDENTITYCHROMIUMPROC)( - GLenum matrixMode); - -#endif /* GL_CHROMIUM_path_rendering */ - -#ifdef __cplusplus -} -#endif - -#endif // GPU_GLES2_GL2EXTMOJO_H_ diff --git a/third_party/mojo/src/mojo/public/c/gpu/GLES2/gl2mojo.h b/third_party/mojo/src/mojo/public/c/gpu/GLES2/gl2mojo.h deleted file mode 100644 index 8b259ba3909ef4..00000000000000 --- a/third_party/mojo/src/mojo/public/c/gpu/GLES2/gl2mojo.h +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// This file contains Mojo-specific GLES2 declarations. - -#ifndef GPU_GLES2_GL2MOJO_H_ -#define GPU_GLES2_GL2MOJO_H_ - -#include - -#define GL_CONTEXT_LOST 0x300E -#define GL_PATH_MODELVIEW_CHROMIUM 0x1700 -#define GL_PATH_PROJECTION_CHROMIUM 0x1701 -#define GL_PATH_MODELVIEW_MATRIX_CHROMIUM 0x0BA6 -#define GL_PATH_PROJECTION_MATRIX_CHROMIUM 0x0BA7 - -#if defined(GLES2_USE_MOJO) -#define GLES2_GET_FUN(name) MojoGLES2gl ## name -#else -// Because we are using both the real system GL and our own -// emulated GL we need to use different names to avoid conflicts. -#if defined(GLES2_USE_CPP_BINDINGS) -#define GLES2_GET_FUN(name) gles2::GetGLContext()->name -#else -#define GLES2_GET_FUN(name) GLES2 ## name -#endif -#endif - -#include - -#endif // GPU_GLES2_GL2MOJO_H_ diff --git a/third_party/mojo/src/mojo/public/c/gpu/GLES2/gl2mojo_autogen.h b/third_party/mojo/src/mojo/public/c/gpu/GLES2/gl2mojo_autogen.h deleted file mode 100644 index eafc35ddb5f3c2..00000000000000 --- a/third_party/mojo/src/mojo/public/c/gpu/GLES2/gl2mojo_autogen.h +++ /dev/null @@ -1,325 +0,0 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// This file is auto-generated from -// gpu/command_buffer/build_gles2_cmd_buffer.py -// It's formatted by clang-format using chromium coding style: -// clang-format -i -style=chromium filename -// DO NOT EDIT! - -// This file contains Mojo-specific GLES2 declarations. - -#ifndef GPU_GLES2_GL2MOJO_AUTOGEN_H_ -#define GPU_GLES2_GL2MOJO_AUTOGEN_H_ - -#define glActiveTexture GLES2_GET_FUN(ActiveTexture) -#define glAttachShader GLES2_GET_FUN(AttachShader) -#define glBindAttribLocation GLES2_GET_FUN(BindAttribLocation) -#define glBindBuffer GLES2_GET_FUN(BindBuffer) -#define glBindBufferBase GLES2_GET_FUN(BindBufferBase) -#define glBindBufferRange GLES2_GET_FUN(BindBufferRange) -#define glBindFramebuffer GLES2_GET_FUN(BindFramebuffer) -#define glBindRenderbuffer GLES2_GET_FUN(BindRenderbuffer) -#define glBindSampler GLES2_GET_FUN(BindSampler) -#define glBindTexture GLES2_GET_FUN(BindTexture) -#define glBindTransformFeedback GLES2_GET_FUN(BindTransformFeedback) -#define glBlendColor GLES2_GET_FUN(BlendColor) -#define glBlendEquation GLES2_GET_FUN(BlendEquation) -#define glBlendEquationSeparate GLES2_GET_FUN(BlendEquationSeparate) -#define glBlendFunc GLES2_GET_FUN(BlendFunc) -#define glBlendFuncSeparate GLES2_GET_FUN(BlendFuncSeparate) -#define glBufferData GLES2_GET_FUN(BufferData) -#define glBufferSubData GLES2_GET_FUN(BufferSubData) -#define glCheckFramebufferStatus GLES2_GET_FUN(CheckFramebufferStatus) -#define glClear GLES2_GET_FUN(Clear) -#define glClearBufferfi GLES2_GET_FUN(ClearBufferfi) -#define glClearBufferfv GLES2_GET_FUN(ClearBufferfv) -#define glClearBufferiv GLES2_GET_FUN(ClearBufferiv) -#define glClearBufferuiv GLES2_GET_FUN(ClearBufferuiv) -#define glClearColor GLES2_GET_FUN(ClearColor) -#define glClearDepthf GLES2_GET_FUN(ClearDepthf) -#define glClearStencil GLES2_GET_FUN(ClearStencil) -#define glClientWaitSync GLES2_GET_FUN(ClientWaitSync) -#define glColorMask GLES2_GET_FUN(ColorMask) -#define glCompileShader GLES2_GET_FUN(CompileShader) -#define glCompressedTexImage2D GLES2_GET_FUN(CompressedTexImage2D) -#define glCompressedTexSubImage2D GLES2_GET_FUN(CompressedTexSubImage2D) -#define glCopyBufferSubData GLES2_GET_FUN(CopyBufferSubData) -#define glCopyTexImage2D GLES2_GET_FUN(CopyTexImage2D) -#define glCopyTexSubImage2D GLES2_GET_FUN(CopyTexSubImage2D) -#define glCopyTexSubImage3D GLES2_GET_FUN(CopyTexSubImage3D) -#define glCreateProgram GLES2_GET_FUN(CreateProgram) -#define glCreateShader GLES2_GET_FUN(CreateShader) -#define glCullFace GLES2_GET_FUN(CullFace) -#define glDeleteBuffers GLES2_GET_FUN(DeleteBuffers) -#define glDeleteFramebuffers GLES2_GET_FUN(DeleteFramebuffers) -#define glDeleteProgram GLES2_GET_FUN(DeleteProgram) -#define glDeleteRenderbuffers GLES2_GET_FUN(DeleteRenderbuffers) -#define glDeleteSamplers GLES2_GET_FUN(DeleteSamplers) -#define glDeleteSync GLES2_GET_FUN(DeleteSync) -#define glDeleteShader GLES2_GET_FUN(DeleteShader) -#define glDeleteTextures GLES2_GET_FUN(DeleteTextures) -#define glDeleteTransformFeedbacks GLES2_GET_FUN(DeleteTransformFeedbacks) -#define glDepthFunc GLES2_GET_FUN(DepthFunc) -#define glDepthMask GLES2_GET_FUN(DepthMask) -#define glDepthRangef GLES2_GET_FUN(DepthRangef) -#define glDetachShader GLES2_GET_FUN(DetachShader) -#define glDisable GLES2_GET_FUN(Disable) -#define glDisableVertexAttribArray GLES2_GET_FUN(DisableVertexAttribArray) -#define glDrawArrays GLES2_GET_FUN(DrawArrays) -#define glDrawElements GLES2_GET_FUN(DrawElements) -#define glDrawRangeElements GLES2_GET_FUN(DrawRangeElements) -#define glEnable GLES2_GET_FUN(Enable) -#define glEnableVertexAttribArray GLES2_GET_FUN(EnableVertexAttribArray) -#define glFenceSync GLES2_GET_FUN(FenceSync) -#define glFinish GLES2_GET_FUN(Finish) -#define glFlush GLES2_GET_FUN(Flush) -#define glFramebufferRenderbuffer GLES2_GET_FUN(FramebufferRenderbuffer) -#define glFramebufferTexture2D GLES2_GET_FUN(FramebufferTexture2D) -#define glFramebufferTextureLayer GLES2_GET_FUN(FramebufferTextureLayer) -#define glFrontFace GLES2_GET_FUN(FrontFace) -#define glGenBuffers GLES2_GET_FUN(GenBuffers) -#define glGenerateMipmap GLES2_GET_FUN(GenerateMipmap) -#define glGenFramebuffers GLES2_GET_FUN(GenFramebuffers) -#define glGenRenderbuffers GLES2_GET_FUN(GenRenderbuffers) -#define glGenSamplers GLES2_GET_FUN(GenSamplers) -#define glGenTextures GLES2_GET_FUN(GenTextures) -#define glGenTransformFeedbacks GLES2_GET_FUN(GenTransformFeedbacks) -#define glGetActiveAttrib GLES2_GET_FUN(GetActiveAttrib) -#define glGetActiveUniform GLES2_GET_FUN(GetActiveUniform) -#define glGetActiveUniformBlockiv GLES2_GET_FUN(GetActiveUniformBlockiv) -#define glGetActiveUniformBlockName GLES2_GET_FUN(GetActiveUniformBlockName) -#define glGetActiveUniformsiv GLES2_GET_FUN(GetActiveUniformsiv) -#define glGetAttachedShaders GLES2_GET_FUN(GetAttachedShaders) -#define glGetAttribLocation GLES2_GET_FUN(GetAttribLocation) -#define glGetBooleanv GLES2_GET_FUN(GetBooleanv) -#define glGetBufferParameteriv GLES2_GET_FUN(GetBufferParameteriv) -#define glGetError GLES2_GET_FUN(GetError) -#define glGetFloatv GLES2_GET_FUN(GetFloatv) -#define glGetFragDataLocation GLES2_GET_FUN(GetFragDataLocation) -#define glGetFramebufferAttachmentParameteriv \ - GLES2_GET_FUN(GetFramebufferAttachmentParameteriv) -#define glGetInteger64v GLES2_GET_FUN(GetInteger64v) -#define glGetIntegeri_v GLES2_GET_FUN(GetIntegeri_v) -#define glGetInteger64i_v GLES2_GET_FUN(GetInteger64i_v) -#define glGetIntegerv GLES2_GET_FUN(GetIntegerv) -#define glGetInternalformativ GLES2_GET_FUN(GetInternalformativ) -#define glGetProgramiv GLES2_GET_FUN(GetProgramiv) -#define glGetProgramInfoLog GLES2_GET_FUN(GetProgramInfoLog) -#define glGetRenderbufferParameteriv GLES2_GET_FUN(GetRenderbufferParameteriv) -#define glGetSamplerParameterfv GLES2_GET_FUN(GetSamplerParameterfv) -#define glGetSamplerParameteriv GLES2_GET_FUN(GetSamplerParameteriv) -#define glGetShaderiv GLES2_GET_FUN(GetShaderiv) -#define glGetShaderInfoLog GLES2_GET_FUN(GetShaderInfoLog) -#define glGetShaderPrecisionFormat GLES2_GET_FUN(GetShaderPrecisionFormat) -#define glGetShaderSource GLES2_GET_FUN(GetShaderSource) -#define glGetString GLES2_GET_FUN(GetString) -#define glGetSynciv GLES2_GET_FUN(GetSynciv) -#define glGetTexParameterfv GLES2_GET_FUN(GetTexParameterfv) -#define glGetTexParameteriv GLES2_GET_FUN(GetTexParameteriv) -#define glGetTransformFeedbackVarying GLES2_GET_FUN(GetTransformFeedbackVarying) -#define glGetUniformBlockIndex GLES2_GET_FUN(GetUniformBlockIndex) -#define glGetUniformfv GLES2_GET_FUN(GetUniformfv) -#define glGetUniformiv GLES2_GET_FUN(GetUniformiv) -#define glGetUniformIndices GLES2_GET_FUN(GetUniformIndices) -#define glGetUniformLocation GLES2_GET_FUN(GetUniformLocation) -#define glGetVertexAttribfv GLES2_GET_FUN(GetVertexAttribfv) -#define glGetVertexAttribiv GLES2_GET_FUN(GetVertexAttribiv) -#define glGetVertexAttribPointerv GLES2_GET_FUN(GetVertexAttribPointerv) -#define glHint GLES2_GET_FUN(Hint) -#define glInvalidateFramebuffer GLES2_GET_FUN(InvalidateFramebuffer) -#define glInvalidateSubFramebuffer GLES2_GET_FUN(InvalidateSubFramebuffer) -#define glIsBuffer GLES2_GET_FUN(IsBuffer) -#define glIsEnabled GLES2_GET_FUN(IsEnabled) -#define glIsFramebuffer GLES2_GET_FUN(IsFramebuffer) -#define glIsProgram GLES2_GET_FUN(IsProgram) -#define glIsRenderbuffer GLES2_GET_FUN(IsRenderbuffer) -#define glIsSampler GLES2_GET_FUN(IsSampler) -#define glIsShader GLES2_GET_FUN(IsShader) -#define glIsSync GLES2_GET_FUN(IsSync) -#define glIsTexture GLES2_GET_FUN(IsTexture) -#define glIsTransformFeedback GLES2_GET_FUN(IsTransformFeedback) -#define glLineWidth GLES2_GET_FUN(LineWidth) -#define glLinkProgram GLES2_GET_FUN(LinkProgram) -#define glPauseTransformFeedback GLES2_GET_FUN(PauseTransformFeedback) -#define glPixelStorei GLES2_GET_FUN(PixelStorei) -#define glPolygonOffset GLES2_GET_FUN(PolygonOffset) -#define glReadBuffer GLES2_GET_FUN(ReadBuffer) -#define glReadPixels GLES2_GET_FUN(ReadPixels) -#define glReleaseShaderCompiler GLES2_GET_FUN(ReleaseShaderCompiler) -#define glRenderbufferStorage GLES2_GET_FUN(RenderbufferStorage) -#define glResumeTransformFeedback GLES2_GET_FUN(ResumeTransformFeedback) -#define glSampleCoverage GLES2_GET_FUN(SampleCoverage) -#define glSamplerParameterf GLES2_GET_FUN(SamplerParameterf) -#define glSamplerParameterfv GLES2_GET_FUN(SamplerParameterfv) -#define glSamplerParameteri GLES2_GET_FUN(SamplerParameteri) -#define glSamplerParameteriv GLES2_GET_FUN(SamplerParameteriv) -#define glScissor GLES2_GET_FUN(Scissor) -#define glShaderBinary GLES2_GET_FUN(ShaderBinary) -#define glShaderSource GLES2_GET_FUN(ShaderSource) -#define glShallowFinishCHROMIUM GLES2_GET_FUN(ShallowFinishCHROMIUM) -#define glShallowFlushCHROMIUM GLES2_GET_FUN(ShallowFlushCHROMIUM) -#define glOrderingBarrierCHROMIUM GLES2_GET_FUN(OrderingBarrierCHROMIUM) -#define glStencilFunc GLES2_GET_FUN(StencilFunc) -#define glStencilFuncSeparate GLES2_GET_FUN(StencilFuncSeparate) -#define glStencilMask GLES2_GET_FUN(StencilMask) -#define glStencilMaskSeparate GLES2_GET_FUN(StencilMaskSeparate) -#define glStencilOp GLES2_GET_FUN(StencilOp) -#define glStencilOpSeparate GLES2_GET_FUN(StencilOpSeparate) -#define glTexImage2D GLES2_GET_FUN(TexImage2D) -#define glTexImage3D GLES2_GET_FUN(TexImage3D) -#define glTexParameterf GLES2_GET_FUN(TexParameterf) -#define glTexParameterfv GLES2_GET_FUN(TexParameterfv) -#define glTexParameteri GLES2_GET_FUN(TexParameteri) -#define glTexParameteriv GLES2_GET_FUN(TexParameteriv) -#define glTexStorage3D GLES2_GET_FUN(TexStorage3D) -#define glTexSubImage2D GLES2_GET_FUN(TexSubImage2D) -#define glTexSubImage3D GLES2_GET_FUN(TexSubImage3D) -#define glTransformFeedbackVaryings GLES2_GET_FUN(TransformFeedbackVaryings) -#define glUniform1f GLES2_GET_FUN(Uniform1f) -#define glUniform1fv GLES2_GET_FUN(Uniform1fv) -#define glUniform1i GLES2_GET_FUN(Uniform1i) -#define glUniform1iv GLES2_GET_FUN(Uniform1iv) -#define glUniform1ui GLES2_GET_FUN(Uniform1ui) -#define glUniform1uiv GLES2_GET_FUN(Uniform1uiv) -#define glUniform2f GLES2_GET_FUN(Uniform2f) -#define glUniform2fv GLES2_GET_FUN(Uniform2fv) -#define glUniform2i GLES2_GET_FUN(Uniform2i) -#define glUniform2iv GLES2_GET_FUN(Uniform2iv) -#define glUniform2ui GLES2_GET_FUN(Uniform2ui) -#define glUniform2uiv GLES2_GET_FUN(Uniform2uiv) -#define glUniform3f GLES2_GET_FUN(Uniform3f) -#define glUniform3fv GLES2_GET_FUN(Uniform3fv) -#define glUniform3i GLES2_GET_FUN(Uniform3i) -#define glUniform3iv GLES2_GET_FUN(Uniform3iv) -#define glUniform3ui GLES2_GET_FUN(Uniform3ui) -#define glUniform3uiv GLES2_GET_FUN(Uniform3uiv) -#define glUniform4f GLES2_GET_FUN(Uniform4f) -#define glUniform4fv GLES2_GET_FUN(Uniform4fv) -#define glUniform4i GLES2_GET_FUN(Uniform4i) -#define glUniform4iv GLES2_GET_FUN(Uniform4iv) -#define glUniform4ui GLES2_GET_FUN(Uniform4ui) -#define glUniform4uiv GLES2_GET_FUN(Uniform4uiv) -#define glUniformBlockBinding GLES2_GET_FUN(UniformBlockBinding) -#define glUniformMatrix2fv GLES2_GET_FUN(UniformMatrix2fv) -#define glUniformMatrix2x3fv GLES2_GET_FUN(UniformMatrix2x3fv) -#define glUniformMatrix2x4fv GLES2_GET_FUN(UniformMatrix2x4fv) -#define glUniformMatrix3fv GLES2_GET_FUN(UniformMatrix3fv) -#define glUniformMatrix3x2fv GLES2_GET_FUN(UniformMatrix3x2fv) -#define glUniformMatrix3x4fv GLES2_GET_FUN(UniformMatrix3x4fv) -#define glUniformMatrix4fv GLES2_GET_FUN(UniformMatrix4fv) -#define glUniformMatrix4x2fv GLES2_GET_FUN(UniformMatrix4x2fv) -#define glUniformMatrix4x3fv GLES2_GET_FUN(UniformMatrix4x3fv) -#define glUseProgram GLES2_GET_FUN(UseProgram) -#define glValidateProgram GLES2_GET_FUN(ValidateProgram) -#define glVertexAttrib1f GLES2_GET_FUN(VertexAttrib1f) -#define glVertexAttrib1fv GLES2_GET_FUN(VertexAttrib1fv) -#define glVertexAttrib2f GLES2_GET_FUN(VertexAttrib2f) -#define glVertexAttrib2fv GLES2_GET_FUN(VertexAttrib2fv) -#define glVertexAttrib3f GLES2_GET_FUN(VertexAttrib3f) -#define glVertexAttrib3fv GLES2_GET_FUN(VertexAttrib3fv) -#define glVertexAttrib4f GLES2_GET_FUN(VertexAttrib4f) -#define glVertexAttrib4fv GLES2_GET_FUN(VertexAttrib4fv) -#define glVertexAttribI4i GLES2_GET_FUN(VertexAttribI4i) -#define glVertexAttribI4iv GLES2_GET_FUN(VertexAttribI4iv) -#define glVertexAttribI4ui GLES2_GET_FUN(VertexAttribI4ui) -#define glVertexAttribI4uiv GLES2_GET_FUN(VertexAttribI4uiv) -#define glVertexAttribIPointer GLES2_GET_FUN(VertexAttribIPointer) -#define glVertexAttribPointer GLES2_GET_FUN(VertexAttribPointer) -#define glViewport GLES2_GET_FUN(Viewport) -#define glWaitSync GLES2_GET_FUN(WaitSync) -#define glBlitFramebufferCHROMIUM GLES2_GET_FUN(BlitFramebufferCHROMIUM) -#define glRenderbufferStorageMultisampleCHROMIUM \ - GLES2_GET_FUN(RenderbufferStorageMultisampleCHROMIUM) -#define glRenderbufferStorageMultisampleEXT \ - GLES2_GET_FUN(RenderbufferStorageMultisampleEXT) -#define glFramebufferTexture2DMultisampleEXT \ - GLES2_GET_FUN(FramebufferTexture2DMultisampleEXT) -#define glTexStorage2DEXT GLES2_GET_FUN(TexStorage2DEXT) -#define glGenQueriesEXT GLES2_GET_FUN(GenQueriesEXT) -#define glDeleteQueriesEXT GLES2_GET_FUN(DeleteQueriesEXT) -#define glIsQueryEXT GLES2_GET_FUN(IsQueryEXT) -#define glBeginQueryEXT GLES2_GET_FUN(BeginQueryEXT) -#define glBeginTransformFeedback GLES2_GET_FUN(BeginTransformFeedback) -#define glEndQueryEXT GLES2_GET_FUN(EndQueryEXT) -#define glEndTransformFeedback GLES2_GET_FUN(EndTransformFeedback) -#define glGetQueryivEXT GLES2_GET_FUN(GetQueryivEXT) -#define glGetQueryObjectuivEXT GLES2_GET_FUN(GetQueryObjectuivEXT) -#define glInsertEventMarkerEXT GLES2_GET_FUN(InsertEventMarkerEXT) -#define glPushGroupMarkerEXT GLES2_GET_FUN(PushGroupMarkerEXT) -#define glPopGroupMarkerEXT GLES2_GET_FUN(PopGroupMarkerEXT) -#define glGenVertexArraysOES GLES2_GET_FUN(GenVertexArraysOES) -#define glDeleteVertexArraysOES GLES2_GET_FUN(DeleteVertexArraysOES) -#define glIsVertexArrayOES GLES2_GET_FUN(IsVertexArrayOES) -#define glBindVertexArrayOES GLES2_GET_FUN(BindVertexArrayOES) -#define glSwapBuffers GLES2_GET_FUN(SwapBuffers) -#define glGetMaxValueInBufferCHROMIUM GLES2_GET_FUN(GetMaxValueInBufferCHROMIUM) -#define glEnableFeatureCHROMIUM GLES2_GET_FUN(EnableFeatureCHROMIUM) -#define glMapBufferCHROMIUM GLES2_GET_FUN(MapBufferCHROMIUM) -#define glUnmapBufferCHROMIUM GLES2_GET_FUN(UnmapBufferCHROMIUM) -#define glMapBufferSubDataCHROMIUM GLES2_GET_FUN(MapBufferSubDataCHROMIUM) -#define glUnmapBufferSubDataCHROMIUM GLES2_GET_FUN(UnmapBufferSubDataCHROMIUM) -#define glMapBufferRange GLES2_GET_FUN(MapBufferRange) -#define glUnmapBuffer GLES2_GET_FUN(UnmapBuffer) -#define glMapTexSubImage2DCHROMIUM GLES2_GET_FUN(MapTexSubImage2DCHROMIUM) -#define glUnmapTexSubImage2DCHROMIUM GLES2_GET_FUN(UnmapTexSubImage2DCHROMIUM) -#define glResizeCHROMIUM GLES2_GET_FUN(ResizeCHROMIUM) -#define glGetRequestableExtensionsCHROMIUM \ - GLES2_GET_FUN(GetRequestableExtensionsCHROMIUM) -#define glRequestExtensionCHROMIUM GLES2_GET_FUN(RequestExtensionCHROMIUM) -#define glRateLimitOffscreenContextCHROMIUM \ - GLES2_GET_FUN(RateLimitOffscreenContextCHROMIUM) -#define glGetProgramInfoCHROMIUM GLES2_GET_FUN(GetProgramInfoCHROMIUM) -#define glGetUniformBlocksCHROMIUM GLES2_GET_FUN(GetUniformBlocksCHROMIUM) -#define glGetTransformFeedbackVaryingsCHROMIUM \ - GLES2_GET_FUN(GetTransformFeedbackVaryingsCHROMIUM) -#define glGetUniformsES3CHROMIUM GLES2_GET_FUN(GetUniformsES3CHROMIUM) -#define glCreateStreamTextureCHROMIUM GLES2_GET_FUN(CreateStreamTextureCHROMIUM) -#define glCreateImageCHROMIUM GLES2_GET_FUN(CreateImageCHROMIUM) -#define glDestroyImageCHROMIUM GLES2_GET_FUN(DestroyImageCHROMIUM) -#define glCreateGpuMemoryBufferImageCHROMIUM \ - GLES2_GET_FUN(CreateGpuMemoryBufferImageCHROMIUM) -#define glGetTranslatedShaderSourceANGLE \ - GLES2_GET_FUN(GetTranslatedShaderSourceANGLE) -#define glPostSubBufferCHROMIUM GLES2_GET_FUN(PostSubBufferCHROMIUM) -#define glTexImageIOSurface2DCHROMIUM GLES2_GET_FUN(TexImageIOSurface2DCHROMIUM) -#define glCopyTextureCHROMIUM GLES2_GET_FUN(CopyTextureCHROMIUM) -#define glCopySubTextureCHROMIUM GLES2_GET_FUN(CopySubTextureCHROMIUM) -#define glDrawArraysInstancedANGLE GLES2_GET_FUN(DrawArraysInstancedANGLE) -#define glDrawElementsInstancedANGLE GLES2_GET_FUN(DrawElementsInstancedANGLE) -#define glVertexAttribDivisorANGLE GLES2_GET_FUN(VertexAttribDivisorANGLE) -#define glGenMailboxCHROMIUM GLES2_GET_FUN(GenMailboxCHROMIUM) -#define glProduceTextureCHROMIUM GLES2_GET_FUN(ProduceTextureCHROMIUM) -#define glProduceTextureDirectCHROMIUM \ - GLES2_GET_FUN(ProduceTextureDirectCHROMIUM) -#define glConsumeTextureCHROMIUM GLES2_GET_FUN(ConsumeTextureCHROMIUM) -#define glCreateAndConsumeTextureCHROMIUM \ - GLES2_GET_FUN(CreateAndConsumeTextureCHROMIUM) -#define glBindUniformLocationCHROMIUM GLES2_GET_FUN(BindUniformLocationCHROMIUM) -#define glGenValuebuffersCHROMIUM GLES2_GET_FUN(GenValuebuffersCHROMIUM) -#define glDeleteValuebuffersCHROMIUM GLES2_GET_FUN(DeleteValuebuffersCHROMIUM) -#define glIsValuebufferCHROMIUM GLES2_GET_FUN(IsValuebufferCHROMIUM) -#define glBindValuebufferCHROMIUM GLES2_GET_FUN(BindValuebufferCHROMIUM) -#define glSubscribeValueCHROMIUM GLES2_GET_FUN(SubscribeValueCHROMIUM) -#define glPopulateSubscribedValuesCHROMIUM \ - GLES2_GET_FUN(PopulateSubscribedValuesCHROMIUM) -#define glUniformValuebufferCHROMIUM GLES2_GET_FUN(UniformValuebufferCHROMIUM) -#define glBindTexImage2DCHROMIUM GLES2_GET_FUN(BindTexImage2DCHROMIUM) -#define glReleaseTexImage2DCHROMIUM GLES2_GET_FUN(ReleaseTexImage2DCHROMIUM) -#define glTraceBeginCHROMIUM GLES2_GET_FUN(TraceBeginCHROMIUM) -#define glTraceEndCHROMIUM GLES2_GET_FUN(TraceEndCHROMIUM) -#define glDiscardFramebufferEXT GLES2_GET_FUN(DiscardFramebufferEXT) -#define glLoseContextCHROMIUM GLES2_GET_FUN(LoseContextCHROMIUM) -#define glInsertSyncPointCHROMIUM GLES2_GET_FUN(InsertSyncPointCHROMIUM) -#define glWaitSyncPointCHROMIUM GLES2_GET_FUN(WaitSyncPointCHROMIUM) -#define glDrawBuffersEXT GLES2_GET_FUN(DrawBuffersEXT) -#define glDiscardBackbufferCHROMIUM GLES2_GET_FUN(DiscardBackbufferCHROMIUM) -#define glScheduleOverlayPlaneCHROMIUM \ - GLES2_GET_FUN(ScheduleOverlayPlaneCHROMIUM) -#define glSwapInterval GLES2_GET_FUN(SwapInterval) -#define glMatrixLoadfCHROMIUM GLES2_GET_FUN(MatrixLoadfCHROMIUM) -#define glMatrixLoadIdentityCHROMIUM GLES2_GET_FUN(MatrixLoadIdentityCHROMIUM) -#define glBlendBarrierKHR GLES2_GET_FUN(BlendBarrierKHR) - -#endif // GPU_GLES2_GL2MOJO_AUTOGEN_H_ diff --git a/third_party/mojo/src/mojo/public/c/gpu/GLES2/gl2platform.h b/third_party/mojo/src/mojo/public/c/gpu/GLES2/gl2platform.h deleted file mode 100644 index 89d4d44dc1bbfd..00000000000000 --- a/third_party/mojo/src/mojo/public/c/gpu/GLES2/gl2platform.h +++ /dev/null @@ -1,30 +0,0 @@ -#ifndef __gl2platform_h_ -#define __gl2platform_h_ - -/* $Revision: 23328 $ on $Date:: 2013-10-02 02:28:28 -0700 #$ */ - -/* - * This document is licensed under the SGI Free Software B License Version - * 2.0. For details, see http://oss.sgi.com/projects/FreeB/ . - */ - -/* Platform-specific types and definitions for OpenGL ES 2.X gl2.h - * - * Adopters may modify khrplatform.h and this file to suit their platform. - * You are encouraged to submit all modifications to the Khronos group so that - * they can be included in future versions of this file. Please submit changes - * by sending them to the public Khronos Bugzilla (http://khronos.org/bugzilla) - * by filing a bug against product "OpenGL-ES" component "Registry". - */ - -#include - -#ifndef GL_APICALL -#define GL_APICALL KHRONOS_APICALL -#endif - -#ifndef GL_APIENTRY -#define GL_APIENTRY KHRONOS_APIENTRY -#endif - -#endif /* __gl2platform_h_ */ diff --git a/third_party/mojo/src/mojo/public/c/gpu/KHR/khrplatform.h b/third_party/mojo/src/mojo/public/c/gpu/KHR/khrplatform.h deleted file mode 100644 index 026c9c7e906b21..00000000000000 --- a/third_party/mojo/src/mojo/public/c/gpu/KHR/khrplatform.h +++ /dev/null @@ -1,298 +0,0 @@ -#ifndef __khrplatform_h_ -#define __khrplatform_h_ - -/* -** Copyright (c) 2008-2009 The Khronos Group Inc. -** -** Permission is hereby granted, free of charge, to any person obtaining a -** copy of this software and/or associated documentation files (the -** "Materials"), to deal in the Materials without restriction, including -** without limitation the rights to use, copy, modify, merge, publish, -** distribute, sublicense, and/or sell copies of the Materials, and to -** permit persons to whom the Materials are furnished to do so, subject to -** the following conditions: -** -** The above copyright notice and this permission notice shall be included -** in all copies or substantial portions of the Materials. -** -** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. -*/ - -/* Khronos platform-specific types and definitions. - * - * $Revision: 23298 $ on $Date: 2013-09-30 17:07:13 -0700 (Mon, 30 Sep 2013) $ - * - * Adopters may modify this file to suit their platform. Adopters are - * encouraged to submit platform specific modifications to the Khronos - * group so that they can be included in future versions of this file. - * Please submit changes by sending them to the public Khronos Bugzilla - * (http://khronos.org/bugzilla) by filing a bug against product - * "Khronos (general)" component "Registry". - * - * A predefined template which fills in some of the bug fields can be - * reached using http://tinyurl.com/khrplatform-h-bugreport, but you - * must create a Bugzilla login first. - * - * - * See the Implementer's Guidelines for information about where this file - * should be located on your system and for more details of its use: - * http://www.khronos.org/registry/implementers_guide.pdf - * - * This file should be included as - * #include - * by Khronos client API header files that use its types and defines. - * - * The types in khrplatform.h should only be used to define API-specific types. - * - * Types defined in khrplatform.h: - * khronos_int8_t signed 8 bit - * khronos_uint8_t unsigned 8 bit - * khronos_int16_t signed 16 bit - * khronos_uint16_t unsigned 16 bit - * khronos_int32_t signed 32 bit - * khronos_uint32_t unsigned 32 bit - * khronos_int64_t signed 64 bit - * khronos_uint64_t unsigned 64 bit - * khronos_intptr_t signed same number of bits as a pointer - * khronos_uintptr_t unsigned same number of bits as a pointer - * khronos_ssize_t signed size - * khronos_usize_t unsigned size - * khronos_float_t signed 32 bit floating point - * khronos_time_ns_t unsigned 64 bit time in nanoseconds - * khronos_utime_nanoseconds_t unsigned time interval or absolute time in - * nanoseconds - * khronos_stime_nanoseconds_t signed time interval in nanoseconds - * khronos_boolean_enum_t enumerated boolean type. This should - * only be used as a base type when a client API's boolean type is - * an enum. Client APIs which use an integer or other type for - * booleans cannot use this as the base type for their boolean. - * - * Tokens defined in khrplatform.h: - * - * KHRONOS_FALSE, KHRONOS_TRUE Enumerated boolean false/true values. - * - * KHRONOS_SUPPORT_INT64 is 1 if 64 bit integers are supported; otherwise 0. - * KHRONOS_SUPPORT_FLOAT is 1 if floats are supported; otherwise 0. - * - * Calling convention macros defined in this file: - * KHRONOS_APICALL - * KHRONOS_APIENTRY - * KHRONOS_APIATTRIBUTES - * - * These may be used in function prototypes as: - * - * KHRONOS_APICALL void KHRONOS_APIENTRY funcname( - * int arg1, - * int arg2) KHRONOS_APIATTRIBUTES; - */ - -/*------------------------------------------------------------------------- - * Definition of KHRONOS_APICALL - *------------------------------------------------------------------------- - * This precedes the return type of the function in the function prototype. - */ -#if defined(_WIN32) && !defined(__SCITECH_SNAP__) -# define KHRONOS_APICALL __declspec(dllimport) -#elif defined (__SYMBIAN32__) -# define KHRONOS_APICALL IMPORT_C -#else -# define KHRONOS_APICALL -#endif - -/*------------------------------------------------------------------------- - * Definition of KHRONOS_APIENTRY - *------------------------------------------------------------------------- - * This follows the return type of the function and precedes the function - * name in the function prototype. - */ -#if defined(_WIN32) && !defined(_WIN32_WCE) && !defined(__SCITECH_SNAP__) - /* Win32 but not WinCE */ -# define KHRONOS_APIENTRY __stdcall -#else -# define KHRONOS_APIENTRY -#endif - -/*------------------------------------------------------------------------- - * Chromium-specific overrides of KHRONOS_APICALL and KHRONOS_APIENTRY - *-----------------------------------------------------------------------*/ - -#undef KHRONOS_APICALL -#if defined(GLES2_USE_MOJO) -#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" -#define KHRONOS_APICALL GLES2_C_LIB_EXPORT -#endif - -#undef KHRONOS_APIENTRY -#define KHRONOS_APIENTRY - -/*------------------------------------------------------------------------- - * Definition of KHRONOS_APIATTRIBUTES - *------------------------------------------------------------------------- - * This follows the closing parenthesis of the function prototype arguments. - */ -#if defined (__ARMCC_2__) -#define KHRONOS_APIATTRIBUTES __softfp -#else -#define KHRONOS_APIATTRIBUTES -#endif - -/*------------------------------------------------------------------------- - * basic type definitions - *-----------------------------------------------------------------------*/ -#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__GNUC__) || defined(__SCO__) || defined(__USLC__) - - -/* - * Using - */ -#include -typedef int32_t khronos_int32_t; -typedef uint32_t khronos_uint32_t; -typedef int64_t khronos_int64_t; -typedef uint64_t khronos_uint64_t; -#define KHRONOS_SUPPORT_INT64 1 -#define KHRONOS_SUPPORT_FLOAT 1 - -#elif defined(__VMS ) || defined(__sgi) - -/* - * Using - */ -#include -typedef int32_t khronos_int32_t; -typedef uint32_t khronos_uint32_t; -typedef int64_t khronos_int64_t; -typedef uint64_t khronos_uint64_t; -#define KHRONOS_SUPPORT_INT64 1 -#define KHRONOS_SUPPORT_FLOAT 1 - -#elif defined(_WIN32) && !defined(__SCITECH_SNAP__) - -/* - * Win32 - */ -typedef __int32 khronos_int32_t; -typedef unsigned __int32 khronos_uint32_t; -typedef __int64 khronos_int64_t; -typedef unsigned __int64 khronos_uint64_t; -#define KHRONOS_SUPPORT_INT64 1 -#define KHRONOS_SUPPORT_FLOAT 1 - -#elif defined(__sun__) || defined(__digital__) - -/* - * Sun or Digital - */ -typedef int khronos_int32_t; -typedef unsigned int khronos_uint32_t; -#if defined(__arch64__) || defined(_LP64) -typedef long int khronos_int64_t; -typedef unsigned long int khronos_uint64_t; -#else -typedef long long int khronos_int64_t; -typedef unsigned long long int khronos_uint64_t; -#endif /* __arch64__ */ -#define KHRONOS_SUPPORT_INT64 1 -#define KHRONOS_SUPPORT_FLOAT 1 - -#elif 0 - -/* - * Hypothetical platform with no float or int64 support - */ -typedef int khronos_int32_t; -typedef unsigned int khronos_uint32_t; -#define KHRONOS_SUPPORT_INT64 0 -#define KHRONOS_SUPPORT_FLOAT 0 - -#else - -/* - * Generic fallback - */ -#include -typedef int32_t khronos_int32_t; -typedef uint32_t khronos_uint32_t; -typedef int64_t khronos_int64_t; -typedef uint64_t khronos_uint64_t; -#define KHRONOS_SUPPORT_INT64 1 -#define KHRONOS_SUPPORT_FLOAT 1 - -#endif - - -/* - * Types that are (so far) the same on all platforms - */ -typedef signed char khronos_int8_t; -typedef unsigned char khronos_uint8_t; -typedef signed short int khronos_int16_t; -typedef unsigned short int khronos_uint16_t; - -/* - * Types that differ between LLP64 and LP64 architectures - in LLP64, - * pointers are 64 bits, but 'long' is still 32 bits. Win64 appears - * to be the only LLP64 architecture in current use. - */ -#ifdef _WIN64 -typedef signed long long int khronos_intptr_t; -typedef unsigned long long int khronos_uintptr_t; -typedef signed long long int khronos_ssize_t; -typedef unsigned long long int khronos_usize_t; -#else -typedef signed long int khronos_intptr_t; -typedef unsigned long int khronos_uintptr_t; -typedef signed long int khronos_ssize_t; -typedef unsigned long int khronos_usize_t; -#endif - -#if KHRONOS_SUPPORT_FLOAT -/* - * Float type - */ -typedef float khronos_float_t; -#endif - -#if KHRONOS_SUPPORT_INT64 -/* Time types - * - * These types can be used to represent a time interval in nanoseconds or - * an absolute Unadjusted System Time. Unadjusted System Time is the number - * of nanoseconds since some arbitrary system event (e.g. since the last - * time the system booted). The Unadjusted System Time is an unsigned - * 64 bit value that wraps back to 0 every 584 years. Time intervals - * may be either signed or unsigned. - */ -typedef khronos_uint64_t khronos_utime_nanoseconds_t; -typedef khronos_int64_t khronos_stime_nanoseconds_t; -#endif - -/* - * Dummy value used to pad enum types to 32 bits. - */ -#ifndef KHRONOS_MAX_ENUM -#define KHRONOS_MAX_ENUM 0x7FFFFFFF -#endif - -/* - * Enumerated boolean type - * - * Values other than zero should be considered to be true. Therefore - * comparisons should not be made against KHRONOS_TRUE. - */ -typedef enum { - KHRONOS_FALSE = 0, - KHRONOS_TRUE = 1, - KHRONOS_BOOLEAN_ENUM_FORCE_SIZE = KHRONOS_MAX_ENUM -} khronos_boolean_enum_t; - -#endif /* __khrplatform_h_ */ diff --git a/third_party/mojo/src/mojo/public/c/system/core.h b/third_party/mojo/src/mojo/public/c/system/core.h deleted file mode 100644 index e908afa93bf0ad..00000000000000 --- a/third_party/mojo/src/mojo/public/c/system/core.h +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// This is a catch-all header that includes everything. -// -// Note: This header should be compilable as C. - -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_C_SYSTEM_CORE_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_C_SYSTEM_CORE_H_ - -#include "third_party/mojo/src/mojo/public/c/system/buffer.h" -#include "third_party/mojo/src/mojo/public/c/system/data_pipe.h" -#include "third_party/mojo/src/mojo/public/c/system/functions.h" -#include "third_party/mojo/src/mojo/public/c/system/macros.h" -#include "third_party/mojo/src/mojo/public/c/system/main.h" -#include "third_party/mojo/src/mojo/public/c/system/message_pipe.h" -#include "third_party/mojo/src/mojo/public/c/system/system_export.h" -#include "third_party/mojo/src/mojo/public/c/system/types.h" - -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_C_SYSTEM_CORE_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/system/core.h b/third_party/mojo/src/mojo/public/cpp/system/core.h deleted file mode 100644 index 1b9888b6d9f6cf..00000000000000 --- a/third_party/mojo/src/mojo/public/cpp/system/core.h +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_SYSTEM_CORE_H_ -#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_SYSTEM_CORE_H_ - -#include "third_party/mojo/src/mojo/public/cpp/system/buffer.h" -#include "third_party/mojo/src/mojo/public/cpp/system/data_pipe.h" -#include "third_party/mojo/src/mojo/public/cpp/system/functions.h" -#include "third_party/mojo/src/mojo/public/cpp/system/handle.h" -#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" -#include "third_party/mojo/src/mojo/public/cpp/system/message_pipe.h" - -#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_SYSTEM_CORE_H_ diff --git a/third_party/mojo/src/mojo/public/mojo_application.gni b/third_party/mojo/src/mojo/public/mojo_application.gni deleted file mode 100644 index cd75691c0497b9..00000000000000 --- a/third_party/mojo/src/mojo/public/mojo_application.gni +++ /dev/null @@ -1,472 +0,0 @@ -# Copyright 2014 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//mojo/public/mojo.gni") -import("mojo_sdk.gni") - -# Generate a binary mojo application.The parameters of this template are those -# of a shared library. -template("mojo_native_application") { - if (defined(invoker.output_name)) { - base_target_name = invoker.output_name - } else { - base_target_name = target_name - } - - final_target_name = target_name - - if (!is_nacl) { - output = base_target_name + ".mojo" - library_target_name = base_target_name + "_library" - copy_symbols_target = "__${final_target_name}_copy_symbols" - - if (is_linux || is_android) { - library_name = "lib${library_target_name}.so" - } else if (is_win) { - library_name = "${library_target_name}.dll" - } else if (is_mac || is_ios) { - library_name = "lib${library_target_name}.dylib" - } else { - assert(false, "Platform not supported.") - } - - library_dir = root_out_dir - - shared_library(library_target_name) { - if (defined(invoker.cflags)) { - cflags = invoker.cflags - } - if (defined(invoker.cflags_c)) { - cflags_c = invoker.cflags_c - } - if (defined(invoker.cflags_cc)) { - cflags_cc = invoker.cflags_cc - } - if (defined(invoker.cflags_objc)) { - cflags_objc = invoker.cflags_objc - } - if (defined(invoker.cflags_objcc)) { - cflags_objcc = invoker.cflags_objcc - } - if (defined(invoker.defines)) { - defines = invoker.defines - } - if (defined(invoker.include_dirs)) { - include_dirs = invoker.include_dirs - } - if (defined(invoker.ldflags)) { - ldflags = invoker.ldflags - } - if (defined(invoker.lib_dirs)) { - lib_dirs = invoker.lib_dirs - } - if (defined(invoker.libs)) { - libs = invoker.libs - } - - data_deps = [] - if (defined(invoker.data_deps)) { - data_deps = invoker.data_deps - } - - # Copy any necessary prebuilt artifacts. - if (mojo_use_prebuilt_mojo_shell) { - data_deps += - [ rebase_path("mojo/public/tools:copy_mojo_shell", ".", mojo_root) ] - } - if (mojo_use_prebuilt_network_service) { - data_deps += [ rebase_path("mojo/public/tools:copy_network_service", - ".", - mojo_root) ] - } - - deps = rebase_path([ - "mojo/public/c/system", - "mojo/public/platform/native:system", - ], - ".", - mojo_root) - if (defined(invoker.deps)) { - deps += invoker.deps - } - if (defined(invoker.public_deps)) { - public_deps = invoker.public_deps - } - if (defined(invoker.all_dependent_configs)) { - all_dependent_configs = invoker.all_dependent_configs - } - if (defined(invoker.public_configs)) { - public_configs = invoker.public_configs - } - if (defined(invoker.check_includes)) { - check_includes = invoker.check_includes - } - if (defined(invoker.configs)) { - configs += invoker.configs - } - if (defined(invoker.data)) { - data = invoker.data - } - if (defined(invoker.inputs)) { - inputs = invoker.inputs - } - if (defined(invoker.public)) { - public = invoker.public - } - if (defined(invoker.sources)) { - sources = invoker.sources - } - if (defined(invoker.testonly)) { - testonly = invoker.testonly - } - - visibility = [ - ":${final_target_name}", - ":${copy_symbols_target}", - ] - } - - copy(copy_symbols_target) { - if (defined(invoker.testonly)) { - testonly = invoker.testonly - } - visibility = [ ":${final_target_name}" ] - deps = [ - ":${library_target_name}", - ] - - sources = [ - "${root_out_dir}/${library_name}", - ] - outputs = [ - "${root_out_dir}/symbols/${library_name}", - ] - } - - copy(final_target_name) { - if (defined(invoker.testonly)) { - testonly = invoker.testonly - } - if (defined(invoker.visibility)) { - visibility = invoker.visibility - } - deps = [ - ":${library_target_name}", - ":${copy_symbols_target}", - ] - - sources = [ - "${library_dir}/${library_name}", - ] - outputs = [ - "${root_out_dir}/${output}", - ] - } - } else { - nexe_target_name = base_target_name + "_nexe" - nexe_name = base_target_name + ".nexe" - - output = "${base_target_name}_${target_cpu}.nexe.mojo" - - executable(nexe_target_name) { - output_name = base_target_name - - if (defined(invoker.cflags)) { - cflags = invoker.cflags - } - if (defined(invoker.cflags_c)) { - cflags_c = invoker.cflags_c - } - if (defined(invoker.cflags_cc)) { - cflags_cc = invoker.cflags_cc - } - if (defined(invoker.cflags_objc)) { - cflags_objc = invoker.cflags_objc - } - if (defined(invoker.cflags_objcc)) { - cflags_objcc = invoker.cflags_objcc - } - if (defined(invoker.defines)) { - defines = invoker.defines - } - if (defined(invoker.include_dirs)) { - include_dirs = invoker.include_dirs - } - if (defined(invoker.ldflags)) { - ldflags = invoker.ldflags - } - if (defined(invoker.lib_dirs)) { - lib_dirs = invoker.lib_dirs - } - if (defined(invoker.libs)) { - libs = invoker.libs - } - - data_deps = [] - if (defined(invoker.data_deps)) { - data_deps = invoker.data_deps - } - - # Copy any necessary prebuilt artifacts. - if (mojo_use_prebuilt_mojo_shell) { - data_deps += - [ rebase_path("mojo/public/tools:copy_mojo_shell", ".", mojo_root) ] - } - if (mojo_use_prebuilt_network_service) { - data_deps += [ rebase_path("mojo/public/tools:copy_network_service", - ".", - mojo_root) ] - } - - deps = rebase_path([ - "mojo/public/c/system", - "mojo/public/platform/nacl:system", - ], - ".", - mojo_root) - if (defined(invoker.deps)) { - deps += invoker.deps - } - if (defined(invoker.public_deps)) { - public_deps = invoker.public_deps - } - if (defined(invoker.all_dependent_configs)) { - all_dependent_configs = invoker.all_dependent_configs - } - if (defined(invoker.public_configs)) { - public_configs = invoker.public_configs - } - if (defined(invoker.check_includes)) { - check_includes = invoker.check_includes - } - if (defined(invoker.configs)) { - configs += invoker.configs - } - if (defined(invoker.data)) { - data = invoker.data - } - if (defined(invoker.inputs)) { - inputs = invoker.inputs - } - if (defined(invoker.public)) { - public = invoker.public - } - if (defined(invoker.sources)) { - sources = invoker.sources - } - if (defined(invoker.testonly)) { - testonly = invoker.testonly - } - - visibility = [ ":${final_target_name}" ] - } - - action(target_name) { - if (defined(invoker.testonly)) { - testonly = invoker.testonly - } - if (defined(invoker.visibility)) { - visibility = invoker.visibility - } - - script = rebase_path("mojo/public/tools/prepend.py", ".", mojo_root) - - input_path = "${root_out_dir}/${nexe_name}" - inputs = [ - input_path, - ] - - output_path = "${root_build_dir}/${output}" - outputs = [ - output_path, - ] - - deps = [ - ":${nexe_target_name}", - ] - - rebase_input = rebase_path(input_path, root_build_dir) - rebase_output = rebase_path(output_path, root_build_dir) - args = [ - "--input=$rebase_input", - "--output=$rebase_output", - "--line=#!mojo mojo:nacl_content_handler", - ] - } - } -} - -if (is_android) { - import("//build/config/android/rules.gni") - - # Declares an Android Mojo application consisting of an .so file and a - # corresponding .dex.jar file. - # - # Variables: - # sources (optional): The c++ sources. - # deps (optional): The c++ dependencies. - # java_sources (optional): The java sources. - # java_deps (optional): The java dependencies. - # jni_package (optional): The c++ package for the generated jni headers. - # output_name (optional): override for the output file name - # public_deps / data_deps (optional): Dependencies. - template("mojo_android_application") { - shared_library_name = "__${target_name}_lib" - library_basename = "lib${shared_library_name}.so" - if (defined(invoker.jni_package)) { - assert(defined(invoker.java_sources)) - generate_jni_name = "__${target_name}_jni" - } - if (defined(invoker.java_sources)) { - java_library_name = "__${target_name}_java" - } - android_standalone_library_name = "__${target_name}_java_lib" - dex_output_path = "${target_gen_dir}/${target_name}.dex.jar" - zip_action_name = "__${target_name}_zip" - zip_action_output = "${target_gen_dir}/${target_name}.zip" - copy_symbols_target = "__${target_name}_copy_symbols" - final_target_name = target_name - - if (defined(invoker.jni_package)) { - generate_jni(generate_jni_name) { - visibility = [ ":${shared_library_name}" ] - - sources = invoker.java_sources - jni_package = invoker.jni_package - } - } - - shared_library(shared_library_name) { - visibility = [ - ":${copy_symbols_target}", - ":${zip_action_name}", - ] - - if (defined(invoker.sources)) { - sources = invoker.sources - } - - deps = [] - if (defined(invoker.jni_package)) { - deps += [ ":${generate_jni_name}" ] - } - if (defined(invoker.deps)) { - deps += invoker.deps - } - } - - copy(copy_symbols_target) { - visibility = [ ":${final_target_name}" ] - deps = [ - ":${shared_library_name}", - ] - - sources = [ - "${root_out_dir}/${library_basename}", - ] - outputs = [ - "${root_out_dir}/symbols/${library_basename}", - ] - } - - if (defined(invoker.java_sources)) { - android_library(java_library_name) { - visibility = [ ":*" ] - - java_files = invoker.java_sources - - if (defined(invoker.java_deps)) { - deps = invoker.java_deps - } - } - } - - android_standalone_library(android_standalone_library_name) { - deps = [] - - if (defined(invoker.java_sources)) { - deps += [ ":${java_library_name}" ] - } - - if (defined(invoker.java_deps)) { - deps += invoker.java_deps - } - - dex_path = dex_output_path - } - - action(zip_action_name) { - visibility = [ ":${final_target_name}" ] - script = "//build/android/gn/zip.py" - - inputs = [ - "${root_out_dir}/${library_basename}", - dex_output_path, - ] - - output = zip_action_output - outputs = [ - output, - ] - - rebase_inputs = rebase_path(inputs, root_build_dir) - rebase_output = rebase_path(output, root_build_dir) - args = [ - "--inputs=${rebase_inputs}", - "--output=${rebase_output}", - ] - - deps = [ - ":${android_standalone_library_name}", - ":${shared_library_name}", - ] - - if (defined(invoker.deps)) { - deps += invoker.deps - } - if (defined(invoker.public_deps)) { - public_deps = invoker.public_deps - } - if (defined(invoker.data_deps)) { - data_deps = invoker.data_deps - } - } - - if (defined(invoker.output_name)) { - mojo_output = "${root_out_dir}/" + invoker.output_name + ".mojo" - } else { - mojo_output = "${root_out_dir}/" + target_name + ".mojo" - } - - action(final_target_name) { - script = rebase_path("mojo/public/tools/prepend.py", ".", mojo_root) - - input = zip_action_output - inputs = [ - input, - ] - - output = mojo_output - outputs = [ - output, - ] - - rebase_input = rebase_path(input, root_build_dir) - rebase_output = rebase_path(output, root_build_dir) - args = [ - "--input=${rebase_input}", - "--output=${rebase_output}", - "--line=#!mojo mojo:android_handler", - ] - - deps = [ - ":${copy_symbols_target}", - ] - - public_deps = [ - ":${zip_action_name}", - ] - } - } -} diff --git a/third_party/mojo_services/src/accessibility/public/interfaces/BUILD.gn b/third_party/mojo_services/src/accessibility/public/interfaces/BUILD.gn index 59cf215b669dd3..0dbd89ebfe971e 100644 --- a/third_party/mojo_services/src/accessibility/public/interfaces/BUILD.gn +++ b/third_party/mojo_services/src/accessibility/public/interfaces/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") +import("//mojo/public/tools/bindings/mojom.gni") mojom("interfaces") { sources = [ diff --git a/third_party/mojo_services/src/clipboard/public/interfaces/BUILD.gn b/third_party/mojo_services/src/clipboard/public/interfaces/BUILD.gn index 7bca33bdf9a748..443f5bfc2d1e42 100644 --- a/third_party/mojo_services/src/clipboard/public/interfaces/BUILD.gn +++ b/third_party/mojo_services/src/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 = [ diff --git a/tools/android/eclipse/.classpath b/tools/android/eclipse/.classpath index d286aafdc7cc36..f21844576b1335 100644 --- a/tools/android/eclipse/.classpath +++ b/tools/android/eclipse/.classpath @@ -62,6 +62,8 @@ to the classpath for downstream development. See "additional_entries" below. + + @@ -85,8 +87,6 @@ to the classpath for downstream development. See "additional_entries" below. - - diff --git a/tools/battor_agent/BUILD.gn b/tools/battor_agent/BUILD.gn index 9b828533605142..381b02e1dc6d69 100644 --- a/tools/battor_agent/BUILD.gn +++ b/tools/battor_agent/BUILD.gn @@ -10,7 +10,7 @@ executable("battor_agent") { ":battor_agent_lib", "//base", "//device/serial", - "//third_party/mojo/src/mojo/public/c/system:for_shared_library", + "//mojo/public/c/system:for_shared_library", ] } diff --git a/ui/mojo/geometry/BUILD.gn b/ui/mojo/geometry/BUILD.gn index 1d7d4d5b527539..f39fa0459f65d8 100644 --- a/ui/mojo/geometry/BUILD.gn +++ b/ui/mojo/geometry/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") +import("//mojo/public/tools/bindings/mojom.gni") mojom("interfaces") { sources = [ diff --git a/ui/mojo/ime/BUILD.gn b/ui/mojo/ime/BUILD.gn index 30971474c8141a..23400b1eaedd02 100644 --- a/ui/mojo/ime/BUILD.gn +++ b/ui/mojo/ime/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") +import("//mojo/public/tools/bindings/mojom.gni") mojom("interfaces") { sources = [ diff --git a/ui/views/mus/BUILD.gn b/ui/views/mus/BUILD.gn index e5cad8b8a1ca48..852dcc5df79c25 100644 --- a/ui/views/mus/BUILD.gn +++ b/ui/views/mus/BUILD.gn @@ -50,7 +50,7 @@ source_set("mus") { "//mojo/converters/input_events", "//mojo/converters/network", "//mojo/converters/surfaces", - "//third_party/mojo/src/mojo/public/cpp/bindings", + "//mojo/public/cpp/bindings", "//third_party/icu", "//ui/aura", "//ui/compositor", diff --git a/ui/views/mus/DEPS b/ui/views/mus/DEPS index 3dd2a94049db56..6ddcc64508ef3c 100644 --- a/ui/views/mus/DEPS +++ b/ui/views/mus/DEPS @@ -10,7 +10,6 @@ include_rules = [ "+mojo/converters", "+mojo/public", "+skia", - "+third_party/mojo/src/mojo/public", "+ui/aura", "+ui/base", "+ui/compositor", diff --git a/ui/views/mus/surface_binding.cc b/ui/views/mus/surface_binding.cc index 90484bbf20aef9..2c6220b83e0316 100644 --- a/ui/views/mus/surface_binding.cc +++ b/ui/views/mus/surface_binding.cc @@ -23,7 +23,7 @@ #include "mojo/application/public/interfaces/shell.mojom.h" #include "mojo/converters/geometry/geometry_type_converters.h" #include "mojo/converters/surfaces/surfaces_type_converters.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" +#include "mojo/public/cpp/bindings/binding.h" #include "ui/views/mus/window_tree_host_mus.h" namespace views {