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

mojo/system/raw_channel.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/system/raw_channel.h"
 
 #include <string.h>
 
 #include <algorithm>
 
@@ skipping 73 matching lines @@
 
 size_t RawChannel::WriteBuffer::GetTotalBytesToWrite() const {
   if (message_queue_.empty())
     return 0;
 
   MessageInTransit* message = message_queue_.front();
   DCHECK_LT(offset_, message->total_size());
   return message->total_size() - offset_;
 }
 
-RawChannel::RawChannel(Delegate* delegate,
-                       base::MessageLoopForIO* message_loop_for_io)
-    : delegate_(delegate),
-      message_loop_for_io_(message_loop_for_io),
+RawChannel::RawChannel()
+    : delegate_(NULL),
+      message_loop_for_io_(NULL),
       read_stopped_(false),
       write_stopped_(false),
       weak_ptr_factory_(this) {
 }
 
 RawChannel::~RawChannel() {
   DCHECK(!read_buffer_);
   DCHECK(!write_buffer_);
 
   // No need to take the |write_lock_| here -- if there are still weak pointers
   // outstanding, then we're hosed anyway (since we wouldn't be able to
   // invalidate them cleanly, since we might not be on the I/O thread).
   DCHECK(!weak_ptr_factory_.HasWeakPtrs());
 }
 
-bool RawChannel::Init() {
-  DCHECK_EQ(base::MessageLoop::current(), message_loop_for_io_);
+bool RawChannel::Init(Delegate* delegate) {
+  DCHECK(delegate);
+
+  DCHECK(!delegate_);
+  delegate_ = delegate;
+
+  CHECK_EQ(base::MessageLoop::current()->type(), base::MessageLoop::TYPE_IO);
+  DCHECK(!message_loop_for_io_);
+  message_loop_for_io_ =
+      static_cast<base::MessageLoopForIO*>(base::MessageLoop::current());
 
   // No need to take the lock. No one should be using us yet.
   DCHECK(!read_buffer_);
   read_buffer_.reset(new ReadBuffer);
   DCHECK(!write_buffer_);
   write_buffer_.reset(new WriteBuffer);
 
   if (!OnInit())
     return false;
 
@@ skipping 218 matching lines @@
   }
 
   write_stopped_ = true;
   STLDeleteElements(&write_buffer_->message_queue_);
   write_buffer_->offset_ = 0;
   return false;
 }
 
 }  // namespace system
 }  // namespace mojo