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, 9 insertions, 10 deletions

diff --git a/ppapi/proxy/proxy_channel.h b/ppapi/proxy/proxy_channel.h
index 64b8a77..6c9f1f6 100644
--- a/ppapi/proxy/proxy_channel.h
+++ b/ppapi/proxy/proxy_channel.h
@@ -53,10 +53,10 @@ class PPAPI_PROXY_EXPORT ProxyChannel
 
   virtual ~ProxyChannel();
 
-  // Alternative to InitWithChannel()/ConnectChannel() for unit tests that want
-  // to send all messages sent via this channel to the given test sink. The
-  // test sink must outlive this class. In this case, the peer PID will be the
-  // current process ID.
+  // Alternative to InitWithChannel() for unit tests that want to send all
+  // messages sent via this channel to the given test sink. The test sink
+  // must outlive this class. In this case, the peer PID will be the current
+  // process ID.
   void InitWithTestSink(IPC::TestSink* test_sink);
 
   // Shares a file handle (HANDLE / file descriptor) with the remote side. It
@@ -87,14 +87,13 @@ class PPAPI_PROXY_EXPORT ProxyChannel
  protected:
   explicit ProxyChannel();
 
-  // You must call this function before anything else.
+  // You must call this function before anything else. Returns true on success.
   // The delegate pointer must outlive this class, ownership is not
   // transferred.
-  void InitWithChannel(Delegate* delegate, base::ProcessId peer_pid);
-
-  // You must call this function after InitWithChannel(), and after adding any
-  // desired filters to the underlying channel, but before anything else.
-  void ConnectChannel(const IPC::ChannelHandle& channel_handle, bool is_client);
+  virtual bool InitWithChannel(Delegate* delegate,
+                               base::ProcessId peer_pid,
+                               const IPC::ChannelHandle& channel_handle,
+                               bool is_client);
 
   ProxyChannel::Delegate* delegate() const {
     return delegate_;