Set the GPU info using the crash key system instead of platform-specific mechanisms.

chrome/common/child_process_logging_win.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 "chrome/common/child_process_logging.h"
 
 #include <windows.h>
 
 #include "base/command_line.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"

[Lei Zhang, 2013/08/26 21:41:01]

remove

[Robert Sesek, 2013/08/27 15:34:52]

Done.

 #include "base/strings/utf_string_conversions.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/crash_keys.h"
 #include "chrome/common/metrics/variations/variations_util.h"
 #include "chrome/installer/util/google_update_settings.h"
-#include "gpu/config/gpu_info.h"
 
 namespace child_process_logging {
 
 namespace {
 
 // exported in breakpad_win.cc: void __declspec(dllexport) __cdecl SetClientId.
 typedef void (__cdecl *MainSetClientId)(const wchar_t*);
 
 // exported in breakpad_win.cc:
 //   void __declspec(dllexport) __cdecl SetNumberOfExtensions.
 typedef void (__cdecl *MainSetNumberOfExtensions)(int);
 
 // exported in breakpad_win.cc:
 // void __declspec(dllexport) __cdecl SetExtensionID.
 typedef void (__cdecl *MainSetExtensionID)(size_t, const wchar_t*);
 
-// exported in breakpad_win.cc: void __declspec(dllexport) __cdecl SetGpuInfo.
-typedef void (__cdecl *MainSetGpuInfo)(const wchar_t*, const wchar_t*,
-                                       const wchar_t*, const wchar_t*,
-                                       const wchar_t*);
-
 // exported in breakpad_win.cc:
 //     void __declspec(dllexport) __cdecl SetPrinterInfo.
 typedef void (__cdecl *MainSetPrinterInfo)(const wchar_t*);
 
 // exported in breakpad_win.cc:
 //   void __declspec(dllexport) __cdecl SetNumberOfViews.
 typedef void (__cdecl *MainSetNumberOfViews)(int);
 
 // exported in breakpad_win.cc:
 //   void __declspec(dllexport) __cdecl SetCommandLine2
@@ skipping 90 matching lines @@
   for (size_t i = 0; i < kMaxReportedActiveExtensions; ++i) {
     if (iter != extension_ids.end()) {
       (set_extension_id)(i, ASCIIToWide(iter->c_str()).c_str());
       ++iter;
     } else {
       (set_extension_id)(i, L"");
     }
   }
 }
 
-void SetGpuInfo(const gpu::GPUInfo& gpu_info) {
-  static MainSetGpuInfo set_gpu_info = NULL;
-  // note: benign race condition on set_gpu_info.
-  if (!set_gpu_info) {
-    HMODULE exe_module = GetModuleHandle(chrome::kBrowserProcessExecutableName);
-    if (!exe_module)
-      return;
-    set_gpu_info = reinterpret_cast<MainSetGpuInfo>(
-        GetProcAddress(exe_module, "SetGpuInfo"));
-    if (!set_gpu_info)
-      return;
-  }
-  (set_gpu_info)(
-      base::StringPrintf(L"0x%04x", gpu_info.gpu.vendor_id).c_str(),
-      base::StringPrintf(L"0x%04x", gpu_info.gpu.device_id).c_str(),
-      UTF8ToUTF16(gpu_info.driver_version).c_str(),
-      UTF8ToUTF16(gpu_info.pixel_shader_version).c_str(),
-      UTF8ToUTF16(gpu_info.vertex_shader_version).c_str());
-}
-
 void SetPrinterInfo(const char* printer_info) {
   static MainSetPrinterInfo set_printer_info = NULL;
   // note: benign race condition on set_printer_info.
   if (!set_printer_info) {
     HMODULE exe_module = GetModuleHandle(chrome::kBrowserProcessExecutableName);
     if (!exe_module)
       return;
     set_printer_info = reinterpret_cast<MainSetPrinterInfo>(
         GetProcAddress(exe_module, "SetPrinterInfo"));
     if (!set_printer_info)
@@ skipping 102 matching lines @@
 void Init() {
   // Note: on other platforms, this is set up during Breakpad initialization,
   // in ChromeBreakpadClient. But on Windows, that is before the DLL module is
   // loaded, which is a prerequisite of the crash key system.
   crash_keys::RegisterChromeCrashKeys();
   base::debug::SetCrashKeyReportingFunctions(
       &SetCrashKeyValueTrampoline, &ClearCrashKeyValueTrampoline);
 }
 
 }  // namespace child_process_logging