diff options
| author | sammc <sammc@chromium.org> | 2016-03-09 17:42:29 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-10 01:43:27 +0000 |
| commit | 013cfed7ecf91b0700bec7147631d4fbedb6b64e (patch) | |
| tree | 756cf2ff9fb0fe1ad81363cee2c6582ee30f7d5c /mojo | |
| parent | 2292849b75d884faff3d77c37b4fcf9743e13388 (diff) | |
| download | chromium_src-013cfed7ecf91b0700bec7147631d4fbedb6b64e.zip chromium_src-013cfed7ecf91b0700bec7147631d4fbedb6b64e.tar.gz chromium_src-013cfed7ecf91b0700bec7147631d4fbedb6b64e.tar.bz2 | |
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
Review URL: https://codereview.chromium.org/1768903002
Cr-Commit-Position: refs/heads/master@{#380294}
Diffstat (limited to 'mojo')
| -rw-r--r-- | mojo/edk/embedder/embedder.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mojo/edk/embedder/embedder.h b/mojo/edk/embedder/embedder.h index 95b3b21..99191a9 100644 --- a/mojo/edk/embedder/embedder.h +++ b/mojo/edk/embedder/embedder.h @@ -75,8 +75,8 @@ CreatePlatformHandleWrapper(ScopedPlatformHandle platform_handle, MojoHandle* platform_handle_wrapper_handle); // Retrieves the |PlatformHandle| that was wrapped into a |MojoHandle| (using -// |CreatePlatformHandleWrapper()| above). Note that the |MojoHandle| must still -// be closed separately. +// |CreatePlatformHandleWrapper()| above). Note that the |MojoHandle| is closed +// on success. MOJO_SYSTEM_IMPL_EXPORT MojoResult PassWrappedPlatformHandle(MojoHandle platform_handle_wrapper_handle, ScopedPlatformHandle* platform_handle); |