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

5 files changed, 15 insertions, 13 deletions

diff --git a/components/nacl/browser/nacl_process_host.cc b/components/nacl/browser/nacl_process_host.cc
index ce2700d..7451fe6 100644
--- a/components/nacl/browser/nacl_process_host.cc
+++ b/components/nacl/browser/nacl_process_host.cc
@@ -905,10 +905,11 @@ void NaClProcessHost::OnPpapiChannelsCreated(
   if (!ipc_proxy_channel_.get()) {
     DCHECK_EQ(PROCESS_TYPE_NACL_LOADER, process_->GetData().process_type);
 
-    ipc_proxy_channel_ = IPC::ChannelProxy::CreateClient(
-        browser_channel_handle,
-        NULL,
-        base::MessageLoopProxy::current().get());
+    ipc_proxy_channel_.reset(
+        new IPC::ChannelProxy(browser_channel_handle,
+                              IPC::Channel::MODE_CLIENT,
+                              NULL,
+                              base::MessageLoopProxy::current().get()));
     // Create the browser ppapi host and enable PPAPI message dispatching to the
     // browser process.
     ppapi_host_.reset(content::BrowserPpapiHost::CreateExternalPluginProcess(
diff --git a/components/nacl/loader/nacl_listener.cc b/components/nacl/loader/nacl_listener.cc
index 5f1966d..5056f0f 100644
--- a/components/nacl/loader/nacl_listener.cc
+++ b/components/nacl/loader/nacl_listener.cc
@@ -244,11 +244,11 @@ void NaClListener::Listen() {
   std::string channel_name =
       CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
           switches::kProcessChannelID);
-  channel_ = IPC::SyncChannel::Create(
-      this, io_thread_.message_loop_proxy().get(), &shutdown_event_);
+  channel_.reset(new IPC::SyncChannel(
+      this, io_thread_.message_loop_proxy().get(), &shutdown_event_));
   filter_ = new IPC::SyncMessageFilter(&shutdown_event_);
   channel_->AddFilter(filter_.get());
-  channel_->InitClient(channel_name, true);
+  channel_->Init(channel_name, IPC::Channel::MODE_CLIENT, true);
   main_loop_ = base::MessageLoop::current();
   main_loop_->Run();
 }
diff --git a/components/nacl/loader/nacl_trusted_listener.cc b/components/nacl/loader/nacl_trusted_listener.cc
index 2392e9a..19a6038 100644
--- a/components/nacl/loader/nacl_trusted_listener.cc
+++ b/components/nacl/loader/nacl_trusted_listener.cc
@@ -8,8 +8,9 @@ NaClTrustedListener::NaClTrustedListener(
     const IPC::ChannelHandle& handle,
     base::MessageLoopProxy* message_loop_proxy,
     base::WaitableEvent* shutdown_event) {
-  channel_ = IPC::SyncChannel::CreateServer(
-      handle, this, message_loop_proxy, true, shutdown_event);
+  channel_.reset(new IPC::SyncChannel(handle, IPC::Channel::MODE_SERVER, this,
+                                      message_loop_proxy, true,
+                                      shutdown_event));
 }
 
 NaClTrustedListener::~NaClTrustedListener() {
diff --git a/components/nacl/renderer/manifest_service_channel.cc b/components/nacl/renderer/manifest_service_channel.cc
index 3544d6e..606be61 100644
--- a/components/nacl/renderer/manifest_service_channel.cc
+++ b/components/nacl/renderer/manifest_service_channel.cc
@@ -22,8 +22,8 @@ ManifestServiceChannel::ManifestServiceChannel(
     base::WaitableEvent* waitable_event)
     : connected_callback_(connected_callback),
       delegate_(delegate.Pass()),
-      channel_(IPC::SyncChannel::CreateClient(
-          handle, this,
+      channel_(new IPC::SyncChannel(
+          handle, IPC::Channel::MODE_CLIENT, this,
           content::RenderThread::Get()->GetIOMessageLoopProxy(),
           true, waitable_event)),
       weak_ptr_factory_(this) {
diff --git a/components/nacl/renderer/trusted_plugin_channel.cc b/components/nacl/renderer/trusted_plugin_channel.cc
index cfb9523..7ce3d84 100644
--- a/components/nacl/renderer/trusted_plugin_channel.cc
+++ b/components/nacl/renderer/trusted_plugin_channel.cc
@@ -17,8 +17,8 @@ TrustedPluginChannel::TrustedPluginChannel(
     const base::Callback<void(int32_t)>& connected_callback,
     base::WaitableEvent* waitable_event)
     : connected_callback_(connected_callback),
-      channel_(IPC::SyncChannel::CreateClient(
-          handle, this,
+      channel_(new IPC::SyncChannel(
+          handle, IPC::Channel::MODE_CLIENT, this,
           content::RenderThread::Get()->GetIOMessageLoopProxy(), true,
           waitable_event)) {
 }