1 files changed, 9 insertions, 36 deletions

diff --git a/ipc/ipc_sync_channel.h b/ipc/ipc_sync_channel.h
index 9ae3fd9..f18fcff9 100644
--- a/ipc/ipc_sync_channel.h
+++ b/ipc/ipc_sync_channel.h
@@ -66,42 +66,19 @@ class IPC_EXPORT SyncChannel : public ChannelProxy {
 
   // Creates and initializes a sync channel. If create_pipe_now is specified,
   // the channel will be initialized synchronously.
-  // The naming pattern follows IPC::Channel.
-  static scoped_ptr<SyncChannel> CreateClient(
-      const IPC::ChannelHandle& channel_handle,
-      Listener* listener,
-      base::SingleThreadTaskRunner* ipc_task_runner,
-      bool create_pipe_now,
-      base::WaitableEvent* shutdown_event);
-
-  static scoped_ptr<SyncChannel> CreateServer(
-      const IPC::ChannelHandle& channel_handle,
-      Listener* listener,
-      base::SingleThreadTaskRunner* ipc_task_runner,
-      bool create_pipe_now,
-      base::WaitableEvent* shutdown_event);
-
-  static scoped_ptr<SyncChannel> CreateNamedClient(
-      const IPC::ChannelHandle& channel_handle,
-      Listener* listener,
-      base::SingleThreadTaskRunner* ipc_task_runner,
-      bool create_pipe_now,
-      base::WaitableEvent* shutdown_event);
-
-  static scoped_ptr<SyncChannel> CreateNamedServer(
-      const IPC::ChannelHandle& channel_handle,
-      Listener* listener,
-      base::SingleThreadTaskRunner* ipc_task_runner,
-      bool create_pipe_now,
-      base::WaitableEvent* shutdown_event);
+  SyncChannel(const IPC::ChannelHandle& channel_handle,
+              Channel::Mode mode,
+              Listener* listener,
+              base::SingleThreadTaskRunner* ipc_task_runner,
+              bool create_pipe_now,
+              base::WaitableEvent* shutdown_event);
 
   // Creates an uninitialized sync channel. Call ChannelProxy::Init to
   // initialize the channel. This two-step setup allows message filters to be
   // added before any messages are sent or received.
-  static scoped_ptr<SyncChannel> Create(
-      Listener* listener,
-      base::SingleThreadTaskRunner* ipc_task_runner,
-      base::WaitableEvent* shutdown_event);
+  SyncChannel(Listener* listener,
+              base::SingleThreadTaskRunner* ipc_task_runner,
+              base::WaitableEvent* shutdown_event);
 
   virtual ~SyncChannel();
 
@@ -211,10 +188,6 @@ class IPC_EXPORT SyncChannel : public ChannelProxy {
   };
 
  private:
-  SyncChannel(Listener* listener,
-              base::SingleThreadTaskRunner* ipc_task_runner,
-              base::WaitableEvent* shutdown_event);
-
   void OnWaitableEventSignaled(base::WaitableEvent* arg);
 
   SyncContext* sync_context() {