Allow proxy channels to be created without initializing the underlying channel.

ipc/ipc_channel_proxy.cc

 // Copyright (c) 2011 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 "base/bind.h"
 #include "base/location.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "ipc/ipc_channel_proxy.h"
 #include "ipc/ipc_logging.h"
@@ skipping 267 matching lines @@
     listener_->OnChannelError();
 }
 
 //-----------------------------------------------------------------------------
 
 ChannelProxy::ChannelProxy(const IPC::ChannelHandle& channel_handle,
                            Channel::Mode mode,
                            Channel::Listener* listener,
                            base::MessageLoopProxy* ipc_thread)
     : context_(new Context(listener, ipc_thread)),
-      outgoing_message_filter_(NULL) {
-  Init(channel_handle, mode, ipc_thread, true);
+      outgoing_message_filter_(NULL),
+      did_init_(false) {
+  Init(channel_handle, mode, true);
 }
 
-ChannelProxy::ChannelProxy(const IPC::ChannelHandle& channel_handle,
-                           Channel::Mode mode,
-                           base::MessageLoopProxy* ipc_thread,
-                           Context* context,
-                           bool create_pipe_now)
+ChannelProxy::ChannelProxy(Context* context)
     : context_(context),
-      outgoing_message_filter_(NULL) {
-  Init(channel_handle, mode, ipc_thread, create_pipe_now);
+      outgoing_message_filter_(NULL),
+      did_init_(false) {
 }
 
 ChannelProxy::~ChannelProxy() {
   Close();
 }
 
 void ChannelProxy::Init(const IPC::ChannelHandle& channel_handle,
                         Channel::Mode mode,
-                        base::MessageLoopProxy* ipc_thread_loop,
                         bool create_pipe_now) {
+  DCHECK(!did_init_);
 #if defined(OS_POSIX)
   // When we are creating a server on POSIX, we need its file descriptor
   // to be created immediately so that it can be accessed and passed
   // to other processes. Forcing it to be created immediately avoids
   // race conditions that may otherwise arise.
   if (mode & Channel::MODE_SERVER_FLAG) {
     create_pipe_now = true;
   }
 #endif  // defined(OS_POSIX)
 
   if (create_pipe_now) {
     // Create the channel immediately.  This effectively sets up the
     // low-level pipe so that the client can connect.  Without creating
     // the pipe immediately, it is possible for a listener to attempt
     // to connect and get an error since the pipe doesn't exist yet.
     context_->CreateChannel(channel_handle, mode);
   } else {
     context_->ipc_message_loop()->PostTask(
         FROM_HERE, base::Bind(&Context::CreateChannel, context_.get(),
                               channel_handle, mode));
   }
 
   // complete initialization on the background thread
   context_->ipc_message_loop()->PostTask(
       FROM_HERE, base::Bind(&Context::OnChannelOpened, context_.get()));
+
+  did_init_ = true;
 }
 
 void ChannelProxy::Close() {
   // Clear the backpointer to the listener so that any pending calls to
   // Context::OnDispatchMessage or OnDispatchError will be ignored.  It is
   // possible that the channel could be closed while it is receiving messages!
   context_->Clear();
 
   if (context_->ipc_message_loop()) {
     context_->ipc_message_loop()->PostTask(
         FROM_HERE, base::Bind(&Context::OnChannelClosed, context_.get()));
   }
 }
 
 bool ChannelProxy::Send(Message* message) {
+  DCHECK(did_init_);
   if (outgoing_message_filter())
     message = outgoing_message_filter()->Rewrite(message);
 
 #ifdef IPC_MESSAGE_LOG_ENABLED
   Logging::GetInstance()->OnSendMessage(message, context_->channel_id());
 #endif
 
   context_->ipc_message_loop()->PostTask(FROM_HERE,
                                          new SendTask(context_.get(), message));
   return true;
@@ skipping 34 matching lines @@
   Channel* channel = context_.get()->channel_.get();
   // Channel must have been created first.
   DCHECK(channel) << context_.get()->channel_id_;
   return channel->GetClientEuid(client_euid);
 }
 #endif
 
 //-----------------------------------------------------------------------------
 
 }  // namespace IPC