Add GL strings to CastSysInfo interface and use to configure GPU

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 "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
@@ skipping 471 matching lines @@
 void GpuDataManagerImplPrivate::GetGLStrings(std::string* gl_vendor,
                                              std::string* gl_renderer,
                                              std::string* gl_version) {
   DCHECK(gl_vendor && gl_renderer && gl_version);
 
   *gl_vendor = gpu_info_.gl_vendor;
   *gl_renderer = gpu_info_.gl_renderer;
   *gl_version = gpu_info_.gl_version;
 }
 
+void GpuDataManagerImplPrivate::SetGpuDeviceName(const std::string& vendor,
+                                                 const std::string& device) {
+  if (!gpu_info_.gpu.vendor_string.empty() ||
+      !gpu_info_.gpu.device_string.empty())
+    return;
+
+  gpu_info_.gpu.vendor_string = vendor;
+  gpu_info_.gpu.device_string = device;
+}
+
 void GpuDataManagerImplPrivate::Initialize() {
   TRACE_EVENT0("startup", "GpuDataManagerImpl::Initialize");
   if (finalized_) {
     DVLOG(0) << "GpuDataManagerImpl marked as finalized; skipping Initialize";
     return;
   }
 
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kSkipGpuDataLoading))
     return;
@@ skipping 169 matching lines @@
   // device_id, driver_vendor, driver_version for deciding whether we need to
   // collect full info (on Linux) and for crash reporting purpose.
   command_line->AppendSwitchASCII(switches::kGpuVendorID,
       base::StringPrintf("0x%04x", gpu_info_.gpu.vendor_id));
   command_line->AppendSwitchASCII(switches::kGpuDeviceID,
       base::StringPrintf("0x%04x", gpu_info_.gpu.device_id));
   command_line->AppendSwitchASCII(switches::kGpuDriverVendor,
       gpu_info_.driver_vendor);
   command_line->AppendSwitchASCII(switches::kGpuDriverVersion,
       gpu_info_.driver_version);
+  if (!gpu_info_.gpu.vendor_string.empty())
+    command_line->AppendSwitchASCII(switches::kGpuVendorString,
+                                    gpu_info_.gpu.vendor_string);
+  if (!gpu_info_.gpu.device_string.empty())
+    command_line->AppendSwitchASCII(switches::kGpuDeviceString,
+                                    gpu_info_.gpu.device_string);
 
   if (ShouldUseWarp())
     command_line->AppendSwitch(switches::kUseWarp);
 }
 
 void GpuDataManagerImplPrivate::AppendPluginCommandLine(
     base::CommandLine* command_line) const {
   DCHECK(command_line);
 
 #if defined(OS_MACOSX)
@@ skipping 274 matching lines @@
   }
   if (!gpu_driver_bug_list_json.empty()) {
     gpu_driver_bug_list_.reset(gpu::GpuDriverBugList::Create());
     if (log_gpu_control_list_decisions)
       gpu_driver_bug_list_->enable_control_list_logging("gpu_driver_bug_list");
     bool success = gpu_driver_bug_list_->LoadList(
         gpu_driver_bug_list_json, gpu::GpuControlList::kCurrentOsOnly);
     DCHECK(success);
   }
 
+  // Don't lose gpu vendor, device if set externally
+  std::string gpu_vendor_string = gpu_info_.gpu.vendor_string;
+  std::string gpu_device_string = gpu_info_.gpu.device_string;
+
   gpu_info_ = gpu_info;
+
+  if (!gpu_vendor_string.empty())
+    gpu_info_.gpu.vendor_string = gpu_vendor_string;
+  if (!gpu_device_string.empty())
+    gpu_info_.gpu.device_string = gpu_device_string;
+
   UpdateGpuInfo(gpu_info);
   UpdateGpuSwitchingManager(gpu_info);
   UpdatePreliminaryBlacklistedFeatures();
 }
 
 void GpuDataManagerImplPrivate::UpdateBlacklistedFeatures(
     const std::set<int>& features) {
   blacklisted_features_ = features;
 
   // Force disable using the GPU for these features, even if they would
@@ skipping 167 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