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

content/renderer/pepper/pepper_broker_impl.cc

 // 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.
 
 #include "content/renderer/pepper/pepper_broker_impl.h"
 
 #include "build/build_config.h"
 #include "content/public/renderer/renderer_restrict_dispatch_group.h"
 #include "content/renderer/pepper/pepper_plugin_delegate_impl.h"
 #include "content/renderer/pepper/pepper_proxy_channel_delegate_impl.h"
@@ skipping 37 matching lines @@
 
 }  // namespace
 
 PepperBrokerDispatcherWrapper::PepperBrokerDispatcherWrapper() {
 }
 
 PepperBrokerDispatcherWrapper::~PepperBrokerDispatcherWrapper() {
 }
 
 bool PepperBrokerDispatcherWrapper::Init(
+    base::ProcessId broker_pid,
     const IPC::ChannelHandle& channel_handle) {
   if (channel_handle.name.empty())
     return false;
 
 #if defined(OS_POSIX)
   DCHECK_NE(-1, channel_handle.socket.fd);
   if (channel_handle.socket.fd == -1)
     return false;
 #endif
 
   dispatcher_delegate_.reset(new PepperProxyChannelDelegateImpl);
   dispatcher_.reset(
       new ppapi::proxy::BrokerHostDispatcher());
 
   if (!dispatcher_->InitBrokerWithChannel(dispatcher_delegate_.get(),
+                                          broker_pid,
                                           channel_handle,
                                           true)) {  // Client.
     dispatcher_.reset();
     dispatcher_delegate_.reset();
     return false;
   }
   dispatcher_->channel()->SetRestrictDispatchChannelGroup(
       content::kRendererRestrictDispatchGroup_Pepper);
   return true;
 }
@@ skipping 84 matching lines @@
       DCHECK(!stopped || HasOneRef());
     }
   }
 
   // Release the reference added in Connect().
   // This must be the last statement because it may delete this object.
   Release();
 }
 
 void PepperBrokerImpl::OnBrokerChannelConnected(
+    base::ProcessId broker_pid,
     const IPC::ChannelHandle& channel_handle) {
   scoped_ptr<PepperBrokerDispatcherWrapper> dispatcher(
       new PepperBrokerDispatcherWrapper);
-  if (!dispatcher->Init(channel_handle)) {
+  if (!dispatcher->Init(broker_pid, channel_handle)) {
     ReportFailureToClients(PP_ERROR_FAILED);
     return;
   }
 
   dispatcher_.reset(dispatcher.release());
 
   // Process all pending channel requests from the plugins.
   for (ClientMap::iterator i = pending_connects_.begin();
        i != pending_connects_.end();) {
     base::WeakPtr<webkit::ppapi::PPB_Broker_Impl>& weak_ptr =
@@ skipping 89 matching lines @@
 
   // TOOD(ddorwin): Change the IPC to asynchronous: Queue an object containing
   // client and plugin_socket.release(), then return.
   // That message handler will then call client->BrokerConnected() with the
   // saved pipe handle.
   // Temporarily, just call back.
   client->BrokerConnected(ppapi::PlatformFileToInt(plugin_handle), result);
 }
 
 }  // namespace content