Use an explicit PID for duplicating Pepper handles rather than the Channel's.

content/renderer/pepper/pepper_broker_impl.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_RENDERER_PEPPER_PEPPER_BROKER_IMPL_H_
 #define CONTENT_RENDERER_PEPPER_PEPPER_BROKER_IMPL_H_
 
 #include "base/memory/ref_counted.h"
+#include "base/process.h"
 #include "content/common/content_export.h"
 #include "ppapi/proxy/proxy_channel.h"
 #include "webkit/plugins/ppapi/plugin_delegate.h"
 #include "webkit/plugins/ppapi/ppb_broker_impl.h"
 
 namespace IPC {
 struct ChannelHandle;
 }
 
 namespace ppapi {
@@ skipping 11 matching lines @@
 namespace content {
 
 class PepperPluginDelegateImpl;
 
 // This object is NOT thread-safe.
 class CONTENT_EXPORT PepperBrokerDispatcherWrapper {
  public:
   PepperBrokerDispatcherWrapper();
   ~PepperBrokerDispatcherWrapper();
 
-  bool Init(const IPC::ChannelHandle& channel_handle);
+  bool Init(base::ProcessId broker_pid,
+            const IPC::ChannelHandle& channel_handle);
 
   int32_t SendHandleToBroker(PP_Instance instance,
                              base::SyncSocket::Handle handle);
 
  private:
   scoped_ptr<ppapi::proxy::BrokerDispatcher> dispatcher_;
   scoped_ptr<ppapi::proxy::ProxyChannel::Delegate> dispatcher_delegate_;
 };
 
 class PepperBrokerImpl : public webkit::ppapi::PluginDelegate::Broker,
                          public base::RefCountedThreadSafe<PepperBrokerImpl>{
  public:
   PepperBrokerImpl(webkit::ppapi::PluginModule* plugin_module,
                    PepperPluginDelegateImpl* delegate_);
 
   // webkit::ppapi::PluginDelegate::Broker implementation.
   virtual void Disconnect(webkit::ppapi::PPB_Broker_Impl* client) OVERRIDE;
 
   // Adds a pending connection to the broker. Balances out Disconnect() calls.
   void AddPendingConnect(webkit::ppapi::PPB_Broker_Impl* client);
 
   // Called when the channel to the broker has been established.
-  void OnBrokerChannelConnected(const IPC::ChannelHandle& channel_handle);
+  void OnBrokerChannelConnected(base::ProcessId broker_pid,
+                                const IPC::ChannelHandle& channel_handle);
 
   // Called when we know whether permission to access the PPAPI broker was
   // granted.
   void OnBrokerPermissionResult(webkit::ppapi::PPB_Broker_Impl* client,
                                 bool result);
 
  private:
   friend class base::RefCountedThreadSafe<PepperBrokerImpl>;
 
   struct PendingConnection {
@@ skipping 26 matching lines @@
   webkit::ppapi::PluginModule* plugin_module_;
 
   base::WeakPtr<PepperPluginDelegateImpl> delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(PepperBrokerImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_PEPPER_PEPPER_BROKER_IMPL_H_