Convert plugin and GPU process to brokered handle duplication.

content/browser/gpu/browser_gpu_channel_host_factory.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/browser/gpu/browser_gpu_channel_host_factory.h"
 
 #include "base/bind.h"
 #include "content/browser/gpu/gpu_data_manager_impl.h"
 #include "content/browser/gpu/gpu_process_host.h"
 #include "content/browser/gpu/gpu_surface_tracker.h"
@@ skipping 135 matching lines @@
       gpu_client_id_,
       true,
       base::Bind(&BrowserGpuChannelHostFactory::GpuChannelEstablishedOnIO,
                  request));
 }
 
 // static
 void BrowserGpuChannelHostFactory::GpuChannelEstablishedOnIO(
     EstablishRequest* request,
     const IPC::ChannelHandle& channel_handle,
-    base::ProcessHandle gpu_process_handle,
     const GPUInfo& gpu_info) {
   request->channel_handle = channel_handle;
-  request->gpu_process_handle = gpu_process_handle;
   request->gpu_info = gpu_info;
   request->event.Signal();
 }
 
 GpuChannelHost* BrowserGpuChannelHostFactory::EstablishGpuChannelSync(
     CauseForGpuLaunch cause_for_gpu_launch) {
   if (gpu_channel_.get()) {
     // Recreate the channel if it has been lost.
     if (gpu_channel_->state() == GpuChannelHost::kLost)
       gpu_channel_ = NULL;
@@ skipping 14 matching lines @@
   // We're blocking the UI thread, which is generally undesirable.
   // In this case we need to wait for this before we can show any UI /anyway/,
   // so it won't cause additional jank.
   // TODO(piman): Make this asynchronous.
   request.event.Wait();
 
   if (request.channel_handle.name.empty() ||
       request.gpu_process_handle == base::kNullProcessHandle)
     return NULL;
 
-  base::ProcessHandle browser_process_for_gpu;
-#if defined(OS_WIN)
-  // Create a process handle that the GPU process can use to access our handles.
-  DuplicateHandle(base::GetCurrentProcessHandle(),
-      base::GetCurrentProcessHandle(),
-      request.gpu_process_handle,
-      &browser_process_for_gpu,
-      PROCESS_DUP_HANDLE,
-      FALSE,
-      0);
-#else
-  browser_process_for_gpu = base::GetCurrentProcessHandle();
-#endif
-
-  gpu_channel_ = new GpuChannelHost(this, gpu_host_id_, gpu_client_id_);

[apatrick_chromium, 2012/04/09 18:40:58]

gpu_host_id_ is not a PID. I think a mistake has been made in some code
reorganization in the past. I will have to debug this to understand why
gpu_host_id_ is being interpreted as a PID in GpuChannelHost. gpu_host_id_ is
just an int that uniquely identifies a given GpuProcessHost instance.

[jschuh, 2012/04/10 19:02:12]

Okay, I plumbed it back in. Oddly enough, it seems to have no impact on the
tests.

+  gpu_channel_ = new GpuChannelHost(this, gpu_client_id_);
   gpu_channel_->set_gpu_info(request.gpu_info);
   content::GetContentClient()->SetGpuInfo(request.gpu_info);
 
   // Connect to the GPU process if a channel name was received.
-  gpu_channel_->Connect(request.channel_handle, browser_process_for_gpu);
+  gpu_channel_->Connect(request.channel_handle);
 
   return gpu_channel_.get();
 }
 
 }  // namespace content