Revert 274310 "Introduce IPC::ChannelProxy::Create*() and IPC::S..."

trunk/src/ipc/ipc_sync_channel.cc

 // Copyright (c) 2012 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 "ipc/ipc_sync_channel.h"
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "base/lazy_instance.h"
 #include "base/location.h"
@@ skipping 386 matching lines @@
     DCHECK_EQ(GetSendDoneEvent(), event);
     base::MessageLoop::current()->QuitNow();
   }
 }
 
 base::WaitableEventWatcher::EventCallback
     SyncChannel::SyncContext::MakeWaitableEventCallback() {
   return base::Bind(&SyncChannel::SyncContext::OnWaitableEventSignaled, this);
 }
 
-// static
-scoped_ptr<SyncChannel> SyncChannel::CreateClient(
-      const IPC::ChannelHandle& channel_handle,
-      Listener* listener,
-      base::SingleThreadTaskRunner* ipc_task_runner,
-      bool create_pipe_now,
-      base::WaitableEvent* shutdown_event) {
-  scoped_ptr<SyncChannel> channel = Create(
-      listener, ipc_task_runner, shutdown_event);
-  channel->InitClient(channel_handle, create_pipe_now);
-  return channel.Pass();
-}
-
-// static
-scoped_ptr<SyncChannel> SyncChannel::CreateServer(
+SyncChannel::SyncChannel(
     const IPC::ChannelHandle& channel_handle,
+    Channel::Mode mode,
     Listener* listener,
     base::SingleThreadTaskRunner* ipc_task_runner,
     bool create_pipe_now,
-    base::WaitableEvent* shutdown_event) {
-  scoped_ptr<SyncChannel> channel = Create(
-      listener, ipc_task_runner, shutdown_event);
-  channel->InitServer(channel_handle, create_pipe_now);
-  return channel.Pass();
-}
-
-// static
-scoped_ptr<SyncChannel> SyncChannel::CreateNamedClient(
-    const IPC::ChannelHandle& channel_handle,
-    Listener* listener,
-    base::SingleThreadTaskRunner* ipc_task_runner,
-    bool create_pipe_now,
-    base::WaitableEvent* shutdown_event) {
-  scoped_ptr<SyncChannel> channel = Create(
-      listener, ipc_task_runner, shutdown_event);
-  channel->InitNamedClient(channel_handle, create_pipe_now);
-  return channel.Pass();
-}
-
-// static
-scoped_ptr<SyncChannel> SyncChannel::CreateNamedServer(
-    const IPC::ChannelHandle& channel_handle,
-    Listener* listener,
-    base::SingleThreadTaskRunner* ipc_task_runner,
-    bool create_pipe_now,
-    base::WaitableEvent* shutdown_event) {
-  scoped_ptr<SyncChannel> channel = Create(
-      listener, ipc_task_runner, shutdown_event);
-  channel->InitNamedServer(channel_handle, create_pipe_now);
-  return channel.Pass();
-}
-
-// static
-scoped_ptr<SyncChannel> SyncChannel::Create(
-    Listener* listener,
-    base::SingleThreadTaskRunner* ipc_task_runner,
-    WaitableEvent* shutdown_event) {
-  return make_scoped_ptr(new SyncChannel(
-      listener, ipc_task_runner, shutdown_event));
+    WaitableEvent* shutdown_event)
+    : ChannelProxy(new SyncContext(listener, ipc_task_runner, shutdown_event)) {
+  // The current (listener) thread must be distinct from the IPC thread, or else
+  // sending synchronous messages will deadlock.
+  DCHECK_NE(ipc_task_runner, base::ThreadTaskRunnerHandle::Get());
+  ChannelProxy::Init(channel_handle, mode, create_pipe_now);
+  StartWatching();
 }
 
 SyncChannel::SyncChannel(
     Listener* listener,
     base::SingleThreadTaskRunner* ipc_task_runner,
     WaitableEvent* shutdown_event)
     : ChannelProxy(new SyncContext(listener, ipc_task_runner, shutdown_event)) {
   // The current (listener) thread must be distinct from the IPC thread, or else
   // sending synchronous messages will deadlock.
   DCHECK_NE(ipc_task_runner, base::ThreadTaskRunnerHandle::Get());
@@ skipping 126 matching lines @@
   // manual reset since the object watcher might otherwise reset the event
   // when we're doing a WaitMany.
   dispatch_watcher_callback_ =
       base::Bind(&SyncChannel::OnWaitableEventSignaled,
                   base::Unretained(this));
   dispatch_watcher_.StartWatching(sync_context()->GetDispatchEvent(),
                                   dispatch_watcher_callback_);
 }
 
 }  // namespace IPC