Fixed running gpu process with kOverrideUseGLWithOSMesaForTests.

content/browser/gpu/gpu_data_manager_impl_private.cc

 // Copyright (c) 2013 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/gpu_data_manager_impl_private.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 509 matching lines @@
     return;
   }
 
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kSkipGpuDataLoading)) {
     RunPostInitTasks();
     return;
   }
 
   gpu::GPUInfo gpu_info;
-  if (command_line->GetSwitchValueASCII(switches::kUseGL) ==
-      gl::kGLImplementationOSMesaName) {
+  const bool force_osmesa =
+      (command_line->GetSwitchValueASCII(switches::kUseGL) ==
+       gl::kGLImplementationOSMesaName) ||
+      (!command_line->HasSwitch(switches::kUseGL) &&

[danakj, 2016/06/23 20:01:13]

Ideally we never have both kUseGL and kOverrideUseGL, perhaps you can DCHECK
that instead? It may be some tests are setting it though since I last looked at
this and did the KOverrideUseGL thing, and we'd need to fix them. I thought I
was DCHECKing that kUseGL wasn't present in BrowserTestBase but I don't see it
right now.

LGTM otherwise.

+       command_line->HasSwitch(switches::kOverrideUseGLWithOSMesaForTests));
+  if (force_osmesa) {
     // If using the OSMesa GL implementation, use fake vendor and device ids to
     // make sure it never gets blacklisted. This is better than simply
     // cancelling GPUInfo gathering as it allows us to proceed with loading the
     // blacklist below which may have non-device specific entries we want to
     // apply anyways (e.g., OS version blacklisting).
     gpu_info.gpu.vendor_id = 0xffff;
     gpu_info.gpu.device_id = 0xffff;
 
     // Also declare the driver_vendor to be osmesa to be able to specify
     // exceptions based on driver_vendor==osmesa for some blacklist rules.
@@ skipping 742 matching lines @@
   gpu_info_.context_info_state = gpu::kCollectInfoFatalFailure;
 #if defined(OS_WIN)
   gpu_info_.dx_diagnostics_info_state = gpu::kCollectInfoFatalFailure;
 #endif
   complete_gpu_info_already_requested_ = true;
   // Some observers might be waiting.
   NotifyGpuInfoUpdate();
 }
 
 }  // namespace content