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

mojo/system/raw_channel_win.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/raw_channel.h"
 
 #include <windows.h>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 52 matching lines @@
   cancel_io_ex_ = reinterpret_cast<CancelIoExFunc>(
       GetProcAddress(module, "CancelIoEx"));
   DCHECK(cancel_io_ex_);
 }
 
 base::LazyInstance<VistaOrHigherFunctions> g_vista_or_higher_functions =
     LAZY_INSTANCE_INITIALIZER;
 
 class RawChannelWin : public RawChannel {
  public:
-  RawChannelWin(embedder::ScopedPlatformHandle handle,
-                Delegate* delegate,
-                base::MessageLoopForIO* message_loop);
+  RawChannelWin(embedder::ScopedPlatformHandle handle);
   virtual ~RawChannelWin();
 
  private:
   // RawChannelIOHandler receives OS notifications for I/O completion. It must
   // be created on the I/O thread.
   //
   // It manages its own destruction. Destruction happens on the I/O thread when
   // all the following conditions are satisfied:
   //   - |DetachFromOwnerNoLock()| has been called;
   //   - there is no pending read;
@@ skipping 231 matching lines @@
   }
 
   if (error != ERROR_SUCCESS) {
     LOG(ERROR) << "WriteFile failed: " << error;
     owner_->OnWriteCompleted(false, 0);
   } else {
     owner_->OnWriteCompleted(true, bytes_written);
   }
 }
 
-RawChannelWin::RawChannelWin(embedder::ScopedPlatformHandle handle,
-                             Delegate* delegate,
-                             base::MessageLoopForIO* message_loop)
-    : RawChannel(delegate, message_loop),
-      handle_(handle.Pass()),
+RawChannelWin::RawChannelWin(embedder::ScopedPlatformHandle handle)
+    : handle_(handle.Pass()),
       io_handler_(NULL),
       skip_completion_port_on_success_(
           g_vista_or_higher_functions.Get().is_vista_or_higher()) {
   DCHECK(handle_.is_valid());
 }
 
 RawChannelWin::~RawChannelWin() {
   DCHECK(!io_handler_);
 }
 
@@ skipping 172 matching lines @@
   io_handler_->DetachFromOwnerNoLock(read_buffer.Pass(), write_buffer.Pass());
   io_handler_ = NULL;
 }
 
 }  // namespace
 
 // -----------------------------------------------------------------------------
 
 // Static factory method declared in raw_channel.h.
 // static
-RawChannel* RawChannel::Create(embedder::ScopedPlatformHandle handle,
-                               Delegate* delegate,
-                               base::MessageLoopForIO* message_loop) {
-  return new RawChannelWin(handle.Pass(), delegate, message_loop);
+scoped_ptr<RawChannel> RawChannel::Create(
+    embedder::ScopedPlatformHandle handle) {
+  return scoped_ptr<RawChannel>(new RawChannelWin(handle.Pass()));
 }
 
 }  // namespace system
 }  // namespace mojo