Add DriverBugWorkaroundsInGpuProcessPage to gpu_process_test.py

gpu/config/gpu_info_collector.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 "gpu/config/gpu_info_collector.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <string>
@@ skipping 158 matching lines @@
 
   IdentifyActiveGPU(gpu_info);
   return CollectDriverInfoGL(gpu_info);
 }
 
 void MergeGPUInfoGL(GPUInfo* basic_gpu_info,
                     const GPUInfo& context_gpu_info) {
   DCHECK(basic_gpu_info);
   // Copy over GPUs because which one is active could change.
   basic_gpu_info->gpu = context_gpu_info.gpu;
-  basic_gpu_info->secondary_gpus = context_gpu_info.secondary_gpus;
+
+  // TODO(j.isorce): Currently the GPU process does not know about any secondary
+  // gpu. So for now make sure to keep them when receiving GpuInfo from the GPU
+  // process through GpuHostMsg_GraphicsInfoCollected.
+  if (context_gpu_info.secondary_gpus.size() > 0)

[Ken Russell (switch to Gerrit), 2016/04/05 03:31:24]

This change is concerning. If it's only needed for testing purposes then the
caller should pass down a flag indicating that, and the behavior should only
change in that situation.

+    basic_gpu_info->secondary_gpus = context_gpu_info.secondary_gpus;
 
   basic_gpu_info->gl_renderer = context_gpu_info.gl_renderer;
   basic_gpu_info->gl_vendor = context_gpu_info.gl_vendor;
   basic_gpu_info->gl_version = context_gpu_info.gl_version;
   basic_gpu_info->gl_extensions = context_gpu_info.gl_extensions;
   basic_gpu_info->pixel_shader_version =
       context_gpu_info.pixel_shader_version;
   basic_gpu_info->vertex_shader_version =
       context_gpu_info.vertex_shader_version;
   basic_gpu_info->max_msaa_samples =
@@ skipping 75 matching lines @@
   for (size_t ii = 0; ii < gpu_info->secondary_gpus.size(); ++ii) {
     if (active_vendor_id == gpu_info->secondary_gpus[ii].vendor_id) {
       gpu_info->secondary_gpus[ii].active = true;
       return;
     }
   }
 }
 
 }  // namespace gpu