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 116 matching lines @@
 }
 
 SystemInfoHandler::~SystemInfoHandler() {
 }
 
 void SystemInfoHandler::SetClient(scoped_ptr<Client> client) {
   client_.swap(client);
 }
 
 Response SystemInfoHandler::GetInfo(DevToolsCommandId command_id) {
+  bool skip_request_collection = false;
+#if defined(OS_LINUX)
+  skip_request_collection = base::CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kGpuTestingNoCompleteInfoCollection);
+  for (int feature = 0; feature < gpu::NUMBER_OF_GPU_FEATURE_TYPES; ++feature) {

[Zhenyao Mo, 2016/02/02 22:22:34]

I don't think this for-loop logic is necessary.  It's too tuned to the test.
Also, you don't need to limit the commandline switch to linux.  Semantically
when it's passed it, it should be honored everywhere.

Also, you should also honor this commandline switch in
gpu_data_manager_impl_private.cc.  Even it's not making a difference for this
CL's test, it's better we make it always semantically correct, so no confusion
and surprise in the future.

+    skip_request_collection &=
+        GpuDataManager::GetInstance()->IsFeatureBlacklisted(feature);
+    if (!skip_request_collection)
+      break;
+  }
+#endif
+
   std::string reason;
   if (!GpuDataManager::GetInstance()->GpuAccessAllowed(&reason) ||
-      GpuDataManager::GetInstance()->IsEssentialGpuInfoAvailable()) {
+      GpuDataManager::GetInstance()->IsEssentialGpuInfoAvailable() ||
+      skip_request_collection) {
     // 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