diff options
author | sky <sky@chromium.org> | 2015-08-05 16:54:52 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-08-05 23:55:41 +0000 |
commit | ad16cab0b66747137df714ff84c1338e352b7134 (patch) | |
tree | 3cc5df95f0db7c97d897402685d75febe5bf5345 /mojo/services | |
parent | 208c65020aecfcf305d524058f7ca89363a2d361 (diff) | |
download | chromium_src-ad16cab0b66747137df714ff84c1338e352b7134.zip chromium_src-ad16cab0b66747137df714ff84c1338e352b7134.tar.gz chromium_src-ad16cab0b66747137df714ff84c1338e352b7134.tar.bz2 |
Revert of Straightens outs DEPS in mojo/common (patchset #5 id:80001 of https://codereview.chromium.org/1262173005/ )
Reason for revert:
Broke MediaRouterMojoImplTest.QueuedWhileAsleep on linux debug.
Original issue's description:
> 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
>
> Committed: https://crrev.com/a11b4d76a27816fe025af647825becac5f633c34
> Cr-Commit-Position: refs/heads/master@{#341979}
TBR=jam@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=none
Review URL: https://codereview.chromium.org/1280463003
Cr-Commit-Position: refs/heads/master@{#342014}
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, 10 insertions, 13 deletions
diff --git a/mojo/services/network/BUILD.gn b/mojo/services/network/BUILD.gn index e01a567..0b9e804 100644 --- a/mojo/services/network/BUILD.gn +++ b/mojo/services/network/BUILD.gn @@ -93,7 +93,6 @@ 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", @@ -140,7 +139,6 @@ 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 fa4edaa..64f12dc 100644 --- a/mojo/services/network/DEPS +++ b/mojo/services/network/DEPS @@ -3,7 +3,6 @@ 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 965c27e..552ddee 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/message_pump/handle_watcher.h" +#include "mojo/common/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 71d40ea..55ab0c3 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/message_pump/message_pump_mojo.h" +#include "mojo/common/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 3a9fdf7..86a3623 100644 --- a/mojo/services/network/public/DEPS +++ b/mojo/services/network/public/DEPS @@ -4,7 +4,7 @@ include_rules = [ "-net", "-services", "-testing", - "!mojo/message_pump", + "!mojo/common", "+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 030636c..52af16b 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 5ba5fa5..287e91c 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/message_pump/handle_watcher.h" +#include "mojo/common/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 d0ba6b2..91e7924 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/message_pump/handle_watcher.h" +#include "mojo/common/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 b1c072e..0327e47 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/message_pump/handle_watcher.h" +#include "mojo/common/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 88bf89c..656c615 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/message_pump/handle_watcher.h" +#include "mojo/common/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 777889a..bab6153 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/message_pump/message_pump_mojo.h" +#include "mojo/common/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 fb64815..e6b89ba 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/message_pump/handle_watcher.h" +#include "mojo/common/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" |