diff options
author | sky <sky@chromium.org> | 2015-08-05 14:29:34 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-08-05 21:30:16 +0000 |
commit | a11b4d76a27816fe025af647825becac5f633c34 (patch) | |
tree | 0be98a2476a87d90c23e172660d4e2d14f1dd1fd /mojo/services | |
parent | 3e4aaaa45c528d4ab0670331a6c0ebfc4f3ab8e6 (diff) | |
download | chromium_src-a11b4d76a27816fe025af647825becac5f633c34.zip chromium_src-a11b4d76a27816fe025af647825becac5f633c34.tar.gz chromium_src-a11b4d76a27816fe025af647825becac5f633c34.tar.bz2 |
Straightens outs DEPS in mojo/common
Prior to this change //mojo/environment depended upon //mojo/common. //mojo/common's deps are wrong and it needs to be depend upon various things in //third_party/mojo/src/mojo... When these DEPS are added link errors result because Environment and and a couple of other things need to be defined. These are defined in //mojo/environment. But //mojo/environment can't be a dep of //mojo/common, else we get a cycle.
To straighten this out I've moved the files //mojo/environment needs from //mojo/common to //mojo/message_pump. //mojo/environment no longer depends upon //mojo/common, only //mojo/message_pump. //mojo/common can then depend upon //mojo/environment and we no longer have the cycle. Yay!
BUG=none
TEST=none
Review URL: https://codereview.chromium.org/1262173005
Cr-Commit-Position: refs/heads/master@{#341979}
Diffstat (limited to 'mojo/services')
-rw-r--r-- | mojo/services/network/BUILD.gn | 2 | ||||
-rw-r--r-- | mojo/services/network/DEPS | 1 | ||||
-rw-r--r-- | mojo/services/network/http_connection_impl.cc | 2 | ||||
-rw-r--r-- | mojo/services/network/network_service_delegate.cc | 2 | ||||
-rw-r--r-- | mojo/services/network/public/DEPS | 2 | ||||
-rw-r--r-- | mojo/services/network/public/cpp/BUILD.gn | 2 | ||||
-rw-r--r-- | mojo/services/network/public/cpp/web_socket_read_queue.h | 2 | ||||
-rw-r--r-- | mojo/services/network/public/cpp/web_socket_write_queue.h | 2 | ||||
-rw-r--r-- | mojo/services/network/tcp_connected_socket_impl.h | 2 | ||||
-rw-r--r-- | mojo/services/network/url_loader_impl.h | 2 | ||||
-rw-r--r-- | mojo/services/network/url_loader_impl_apptest.cc | 2 | ||||
-rw-r--r-- | mojo/services/network/web_socket_impl.cc | 2 |
12 files changed, 13 insertions, 10 deletions
diff --git a/mojo/services/network/BUILD.gn b/mojo/services/network/BUILD.gn index 0b9e804..e01a567 100644 --- a/mojo/services/network/BUILD.gn +++ b/mojo/services/network/BUILD.gn @@ -93,6 +93,7 @@ source_set("lib") { "//mojo/application/public/cpp", "//mojo/common:common_base", "//mojo/common:url_type_converters", + "//mojo/message_pump", "//mojo/services/network/public/cpp", "//mojo/services/network/public/interfaces", "//net", @@ -139,6 +140,7 @@ mojo_native_application("apptests") { "//mojo/application/public/cpp:sources", "//mojo/application/public/cpp:test_support", "//mojo/common:common_base", + "//mojo/message_pump", "//mojo/services/network/public/cpp", "//mojo/services/network/public/interfaces", "//net", diff --git a/mojo/services/network/DEPS b/mojo/services/network/DEPS index 64f12dc..fa4edaa 100644 --- a/mojo/services/network/DEPS +++ b/mojo/services/network/DEPS @@ -3,6 +3,7 @@ include_rules = [ "+components/filesystem/public/interfaces", "+mojo/application", "+mojo/common", + "+mojo/message_pump", "+mojo/services", "+mojo/util", "+net", diff --git a/mojo/services/network/http_connection_impl.cc b/mojo/services/network/http_connection_impl.cc index 552ddee..965c27e 100644 --- a/mojo/services/network/http_connection_impl.cc +++ b/mojo/services/network/http_connection_impl.cc @@ -12,7 +12,7 @@ #include "base/logging.h" #include "base/stl_util.h" #include "base/strings/string_util.h" -#include "mojo/common/handle_watcher.h" +#include "mojo/message_pump/handle_watcher.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" diff --git a/mojo/services/network/network_service_delegate.cc b/mojo/services/network/network_service_delegate.cc index 55ab0c3..71d40ea 100644 --- a/mojo/services/network/network_service_delegate.cc +++ b/mojo/services/network/network_service_delegate.cc @@ -12,7 +12,7 @@ #include "base/message_loop/message_loop.h" #include "base/path_service.h" #include "mojo/application/public/cpp/application_connection.h" -#include "mojo/common/message_pump_mojo.h" +#include "mojo/message_pump/message_pump_mojo.h" #include "mojo/services/network/network_service_delegate_observer.h" #include "mojo/services/network/network_service_impl.h" #include "mojo/services/network/url_loader_factory_impl.h" diff --git a/mojo/services/network/public/DEPS b/mojo/services/network/public/DEPS index 86a3623..3a9fdf7 100644 --- a/mojo/services/network/public/DEPS +++ b/mojo/services/network/public/DEPS @@ -4,7 +4,7 @@ include_rules = [ "-net", "-services", "-testing", - "!mojo/common", + "!mojo/message_pump", "+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 52af16b..030636c 100644 --- a/mojo/services/network/public/cpp/BUILD.gn +++ b/mojo/services/network/public/cpp/BUILD.gn @@ -20,8 +20,8 @@ mojo_sdk_source_set("cpp") { "../interfaces", "//base", "//mojo/application/public/cpp", - "//mojo/common", "//mojo/environment:chromium", + "//mojo/message_pump", ] mojo_sdk_deps = [ 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 287e91c..5ba5fa5 100644 --- a/mojo/services/network/public/cpp/web_socket_read_queue.h +++ b/mojo/services/network/public/cpp/web_socket_read_queue.h @@ -8,7 +8,7 @@ #include "base/callback.h" #include "base/memory/scoped_vector.h" #include "base/memory/weak_ptr.h" -#include "mojo/common/handle_watcher.h" +#include "mojo/message_pump/handle_watcher.h" #include "third_party/mojo/src/mojo/public/cpp/system/data_pipe.h" namespace mojo { diff --git a/mojo/services/network/public/cpp/web_socket_write_queue.h b/mojo/services/network/public/cpp/web_socket_write_queue.h index 91e7924..d0ba6b2 100644 --- a/mojo/services/network/public/cpp/web_socket_write_queue.h +++ b/mojo/services/network/public/cpp/web_socket_write_queue.h @@ -8,7 +8,7 @@ #include "base/callback.h" #include "base/memory/scoped_vector.h" #include "base/memory/weak_ptr.h" -#include "mojo/common/handle_watcher.h" +#include "mojo/message_pump/handle_watcher.h" #include "third_party/mojo/src/mojo/public/cpp/system/data_pipe.h" namespace mojo { diff --git a/mojo/services/network/tcp_connected_socket_impl.h b/mojo/services/network/tcp_connected_socket_impl.h index 0327e47..b1c072e 100644 --- a/mojo/services/network/tcp_connected_socket_impl.h +++ b/mojo/services/network/tcp_connected_socket_impl.h @@ -8,7 +8,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "mojo/application/public/cpp/app_lifetime_helper.h" -#include "mojo/common/handle_watcher.h" +#include "mojo/message_pump/handle_watcher.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" diff --git a/mojo/services/network/url_loader_impl.h b/mojo/services/network/url_loader_impl.h index 656c615..88bf89c 100644 --- a/mojo/services/network/url_loader_impl.h +++ b/mojo/services/network/url_loader_impl.h @@ -8,7 +8,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "mojo/application/public/cpp/app_lifetime_helper.h" -#include "mojo/common/handle_watcher.h" +#include "mojo/message_pump/handle_watcher.h" #include "mojo/services/network/public/interfaces/url_loader.mojom.h" #include "net/base/net_errors.h" #include "net/url_request/url_request.h" diff --git a/mojo/services/network/url_loader_impl_apptest.cc b/mojo/services/network/url_loader_impl_apptest.cc index bab6153..777889a 100644 --- a/mojo/services/network/url_loader_impl_apptest.cc +++ b/mojo/services/network/url_loader_impl_apptest.cc @@ -8,7 +8,7 @@ #include "base/message_loop/message_loop.h" #include "base/run_loop.h" #include "mojo/application/public/cpp/application_test_base.h" -#include "mojo/common/message_pump_mojo.h" +#include "mojo/message_pump/message_pump_mojo.h" #include "mojo/services/network/network_context.h" #include "mojo/services/network/url_loader_impl.h" #include "net/base/net_errors.h" diff --git a/mojo/services/network/web_socket_impl.cc b/mojo/services/network/web_socket_impl.cc index e6b89ba..fb64815 100644 --- a/mojo/services/network/web_socket_impl.cc +++ b/mojo/services/network/web_socket_impl.cc @@ -6,7 +6,7 @@ #include "base/logging.h" #include "base/message_loop/message_loop.h" -#include "mojo/common/handle_watcher.h" +#include "mojo/message_pump/handle_watcher.h" #include "mojo/services/network/network_context.h" #include "mojo/services/network/public/cpp/web_socket_read_queue.h" #include "mojo/services/network/public/cpp/web_socket_write_queue.h" |