Fix machine_model behaviors in gpu blacklist.

content/browser/devtools/devtools_system_info_handler.cc

 // Copyright 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/devtools/devtools_system_info_handler.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/values.h"
 #include "content/browser/devtools/devtools_protocol_constants.h"
 #include "content/browser/gpu/compositor_util.h"
 #include "content/browser/gpu/gpu_data_manager_impl.h"
 #include "gpu/config/gpu_info.h"
 
 namespace content {
 
 namespace {
 
 const char kAuxAttributes[] = "auxAttributes";
 const char kDeviceId[] = "deviceId";
 const char kDeviceString[] = "deviceString";
 const char kDevices[] = "devices";
 const char kDriverBugWorkarounds[] = "driverBugWorkarounds";
 const char kFeatureStatus[] = "featureStatus";
 const char kGPU[] = "gpu";
 const char kModelName[] = "modelName";
+const char kModelVersion[] = "modelVersion";
 const char kVendorId[] = "vendorId";
 const char kVendorString[] = "vendorString";
 
 class AuxGPUInfoEnumerator : public gpu::GPUInfo::Enumerator {
  public:
   AuxGPUInfoEnumerator(base::DictionaryValue* dictionary)
       : dictionary_(dictionary),
         in_aux_attributes_(false) { }
 
   virtual void AddInt64(const char* name, int64 value) OVERRIDE {
@@ skipping 78 matching lines @@
   base::DictionaryValue* aux_attributes = new base::DictionaryValue;
   AuxGPUInfoEnumerator enumerator(aux_attributes);
   gpu_info.EnumerateFields(&enumerator);
   gpu_dict->Set(kAuxAttributes, aux_attributes);
 
   gpu_dict->Set(kFeatureStatus,  GetFeatureStatus());
 
   gpu_dict->Set(kDriverBugWorkarounds, GetDriverBugWorkarounds());
 
   base::DictionaryValue* system_dict = new base::DictionaryValue;
-  system_dict->SetString(kModelName, gpu_info.machine_model);
+  system_dict->SetString(kModelName, gpu_info.machine_model_name);
+  system_dict->SetString(kModelVersion, gpu_info.machine_model_version);
   system_dict->Set(kGPU, gpu_dict);
   return command->SuccessResponse(system_dict);
 }
 
 }  // namespace content