Mojo: Make Channel take a RawChannel rather than creating it.

mojo/system/channel.cc

 // Copyright 2013 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/system/channel.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
-#include "base/message_loop/message_loop.h"
 #include "base/strings/stringprintf.h"
 #include "mojo/system/message_pipe_endpoint.h"
 
 namespace mojo {
 namespace system {
 
 COMPILE_ASSERT(Channel::kBootstrapEndpointId !=
                    MessageInTransit::kInvalidEndpointId,
                kBootstrapEndpointId_is_invalid);
 
 STATIC_CONST_MEMBER_DEFINITION const MessageInTransit::EndpointId
     Channel::kBootstrapEndpointId;
 
 Channel::EndpointInfo::EndpointInfo() {
 }
 
 Channel::EndpointInfo::EndpointInfo(scoped_refptr<MessagePipe> message_pipe,
                                     unsigned port)
     : message_pipe(message_pipe),
       port(port) {
 }
 
 Channel::EndpointInfo::~EndpointInfo() {
 }
 
 Channel::Channel()
     : next_local_id_(kBootstrapEndpointId) {
 }
 
-bool Channel::Init(embedder::ScopedPlatformHandle handle) {
+bool Channel::Init(scoped_ptr<RawChannel> raw_channel) {
   DCHECK(creation_thread_checker_.CalledOnValidThread());
+  DCHECK(raw_channel);
 
   // No need to take |lock_|, since this must be called before this object
   // becomes thread-safe.
-  DCHECK(!raw_channel_.get());
+  DCHECK(!raw_channel_);
+  raw_channel_ = raw_channel.Pass();
 
-  CHECK_EQ(base::MessageLoop::current()->type(), base::MessageLoop::TYPE_IO);
-  raw_channel_.reset(RawChannel::Create(handle.Pass(), this,
-                                        static_cast<base::MessageLoopForIO*>(
-                                            base::MessageLoop::current())));
-  if (!raw_channel_->Init()) {
+  if (!raw_channel_->Init(this)) {
     raw_channel_.reset();
     return false;
   }
 
   return true;
 }
 
 void Channel::Shutdown() {
   DCHECK(creation_thread_checker_.CalledOnValidThread());
 
@@ skipping 223 matching lines @@
   LOG(WARNING) << error_message;
 }
 
 void Channel::HandleLocalError(const base::StringPiece& error_message) {
   // TODO(vtl): Is this how we really want to handle this?
   LOG(WARNING) << error_message;
 }
 
 }  // namespace system
 }  // namespace mojo