Skip to content

Commit

Permalink
Eliminate third_party/mojo/src from all targets' include paths
Browse files Browse the repository at this point in the history 
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}
  • Loading branch information
@krockot
krockot committed Nov 11, 2015
1 parent d23c399 commit f2bfe56
Show file tree
Hide file tree
Showing 461 changed files with 1,638 additions and 1,270 deletions.
9 changes: 1 addition & 8 deletions chrome/browser/media/router/media_router.gyp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@
],
'conditions': [
[ 'OS!="android" and OS!="ios"', {
'include_dirs': [
'<(DEPTH)/third_party/mojo/src',
],
'dependencies': [
# media_router_type_converters.h needs the generated file.
'media_router_mojo_gen',
Expand All @@ -40,7 +37,7 @@
'<@(media_router_non_android_sources)',
]
}],
]
]
},
{
# Mojo compiler for the Media Router internal API.
Expand All @@ -56,9 +53,6 @@
{
'target_name': 'media_router_mojo',
'type': 'static_library',
'include_dirs': [
'<(DEPTH)/third_party/mojo/src',
],
'dependencies': [
'media_router_mojo_gen',
],
Expand All @@ -73,7 +67,6 @@
'type': 'static_library',
'include_dirs': [
'<(DEPTH)',
'<(DEPTH)/third_party/mojo/src',
],
'dependencies': [
'media_router',
Expand Down
1 change: 1 addition & 0 deletions components/bitmap_uploader/DEPS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ include_rules = [
"+mojo/public",
"+mojo/services/network/public/interfaces",
"+ui/gfx/geometry",
"+third_party/mojo/src/mojo/public",
]
2 changes: 1 addition & 1 deletion components/bitmap_uploader/bitmap_uploader.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion components/bitmap_uploader/bitmap_uploader.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include "components/mus/public/interfaces/gpu.mojom.h"
#include "gpu/GLES2/gl2chromium.h"
#include "gpu/GLES2/gl2extchromium.h"
#include "mojo/public/c/gles2/gles2.h"
#include "third_party/mojo/src/mojo/public/c/gles2/gles2.h"

namespace mojo {
class Shell;
Expand Down
1 change: 1 addition & 0 deletions components/filesystem/DEPS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ include_rules = [
"+mojo/platform_handle",
"+mojo/public",
"+mojo/util",
"+third_party/mojo/src/mojo/public",
]
4 changes: 2 additions & 2 deletions components/filesystem/directory_impl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "components/filesystem/public/interfaces/directory.mojom.h"
#include "mojo/public/cpp/bindings/interface_request.h"
#include "mojo/public/cpp/bindings/strong_binding.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 base {
class ScopedTempDir;
Expand Down
4 changes: 2 additions & 2 deletions components/filesystem/file_impl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
#include "base/files/scoped_file.h"
#include "base/macros.h"
#include "components/filesystem/public/interfaces/directory.mojom.h"
#include "mojo/public/cpp/bindings/interface_request.h"
#include "mojo/public/cpp/bindings/strong_binding.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 base {
class FilePath;
Expand Down
4 changes: 2 additions & 2 deletions components/filesystem/file_impl_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions components/filesystem/file_system_impl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

#include "base/macros.h"
#include "components/filesystem/public/interfaces/file_system.mojom.h"
#include "mojo/public/cpp/bindings/interface_request.h"
#include "mojo/public/cpp/bindings/strong_binding.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 base {
class FilePath;
Expand Down
2 changes: 1 addition & 1 deletion components/filesystem/files_test_base.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 "mojo/public/cpp/bindings/binding.h"
#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"

namespace filesystem {

Expand Down
2 changes: 1 addition & 1 deletion components/filesystem/main.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include "base/macros.h"
#include "components/filesystem/file_system_app.h"
#include "mojo/application/public/cpp/application_runner.h"
#include "mojo/public/c/system/main.h"
#include "third_party/mojo/src/mojo/public/c/system/main.h"

MojoResult MojoMain(MojoHandle application_request) {
mojo::ApplicationRunner runner(new filesystem::FileSystemApp());
Expand Down
2 changes: 1 addition & 1 deletion components/filesystem/util.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

#include "base/logging.h"
#include "base/strings/string_util.h"
#include "mojo/public/cpp/bindings/string.h"
#include "third_party/mojo/src/mojo/public/cpp/bindings/string.h"

#if defined(OS_WIN)
#include "base/strings/utf_string_conversions.h"
Expand Down
2 changes: 1 addition & 1 deletion components/html_viewer/web_graphics_context_3d_command_buffer_impl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
#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 "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"

Expand Down
1 change: 1 addition & 0 deletions components/pdf_viewer/DEPS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ 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",
Expand Down
4 changes: 2 additions & 2 deletions components/pdf_viewer/pdf_viewer.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion content/browser/background_sync/background_sync_service_impl_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
4 changes: 2 additions & 2 deletions content/browser/presentation/presentation_service_impl_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion content/browser/wake_lock/wake_lock_service_context.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 "mojo/public/cpp/bindings/interface_request.h"
#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h"

namespace content {

Expand Down
4 changes: 2 additions & 2 deletions content/browser/wake_lock/wake_lock_service_impl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "content/common/wake_lock_service.mojom.h"
#include "mojo/public/cpp/bindings/interface_request.h"
#include "mojo/public/cpp/bindings/strong_binding.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 content {

Expand Down
2 changes: 2 additions & 0 deletions mandoline/services/updater/DEPS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,6 @@ 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",
]
2 changes: 1 addition & 1 deletion mandoline/services/updater/updater_app.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 "mojo/public/c/system/main.h"
#include "third_party/mojo/src/mojo/public/c/system/main.h"

namespace updater {

Expand Down
2 changes: 1 addition & 1 deletion mandoline/services/updater/updater_impl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion media/mojo/services/media_type_converters.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 "mojo/public/cpp/bindings/type_converter.h"
#include "third_party/mojo/src/mojo/public/cpp/bindings/type_converter.h"

namespace media {
class AudioDecoderConfig;
Expand Down
2 changes: 1 addition & 1 deletion media/mojo/services/mojo_cdm_service.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 "mojo/public/cpp/bindings/strong_binding.h"
#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h"

namespace media {

Expand Down
2 changes: 1 addition & 1 deletion media/mojo/services/service_factory_impl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 "mojo/public/cpp/bindings/strong_binding.h"
#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h"

namespace mojo {
class AppRefCount;
Expand Down
2 changes: 1 addition & 1 deletion mojo/android/javatests/mojo_test_case.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 "mojo/public/cpp/environment/environment.h"
#include "third_party/mojo/src/mojo/public/cpp/environment/environment.h"

namespace {

Expand Down
2 changes: 1 addition & 1 deletion mojo/android/javatests/validation_test_util.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include "base/android/scoped_java_ref.h"
#include "base/test/test_support_android.h"
#include "jni/ValidationTestUtil_jni.h"
#include "mojo/public/cpp/bindings/tests/validation_test_input_parser.h"
#include "third_party/mojo/src/mojo/public/cpp/bindings/tests/validation_test_input_parser.h"

namespace mojo {
namespace android {
Expand Down
6 changes: 3 additions & 3 deletions mojo/android/system/core_impl.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
#include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_loop.h"
#include "jni/CoreImpl_jni.h"
#include "mojo/public/c/environment/async_waiter.h"
#include "mojo/public/c/system/core.h"
#include "mojo/public/cpp/environment/environment.h"
#include "third_party/mojo/src/mojo/public/c/environment/async_waiter.h"
#include "third_party/mojo/src/mojo/public/c/system/core.h"
#include "third_party/mojo/src/mojo/public/cpp/environment/environment.h"

namespace {

Expand Down
2 changes: 1 addition & 1 deletion mojo/application/public/cpp/application_delegate.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#include <string>

#include "mojo/public/cpp/system/macros.h"
#include "third_party/mojo/src/mojo/public/cpp/system/macros.h"

namespace mojo {

Expand Down
6 changes: 3 additions & 3 deletions mojo/application/public/cpp/application_impl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 "mojo/public/cpp/bindings/binding.h"
#include "mojo/public/cpp/bindings/callback.h"
#include "mojo/public/cpp/system/core.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"

namespace mojo {

Expand Down
6 changes: 3 additions & 3 deletions mojo/application/public/cpp/application_test_base.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion mojo/application/public/cpp/interface_factory.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#ifndef MOJO_APPLICATION_PUBLIC_CPP_INTERFACE_FACTORY_H_
#define MOJO_APPLICATION_PUBLIC_CPP_INTERFACE_FACTORY_H_

#include "mojo/public/cpp/bindings/interface_request.h"
#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h"

namespace mojo {

Expand Down
4 changes: 2 additions & 2 deletions mojo/application/public/cpp/lib/application_impl.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 "mojo/public/cpp/bindings/interface_ptr.h"
#include "mojo/public/cpp/environment/logging.h"
#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_ptr.h"
#include "third_party/mojo/src/mojo/public/cpp/environment/logging.h"

namespace mojo {

Expand Down
6 changes: 3 additions & 3 deletions mojo/application/public/cpp/lib/application_test_base.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 "mojo/public/cpp/bindings/binding.h"
#include "mojo/public/cpp/environment/environment.h"
#include "mojo/public/cpp/system/message_pipe.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"

namespace mojo {
namespace test {
Expand Down
2 changes: 1 addition & 1 deletion mojo/application/public/cpp/lib/application_test_main.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 "mojo/public/c/system/main.h"
#include "third_party/mojo/src/mojo/public/c/system/main.h"

MojoResult MojoMain(MojoHandle handle) {
// An AtExitManager instance is needed to construct message loops.
Expand Down
2 changes: 1 addition & 1 deletion mojo/application/public/cpp/lib/content_handler_factory.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 "mojo/public/cpp/bindings/strong_binding.h"
#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h"

namespace mojo {

Expand Down
2 changes: 1 addition & 1 deletion mojo/application/public/cpp/lib/interface_factory_connector.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#include "mojo/application/public/cpp/interface_factory.h"
#include "mojo/application/public/cpp/service_connector.h"
#include "mojo/public/cpp/bindings/interface_request.h"
#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h"

namespace mojo {
namespace internal {
Expand Down
Loading

0 comments on commit f2bfe56

Please sign in to comment.