Remove RawChannel::Init() and Channel::Init() failure cases.

mojo/edk/embedder/embedder.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mojo/edk/embedder/embedder.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 18 matching lines @@
 // creation thread.
 system::ChannelId MakeChannel(
     ScopedPlatformHandle platform_handle,
     scoped_refptr<system::ChannelEndpoint> channel_endpoint) {
   DCHECK(platform_handle.is_valid());
 
   // Create and initialize a |system::Channel|.
   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);
   return internal::g_channel_manager->AddChannel(
       channel, base::MessageLoopProxy::current());
 }
 
 // Helper for |CreateChannel()|. Called on the channel creation thread.
 void CreateChannelHelper(
     ScopedPlatformHandle platform_handle,
@@ skipping 86 matching lines @@
                                        : io_thread_task_runner)
         ->PostTask(FROM_HERE, base::Bind(callback, channel_info.release()));
   }
 
   return rv.Pass();
 }
 
 // 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.
   internal::g_channel_manager->ShutdownChannel(channel_info->channel_id);
   delete channel_info;
 }
 
 void WillDestroyChannelSoon(ChannelInfo* channel_info) {
   DCHECK(channel_info);
   DCHECK(internal::g_channel_manager);
@@ skipping 41 matching lines @@
 }
 
 MojoResult AsyncWait(MojoHandle handle,
                      MojoHandleSignals signals,
                      base::Callback<void(MojoResult)> callback) {
   return internal::g_core->AsyncWait(handle, signals, callback);
 }
 
 }  // namespace embedder
 }  // namespace mojo