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 /components/message_port | |
| 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 'components/message_port')
| -rw-r--r-- | components/message_port/BUILD.gn | 2 | ||||
| -rw-r--r-- | components/message_port/DEPS | 2 | ||||
| -rw-r--r-- | components/message_port/web_message_port_channel_impl.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/components/message_port/BUILD.gn b/components/message_port/BUILD.gn index 63c7da1..3a81750 100644 --- a/components/message_port/BUILD.gn +++ b/components/message_port/BUILD.gn @@ -10,7 +10,7 @@ source_set("message_port") { public_deps = [ "//base", - "//mojo/message_pump", + "//mojo/common", "//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 4f27eb3..eba876f 100644 --- a/components/message_port/DEPS +++ b/components/message_port/DEPS @@ -1,6 +1,6 @@ include_rules = [ "+base", - "+mojo/message_pump", + "+mojo/common", "+third_party/WebKit/public", "+third_party/mojo/src/mojo/public/cpp/system", ] diff --git a/components/message_port/web_message_port_channel_impl.h b/components/message_port/web_message_port_channel_impl.h index 12d6c28..49fe97e 100644 --- a/components/message_port/web_message_port_channel_impl.h +++ b/components/message_port/web_message_port_channel_impl.h @@ -6,7 +6,7 @@ #define COMPONENTS_MESSAGE_PORT_WEB_MESSAGE_PORT_CHANNEL_IMPL_H_ #include "base/basictypes.h" -#include "mojo/message_pump/handle_watcher.h" +#include "mojo/common/handle_watcher.h" #include "third_party/WebKit/public/platform/WebMessagePortChannel.h" #include "third_party/mojo/src/mojo/public/cpp/system/message_pipe.h" |