Fix machine_model behaviors in gpu blacklist.

gpu/config/gpu_info.cc

 // Copyright (c) 2012 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.h"
 
 namespace {
 
 void EnumerateGPUDevice(gpu::GPUInfo::Enumerator* enumerator,
                         const gpu::GPUInfo::GPUDevice& device) {
@@ skipping 42 matching lines @@
     bool lenovo_dcute;
     Version display_link_version;
     GPUDevice gpu;
     std::vector<GPUDevice> secondary_gpus;
     uint64 adapter_luid;
     std::string driver_vendor;
     std::string driver_version;
     std::string driver_date;
     std::string pixel_shader_version;
     std::string vertex_shader_version;
-    std::string machine_model;
+    std::string machine_model_name;
+    std::string machine_model_version;
     std::string gl_version;
     std::string gl_version_string;
     std::string gl_vendor;
     std::string gl_renderer;
     std::string gl_extensions;
     std::string gl_ws_vendor;
     std::string gl_ws_version;
     std::string gl_ws_extensions;
     uint32 gl_reset_notification_strategy;
     bool can_lose_context;
     GpuPerformanceStats performance_stats;
     bool software_rendering;
     bool direct_rendering;
     bool sandboxed;
 #if defined(OS_WIN)
     DxDiagNode dx_diagnostics;
 #endif
   };
 
   // If this assert fails then most likely something below needs to be updated.
   // Note that this assert is only approximate. If a new field is added to
   // GPUInfo which fits within the current padding then it will not be caught.
   COMPILE_ASSERT(
       sizeof(GPUInfo) == sizeof(GPUInfoKnownFields),
       Fields_Have_Changed_In_GPUInfo_So_Update_Below);
 
   // Required fields (according to DevTools protocol) first.
-  enumerator->AddString("machineModel", machine_model);
+  enumerator->AddString("machineModelName", machine_model_name);
+  enumerator->AddString("machineModelVersion", machine_model_version);
   EnumerateGPUDevice(enumerator, gpu);
   for (size_t ii = 0; ii < secondary_gpus.size(); ++ii) {
     EnumerateGPUDevice(enumerator, secondary_gpus[ii]);
   }
 
   enumerator->BeginAuxAttributes();
   enumerator->AddBool("finalized", finalized);
   enumerator->AddTimeDeltaInSecondsF("initializationTime",
                                      initialization_time);
   enumerator->AddBool("optimus", optimus);
@@ skipping 23 matching lines @@
   enumerator->AddBool("can_lose_context", can_lose_context);
   // TODO(kbr): add performance_stats.
   enumerator->AddBool("softwareRendering", software_rendering);
   enumerator->AddBool("directRendering", direct_rendering);
   enumerator->AddBool("sandboxed", sandboxed);
   // TODO(kbr): add dx_diagnostics on Windows.
   enumerator->EndAuxAttributes();
 }
 
 }  // namespace gpu