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

Broke Windows compile:
http://build.chromium.org/p/chromium.win/buildstatus?builder=Win%20x64%20Builder&number=180

FAILED: ninja -t msvc -e environment.x64 -- C:\b\build\goma/gomacc "C:\b\depot_tools\win_toolchain\vs2013_files\VC\bin\amd64\cl.exe" /nologo /showIncludes /FC @obj\remoting\host\win\remoting_core.wts_session_process_delegate.obj.rsp /c ..\..\remoting\host\win\wts_session_process_delegate.cc /Foobj\remoting\host\win\remoting_core.wts_session_process_delegate.obj /Fdobj\remoting\remoting_core.cc.pdb 
c:\b\build\slave\win_x64_builder\build\src\remoting\host\win\wts_session_process_delegate.cc(386) : error C2661: 'IPC::ChannelProxy::ChannelProxy' : no overloaded function takes 4 arguments
ninja: build stopped: subcommand failed.


> Introduce IPC::ChannelProxy::Create*() and IPC::SynChannel::Create*()
> 
> This change hides constructors of these classes so that we can turn
> them polymorphic classes.
> 
> Note that having almost identical ChannelProxy::Init*() isn't great
> and they will be replaced by a factory-like abstraction in coming
> changes.
> 
> TEST=none
> R=darin,cpu
> BUG=377980
> 
> Review URL: https://codereview.chromium.org/301973003

TBR=morrita@chromium.org

Review URL: https://codereview.chromium.org/312553004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@274315 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 12 insertions, 14 deletions

diff --git a/ppapi/nacl_irt/manifest_service.cc b/ppapi/nacl_irt/manifest_service.cc
index 79da286..0afa217 100644
--- a/ppapi/nacl_irt/manifest_service.cc
+++ b/ppapi/nacl_irt/manifest_service.cc
@@ -22,9 +22,10 @@ ManifestService::ManifestService(
     scoped_refptr<base::MessageLoopProxy> io_message_loop,
     base::WaitableEvent* shutdown_event) {
   filter_ = new IPC::SyncMessageFilter(shutdown_event);
-  channel_ = IPC::ChannelProxy::CreateServer(handle,
-                                             NULL,  // Listener
-                                             io_message_loop);
+  channel_.reset(new IPC::ChannelProxy(handle,
+                                       IPC::Channel::MODE_SERVER,
+                                       NULL,  // Listener
+                                       io_message_loop));
   channel_->AddFilter(filter_.get());
 }
 
diff --git a/ppapi/nacl_irt/ppapi_dispatcher.cc b/ppapi/nacl_irt/ppapi_dispatcher.cc
index e01114e..9ca76b2 100644
--- a/ppapi/nacl_irt/ppapi_dispatcher.cc
+++ b/ppapi/nacl_irt/ppapi_dispatcher.cc
@@ -63,13 +63,13 @@ PpapiDispatcher::PpapiDispatcher(scoped_refptr<base::MessageLoopProxy> io_loop,
   // Delay initializing the SyncChannel until after we add filters. This
   // ensures that the filters won't miss any messages received by
   // the channel.
-  channel_ =IPC::SyncChannel::Create(
-      this, GetIPCMessageLoop(), GetShutdownEvent());
+  channel_.reset(new IPC::SyncChannel(
+      this, GetIPCMessageLoop(), GetShutdownEvent()));
   channel_->AddFilter(new proxy::PluginMessageFilter(
       NULL, proxy::PluginGlobals::Get()->resource_reply_thread_registrar()));
   channel_->AddFilter(
       new tracing::ChildTraceMessageFilter(message_loop_.get()));
-  channel_->InitServer(channel_handle, true);
+  channel_->Init(channel_handle, IPC::Channel::MODE_SERVER, true);
 }
 
 base::MessageLoopProxy* PpapiDispatcher::GetIPCMessageLoop() {
diff --git a/ppapi/proxy/proxy_channel.cc b/ppapi/proxy/proxy_channel.cc
index db2a30f..b7f8a82 100644
--- a/ppapi/proxy/proxy_channel.cc
+++ b/ppapi/proxy/proxy_channel.cc
@@ -31,14 +31,11 @@ bool ProxyChannel::InitWithChannel(Delegate* delegate,
                                    bool is_client) {
   delegate_ = delegate;
   peer_pid_ = peer_pid;
-  channel_ = IPC::SyncChannel::Create(
-      this,
-      delegate->GetIPCMessageLoop(),
-      delegate->GetShutdownEvent());
-  if (is_client)
-    channel_->InitClient(channel_handle, true);
-  else
-    channel_->InitServer(channel_handle, true);
+  IPC::Channel::Mode mode = is_client ? IPC::Channel::MODE_CLIENT
+                                      : IPC::Channel::MODE_SERVER;
+  channel_.reset(new IPC::SyncChannel(channel_handle, mode, this,
+                                      delegate->GetIPCMessageLoop(), true,
+                                      delegate->GetShutdownEvent()));
   return true;
 }