Refactor and improve gpu_info_collector: collect information on linux;...

chrome/browser/dom_ui/gpu_internals_ui.cc

 // Copyright (c) 2010 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 "chrome/browser/dom_ui/gpu_internals_ui.h"
 
 #include <algorithm>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 263 matching lines @@
 
 DictionaryValue* GpuInfoToDict(const GPUInfo& gpu_info) {
   ListValue* basic_info = new ListValue();
   basic_info->Append(NewDescriptionValuePair("Initialization time",
       base::Int64ToString(gpu_info.initialization_time().InMilliseconds())));
   basic_info->Append(NewDescriptionValuePair("Vendor Id",
       base::StringPrintf("0x%04x", gpu_info.vendor_id())));
   basic_info->Append(NewDescriptionValuePair("Device Id",
       base::StringPrintf("0x%04x", gpu_info.device_id())));
   basic_info->Append(NewDescriptionValuePair("Driver version",
-      WideToASCII(gpu_info.driver_version()).c_str()));
+      gpu_info.driver_version()));
   basic_info->Append(NewDescriptionValuePair("Pixel shader version",
       VersionNumberToString(gpu_info.pixel_shader_version())));
   basic_info->Append(NewDescriptionValuePair("Vertex shader version",
       VersionNumberToString(gpu_info.vertex_shader_version())));
   basic_info->Append(NewDescriptionValuePair("GL version",
       VersionNumberToString(gpu_info.gl_version())));
 
   DictionaryValue* info = new DictionaryValue();
   info->Set("basic_info", basic_info);
 
@@ skipping 46 matching lines @@
 
   // Set up the chrome://gpu/ source.
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       NewRunnableMethod(
           ChromeURLDataManager::GetInstance(),
           &ChromeURLDataManager::AddDataSource,
           make_scoped_refptr(html_source)));
 }