diff options
| author | tsergeant <tsergeant@chromium.org> | 2016-03-09 19:51:33 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-10 03:53:03 +0000 |
| commit | 896012863947ba511c55ce7c65aa1002cd3894eb (patch) | |
| tree | 81614102d853a7d1fc16e207083905ece2ae14e3 /ipc/handle_attachment_win.h | |
| parent | 4819f8b1cfab20b5598d5426ff48dbeae1b1955a (diff) | |
| download | chromium_src-896012863947ba511c55ce7c65aa1002cd3894eb.zip chromium_src-896012863947ba511c55ce7c65aa1002cd3894eb.tar.gz chromium_src-896012863947ba511c55ce7c65aa1002cd3894eb.tar.bz2 | |
Revert of Fix failing tests with ChannelMojo enabled. (patchset #3 id:300001 of https://codereview.chromium.org/1768903002/ )
Reason for revert:
This CL is causing failures in ipc_mojo_unittests.
See:
https://build.chromium.org/p/chromium.linux/builders/Linux%20Tests%20%28dbg%29%281%29/builds/52715
https://build.chromium.org/p/chromium.linux/builders/Linux%20Tests%20%28dbg%29%281%29%2832%29/builds/26588
Original issue's description:
> Fix failing tests with ChannelMojo enabled.
>
> This ChannelMojo to:
> - take a ScopedMessagePipeHandle instead of a string token so an
> in-process renderer can be passed the message pipe directly;
> - send brokered attachments as mojo handles; and
> - offer messages to AttachmentBroker.
>
> This also fixes and re-enables ipc_channel_mojo_unittest.cc.
>
> BUG=579813
>
> Committed: https://crrev.com/013cfed7ecf91b0700bec7147631d4fbedb6b64e
> Cr-Commit-Position: refs/heads/master@{#380294}
TBR=rockot@chromium.org,tsepez@chromium.org,ben@chromium.org,sammc@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=579813
Review URL: https://codereview.chromium.org/1784773002
Cr-Commit-Position: refs/heads/master@{#380325}
Diffstat (limited to 'ipc/handle_attachment_win.h')
| -rw-r--r-- | ipc/handle_attachment_win.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/ipc/handle_attachment_win.h b/ipc/handle_attachment_win.h index ff0ce91..5e04bdb 100644 --- a/ipc/handle_attachment_win.h +++ b/ipc/handle_attachment_win.h @@ -58,13 +58,6 @@ class IPC_EXPORT HandleAttachmentWin : public BrokerableAttachment { // result. Should only be called by the sender of a Chrome IPC message. HandleAttachmentWin(const HANDLE& handle, HandleWin::Permissions permissions); - enum FromWire { - FROM_WIRE, - }; - // This constructor takes ownership of |handle|. Should only be called by the - // receiver of a Chrome IPC message. - HandleAttachmentWin(const HANDLE& handle, FromWire from_wire); - // This constructor takes ownership of |wire_format.handle| without making a // copy. Should only be called by the receiver of a Chrome IPC message. explicit HandleAttachmentWin(const WireFormat& wire_format); |