Make gpu black list work again on Linux

gpu/config/gpu_info_collector_linux.cc

 // Copyright 2014 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_linux.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
+#include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_tokenizer.h"
 #include "base/strings/string_util.h"
 #include "base/trace_event/trace_event.h"
 #include "gpu/config/gpu_info_collector.h"
+#include "gpu/config/gpu_switches.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_surface.h"
 #include "ui/gl/gl_switches.h"
 
 #if defined(USE_LIBPCI)
 #include "library_loaders/libpci.h"
 #endif
 
@@ skipping 84 matching lines @@
       case PCI_CLASS_DISPLAY_OTHER:
       default:
         break;
     }
     if (!is_gpu)
       continue;
     if (device->vendor_id == 0 || device->device_id == 0)
       continue;
 
     GPUInfo::GPUDevice gpu;
-    gpu.vendor_id = device->vendor_id;
-    gpu.device_id = device->device_id;
+
+    base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
+
+    if (command_line->HasSwitch(switches::kGpuTestingVendorId))
+      base::HexStringToUInt(
+          command_line->GetSwitchValueASCII(switches::kGpuTestingVendorId),
+          &gpu.vendor_id);
+    else
+      gpu.vendor_id = device->vendor_id;
+
+    if (command_line->HasSwitch(switches::kGpuTestingDeviceId))
+      base::HexStringToUInt(
+          command_line->GetSwitchValueASCII(switches::kGpuTestingDeviceId),
+          &gpu.device_id);
+    else
+      gpu.device_id = device->device_id;
 
     if (!primary_gpu_identified) {
       primary_gpu_identified = true;
       gpu_info->gpu = gpu;
     } else {
       // TODO(zmo): if there are multiple GPUs, we assume the non Intel
       // one is primary. Revisit this logic because we actually don't know
       // which GPU we are using at this point.
       if (gpu_info->gpu.vendor_id == kVendorIDIntel &&
           gpu.vendor_id != kVendorIDIntel) {
@@ skipping 130 matching lines @@
   gpu_info->driver_version = driver_version;
   return kCollectInfoSuccess;
 }
 
 void MergeGPUInfo(GPUInfo* basic_gpu_info,
                   const GPUInfo& context_gpu_info) {
   MergeGPUInfoGL(basic_gpu_info, context_gpu_info);
 }
 
 }  // namespace gpu