diff options
author | Ken Rockot <rockot@chromium.org> | 2015-11-11 14:24:06 -0800 |
---|---|---|
committer | Ken Rockot <rockot@chromium.org> | 2015-11-11 22:26:07 +0000 |
commit | f2bfe56ff56152e21033992105c31437a3b150fe (patch) | |
tree | 8e81f342ef2cb5c53ee1f249ebfcb349eab5f1b4 /mojo/edk | |
parent | d23c3995cd1439bc28a1254a9e8ff850c833fbf2 (diff) | |
download | chromium_src-f2bfe56ff56152e21033992105c31437a3b150fe.zip chromium_src-f2bfe56ff56152e21033992105c31437a3b150fe.tar.gz chromium_src-f2bfe56ff56152e21033992105c31437a3b150fe.tar.bz2 |
Eliminate third_party/mojo/src from all targets' include paths
Eliding presubmit here because the missing DEPS entries are going to be addressed here: https://codereview.chromium.org/1410053006
BUG=554556
R=jam@chromium.org
NOPRESUBMIT=true
Review URL: https://codereview.chromium.org/1435063002 .
Cr-Commit-Position: refs/heads/master@{#359174}
Diffstat (limited to 'mojo/edk')
69 files changed, 110 insertions, 110 deletions
diff --git a/mojo/edk/embedder/embedder.h b/mojo/edk/embedder/embedder.h index 30a548e..36016d3 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 "mojo/public/cpp/system/message_pipe.h" +#include "third_party/mojo/src/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 f53e440..659f0ee 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 6247c5f..b491265 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 "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" +#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" 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 7487837..491c602 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 "mojo/public/cpp/system/macros.h" +#include "third_party/mojo/src/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 a0bb7fd..cd9d5fe 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 c7256af..909cd76 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 "mojo/public/cpp/system/macros.h" +#include "third_party/mojo/src/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 160ba79..15a300c 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 "mojo/public/cpp/system/macros.h" +#include "third_party/mojo/src/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 e5f90af..d8cebc3 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 "mojo/public/cpp/system/macros.h" +#include "third_party/mojo/src/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 ae75202..ce8e28a 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 "mojo/public/c/system/macros.h" +#include "third_party/mojo/src/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 798bc3a..3235b0b 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 "mojo/public/cpp/system/macros.h" +#include "third_party/mojo/src/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 a0e915e..9f174ea 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 ef97d91..91bdce0 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 "mojo/public/cpp/system/macros.h" +#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { namespace edk { diff --git a/mojo/edk/js/drain_data.cc b/mojo/edk/js/drain_data.cc index d8fa091..f5e6f89 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 "mojo/public/cpp/environment/environment.h" -#include "mojo/public/cpp/system/core.h" +#include "third_party/mojo/src/mojo/public/cpp/environment/environment.h" +#include "third_party/mojo/src/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 63c9e49..839241f 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 "mojo/public/c/environment/async_waiter.h" -#include "mojo/public/cpp/system/core.h" +#include "third_party/mojo/src/mojo/public/c/environment/async_waiter.h" +#include "third_party/mojo/src/mojo/public/cpp/system/core.h" #include "v8/include/v8.h" namespace mojo { diff --git a/mojo/edk/js/handle.h b/mojo/edk/js/handle.h index 9fa92b0..4257816 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 "mojo/public/cpp/system/core.h" +#include "third_party/mojo/src/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 6ee4444..ff15154 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 7b50b30..9a66d88 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 "mojo/public/c/system/core.h" +#include "third_party/mojo/src/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 3e4391c..0e9708f 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 "mojo/public/cpp/system/core.h" +#include "third_party/mojo/src/mojo/public/cpp/system/core.h" namespace mojo { namespace edk { diff --git a/mojo/edk/js/test/run_js_tests.cc b/mojo/edk/js/test/run_js_tests.cc index 76de3e6..1505527 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/js_to_cpp_tests.cc b/mojo/edk/js/tests/js_to_cpp_tests.cc index f9a9b92..97002f1 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 4d017fe..53345ac 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 "mojo/public/cpp/environment/environment.h" +#include "third_party/mojo/src/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 c1b76aa..2deedfc 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 "mojo/public/c/environment/async_waiter.h" -#include "mojo/public/cpp/system/core.h" +#include "third_party/mojo/src/mojo/public/c/environment/async_waiter.h" +#include "third_party/mojo/src/mojo/public/cpp/system/core.h" namespace mojo { namespace edk { diff --git a/mojo/edk/system/async_waiter.h b/mojo/edk/system/async_waiter.h index 19ef5d6..b8eefa0 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 "mojo/public/c/system/types.h" -#include "mojo/public/cpp/system/macros.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/awakable.h b/mojo/edk/system/awakable.h index 2cb10f5..a99038f 100644 --- a/mojo/edk/system/awakable.h +++ b/mojo/edk/system/awakable.h @@ -8,7 +8,7 @@ #include <stdint.h> #include "mojo/edk/system/system_impl_export.h" -#include "mojo/public/c/system/types.h" +#include "third_party/mojo/src/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 7f8a6d6..ab7673a 100644 --- a/mojo/edk/system/awakable_list.h +++ b/mojo/edk/system/awakable_list.h @@ -10,8 +10,8 @@ #include <vector> #include "mojo/edk/system/system_impl_export.h" -#include "mojo/public/c/system/types.h" -#include "mojo/public/cpp/system/macros.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.cc b/mojo/edk/system/core.cc index 72d9338..f38d637 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 "mojo/public/c/system/macros.h" -#include "mojo/public/cpp/system/macros.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 edk { diff --git a/mojo/edk/system/core.h b/mojo/edk/system/core.h index 3c2154a..1e2cd3f 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 "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/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 { @@ -69,7 +69,7 @@ class MOJO_SYSTEM_IMPL_EXPORT Core { // API functions, referenced below. // These methods correspond to the API functions defined in - // "mojo/public/c/system/functions.h": + // "third_party/mojo/src/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 - // "mojo/public/c/system/message_pipe.h": + // "third_party/mojo/src/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 - // "mojo/public/c/system/data_pipe.h": + // "third_party/mojo/src/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 - // "mojo/public/c/system/buffer.h": + // "third_party/mojo/src/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 5af507f..2789fac 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 "mojo/public/cpp/system/macros.h" +#include "third_party/mojo/src/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 774dc95..84bc2e6 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 28a038c..6dfadee 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 "mojo/public/cpp/system/macros.h" +#include "third_party/mojo/src/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 f17416b..46a895d 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 "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/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 edk { diff --git a/mojo/edk/system/data_pipe_consumer_dispatcher.h b/mojo/edk/system/data_pipe_consumer_dispatcher.h index 7c09346..40a1207 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 "mojo/public/cpp/system/macros.h" +#include "third_party/mojo/src/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 daf038b..f791d59 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 "mojo/public/cpp/system/macros.h" +#include "third_party/mojo/src/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 5c8f0f8..6c6593e 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 b583bae..80c1418 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 "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/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 { namespace edk { diff --git a/mojo/edk/system/dispatcher_unittest.cc b/mojo/edk/system/dispatcher_unittest.cc index 8b3017e..7145eb3 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 1c47a28..2209ffa 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 "mojo/public/c/system/types.h" +#include "third_party/mojo/src/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 de5ac05..57d1aed 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 "mojo/public/c/system/types.h" -#include "mojo/public/cpp/system/macros.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/mapping_table.h b/mojo/edk/system/mapping_table.h index fb2acf3..fd822989 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 "mojo/public/c/system/types.h" -#include "mojo/public/cpp/system/macros.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/mojo/edk/system/master_impl.h b/mojo/edk/system/master_impl.h index 621db13..d6d1a8d 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 "mojo/public/cpp/system/macros.h" +#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" #if defined(OS_WIN) #include <windows.h> diff --git a/mojo/edk/system/master_impl_unittest.cc b/mojo/edk/system/master_impl_unittest.cc index a0a731e..04d656e 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 78dc40a..34396b8 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 "mojo/public/cpp/system/macros.h" +#include "third_party/mojo/src/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 4a05490..a6e6adb 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 "mojo/public/cpp/system/macros.h" +#include "third_party/mojo/src/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 02b66e4..2f06a4e 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 "mojo/public/cpp/system/macros.h" +#include "third_party/mojo/src/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 5d59e65..053b000 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 e067329..ae6f61a 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 "mojo/public/cpp/system/macros.h" +#include "third_party/mojo/src/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 9283acc..17e6b62 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 "mojo/public/c/system/core.h" -#include "mojo/public/c/system/types.h" +#include "third_party/mojo/src/mojo/public/c/system/core.h" +#include "third_party/mojo/src/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 6925075..2299f61 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 "mojo/public/c/system/types.h" -#include "mojo/public/cpp/system/macros.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/options_validation_unittest.cc b/mojo/edk/system/options_validation_unittest.cc index d2c8180..bd4e14d 100644 --- a/mojo/edk/system/options_validation_unittest.cc +++ b/mojo/edk/system/options_validation_unittest.cc @@ -7,8 +7,8 @@ #include <stddef.h> #include <stdint.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/platform_handle_dispatcher.h b/mojo/edk/system/platform_handle_dispatcher.h index 99ffcac..701d6ef 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 "mojo/public/cpp/system/macros.h" +#include "third_party/mojo/src/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 07b7881..f6ff1af 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 "mojo/public/cpp/system/macros.h" +#include "third_party/mojo/src/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 e6627d6..9f68d06 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 "mojo/public/cpp/system/macros.h" +#include "third_party/mojo/src/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 fdc77d8..d9be055 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 3063ebe..ec31501 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 "mojo/public/cpp/system/macros.h" +#include "third_party/mojo/src/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 1f15ea2..1f373d8 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 "mojo/public/c/system/macros.h" +#include "third_party/mojo/src/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 f3fc9e8..5c7cbb7 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 "mojo/public/cpp/system/macros.h" +#include "third_party/mojo/src/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 ceb936b..bcbc49e 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 ccef564..3d35ff9 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 "mojo/public/cpp/system/macros.h" +#include "third_party/mojo/src/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 7d7b9c2..5998394 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 cf244b3..2baff3c 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 16d8d01..bd56463 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 "mojo/public/cpp/system/macros.h" +#include "third_party/mojo/src/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 8e983ec..c78176e 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 "mojo/public/c/system/types.h" -#include "mojo/public/cpp/system/macros.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/waiter_test_utils.h b/mojo/edk/system/waiter_test_utils.h index a55d507..a991d2e 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 "mojo/public/c/system/types.h" -#include "mojo/public/cpp/system/macros.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/waiter_unittest.cc b/mojo/edk/system/waiter_unittest.cc index 71d9d8c..e27e21f 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/multiprocess_test_helper.h b/mojo/edk/test/multiprocess_test_helper.h index 3ff8b85..14a4035 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 d700bc3..c9692ef 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 "mojo/public/tests/test_support_private.h" +#include "third_party/mojo/src/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 23266444..26744ee 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.h b/mojo/edk/test/scoped_ipc_support.h index cff0da7..2bb5ff7 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 "mojo/public/cpp/system/macros.h" +#include "third_party/mojo/src/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 e672999..85e640e 100644 --- a/mojo/edk/test/test_support_impl.h +++ b/mojo/edk/test/test_support_impl.h @@ -7,8 +7,8 @@ #include <stdio.h> -#include "mojo/public/cpp/system/macros.h" -#include "mojo/public/tests/test_support_private.h" +#include "third_party/mojo/src/mojo/public/cpp/system/macros.h" +#include "third_party/mojo/src/mojo/public/tests/test_support_private.h" namespace mojo { namespace edk { |