diff options
| author | Colin Blundell <blundell@chromium.org> | 2015-01-19 13:17:50 +0100 |
|---|---|---|
| committer | Colin Blundell <blundell@chromium.org> | 2015-01-19 12:20:14 +0000 |
| commit | 835d018d323f35bd8d9b0d645caf180705b0a7da (patch) | |
| tree | fc84cfdcb2bba73f3edb5bfeb9fff7797a46e02e /mojo/edk/embedder | |
| parent | 71f9904e069bac7cd87140ad9006890392b04ea2 (diff) | |
| download | chromium_src-835d018d323f35bd8d9b0d645caf180705b0a7da.zip chromium_src-835d018d323f35bd8d9b0d645caf180705b0a7da.tar.gz chromium_src-835d018d323f35bd8d9b0d645caf180705b0a7da.tar.bz2 | |
Update mojo sdk to rev b737c0531e299ad494725c518699843e76ff84f5
Incorporates changes from https://codereview.chromium.org/849133003/ to adapt
to API changes in surfaces and ConnectToApplication.
TBR=ben@chromium.org, jamesr@chromium.org
Review URL: https://codereview.chromium.org/858603002
Cr-Commit-Position: refs/heads/master@{#312096}
Diffstat (limited to 'mojo/edk/embedder')
| -rw-r--r-- | mojo/edk/embedder/embedder.cc | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/mojo/edk/embedder/embedder.cc b/mojo/edk/embedder/embedder.cc index 622b3b7..1d12c1e 100644 --- a/mojo/edk/embedder/embedder.cc +++ b/mojo/edk/embedder/embedder.cc @@ -36,14 +36,7 @@ system::ChannelId MakeChannel( DCHECK(internal::g_core); scoped_refptr<system::Channel> channel = new system::Channel(internal::g_core->platform_support()); - if (!channel->Init(system::RawChannel::Create(platform_handle.Pass()))) { - // This is very unusual (e.g., maybe |platform_handle| was invalid or we - // reached some system resource limit). - LOG(ERROR) << "Channel::Init() failed"; - // Return null, since |Shutdown()| shouldn't be called in this case. - return 0; - } - + channel->Init(system::RawChannel::Create(platform_handle.Pass())); channel->SetBootstrapEndpoint(channel_endpoint); DCHECK(internal::g_channel_manager); @@ -150,11 +143,7 @@ ScopedMessagePipeHandle CreateChannel( // TODO(vtl): Write tests for this. void DestroyChannel(ChannelInfo* channel_info) { DCHECK(channel_info); - if (!channel_info->channel_id) { - // Presumably, |Init()| on the channel failed. - return; - } - + DCHECK(channel_info->channel_id); DCHECK(internal::g_channel_manager); // This will destroy the channel synchronously if called from the channel // thread. |