Make gpu black list work again on Linux

content/browser/devtools/protocol/system_info_handler.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 "content/browser/devtools/protocol/system_info_handler.h"
 
 #include <stdint.h>
 #include <utility>
 
 #include "base/bind.h"
+#include "base/command_line.h"
 #include "content/browser/gpu/compositor_util.h"
 #include "content/public/browser/gpu_data_manager.h"
+#include "gpu/config/gpu_feature_type.h"
 #include "gpu/config/gpu_info.h"
+#include "gpu/config/gpu_switches.h"
 
 namespace content {
 namespace devtools {
 namespace system_info {
 
 namespace {
 
 using Response = DevToolsProtocolClient::Response;
 
 // Give the GPU process a few seconds to provide GPU info.
@@ skipping 118 matching lines @@
 SystemInfoHandler::~SystemInfoHandler() {
 }
 
 void SystemInfoHandler::SetClient(scoped_ptr<Client> client) {
   client_.swap(client);
 }
 
 Response SystemInfoHandler::GetInfo(DevToolsCommandId command_id) {
   std::string reason;
   if (!GpuDataManager::GetInstance()->GpuAccessAllowed(&reason) ||
-      GpuDataManager::GetInstance()->IsEssentialGpuInfoAvailable()) {
+      GpuDataManager::GetInstance()->IsEssentialGpuInfoAvailable() ||
+      base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kGpuTestingNoCompleteInfoCollection)) {
     // The GpuDataManager already has all of the information needed to make
     // GPU-based blacklisting decisions. Post a task to give it to the
     // client asynchronously.
     //
     // Waiting for complete GPU info in the if-test above seems to
     // frequently hit internal timeouts in the launching of the unsandboxed
     // GPU process in debug builds on Windows.
     BrowserThread::PostTask(
         BrowserThread::UI,
         FROM_HERE,
@@ skipping 65 matching lines @@
     SendGetInfoResponse(command_id);
     // For the time being we want to know about this event in the test logs.
     LOG(ERROR) << "SystemInfoHandler: request for GPU info timed out!"
                << " Most recent info sent.";
   }
 }
 
 }  // namespace system_info
 }  // namespace devtools
 }  // namespace content