Revert "Pepper: Fix channel init in ProxyChannel."

This reverts:
https://src.chromium.org/viewvc/chrome?view=rev&revision=253408
because it introduces a data race. See:
https://code.google.com/p/chromium/issues/detail?id=244383

This CL might still be a good change, but there will need to
be changes to IPC::ChannelProxy first.

BUG=343768
TBR=teravest

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

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

1 files changed, 8 insertions, 9 deletions

diff --git a/ppapi/proxy/proxy_channel.cc b/ppapi/proxy/proxy_channel.cc
index 1623401..b7f8a82 100644
--- a/ppapi/proxy/proxy_channel.cc
+++ b/ppapi/proxy/proxy_channel.cc
@@ -25,19 +25,18 @@ ProxyChannel::~ProxyChannel() {
   DVLOG(1) << "ProxyChannel::~ProxyChannel()";
 }
 
-void ProxyChannel::InitWithChannel(Delegate* delegate,
-                                   base::ProcessId peer_pid) {
+bool ProxyChannel::InitWithChannel(Delegate* delegate,
+                                   base::ProcessId peer_pid,
+                                   const IPC::ChannelHandle& channel_handle,
+                                   bool is_client) {
   delegate_ = delegate;
   peer_pid_ = peer_pid;
-  channel_.reset(new IPC::SyncChannel(this, delegate->GetIPCMessageLoop(),
-                                      delegate->GetShutdownEvent()));
-}
-
-void ProxyChannel::ConnectChannel(const IPC::ChannelHandle& channel_handle,
-                                  bool is_client) {
   IPC::Channel::Mode mode = is_client ? IPC::Channel::MODE_CLIENT
                                       : IPC::Channel::MODE_SERVER;
-  channel_->Init(channel_handle, mode, true);
+  channel_.reset(new IPC::SyncChannel(channel_handle, mode, this,
+                                      delegate->GetIPCMessageLoop(), true,
+                                      delegate->GetShutdownEvent()));
+  return true;
 }
 
 void ProxyChannel::InitWithTestSink(IPC::TestSink* test_sink) {