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

chrome/common/child_process_logging_win.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/common/child_process_logging.h"
 
 #include <windows.h>
 
 #include "base/string_util.h"
 #include "base/string_number_conversions.h"
@@ skipping 121 matching lines @@
     if (!exe_module)
       return;
     set_gpu_info = reinterpret_cast<MainSetGpuInfo>(
         GetProcAddress(exe_module, "SetGpuInfo"));
     if (!set_gpu_info)
       return;
   }
   (set_gpu_info)(
       base::UintToString16(gpu_info.vendor_id()).c_str(),
       base::UintToString16(gpu_info.device_id()).c_str(),
-      gpu_info.driver_version().c_str(),
+      UTF8ToUTF16(gpu_info.driver_version()).c_str(),
       base::UintToString16(gpu_info.pixel_shader_version()).c_str(),
       base::UintToString16(gpu_info.vertex_shader_version()).c_str());
 }
 
 void SetNumberOfViews(int number_of_views) {
   static MainSetNumberOfViews set_number_of_views = NULL;
   if (!set_number_of_views) {
     HMODULE exe_module = GetModuleHandle(chrome::kBrowserProcessExecutableName);
     if (!exe_module)
       return;
     set_number_of_views = reinterpret_cast<MainSetNumberOfViews>(
         GetProcAddress(exe_module, "SetNumberOfViews"));
     if (!set_number_of_views)
       return;
   }
   (set_number_of_views)(number_of_views);
 }
 
 }  // namespace child_process_logging