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

chrome/app/breakpad_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/app/breakpad_win.h"
 
 #include <shellapi.h>
 #include <tchar.h>
 #include <userenv.h>
 #include <windows.h>
@@ skipping 86 matching lines @@
 EXCEPTION_RECORD g_surrogate_exception_record = {0};
 CONTEXT g_surrogate_context = {0};
 
 typedef NTSTATUS (WINAPI* NtTerminateProcessPtr)(HANDLE ProcessHandle,
                                                  NTSTATUS ExitStatus);
 char* g_real_terminate_process_stub = NULL;
 
 static size_t g_num_of_extensions_offset = 0;
 static size_t g_extension_ids_offset = 0;
 static size_t g_client_id_offset = 0;
-static size_t g_gpu_info_offset = 0;
 static size_t g_printer_info_offset = 0;
 static size_t g_num_of_views_offset = 0;
 static size_t g_num_switches_offset = 0;
 static size_t g_switches_offset = 0;
 static size_t g_dynamic_keys_offset = 0;
 typedef std::map<std::wstring, google_breakpad::CustomInfoEntry*>
     DynamicEntriesMap;
 DynamicEntriesMap* g_dynamic_entries = NULL;
 // Allow for 128 entries. POSIX uses 64 entries of 256 bytes, so Windows needs
 // 256 entries of 64 bytes to match. See CustomInfoEntry::kValueMaxLength in
@@ skipping 325 matching lines @@
   g_custom_entries->push_back(
       google_breakpad::CustomInfoEntry(L"num-extensions", L"N/A"));
 
   g_extension_ids_offset = g_custom_entries->size();
   // one-based index for the name suffix.
   for (int i = 1; i <= kMaxReportedActiveExtensions; ++i) {
     g_custom_entries->push_back(google_breakpad::CustomInfoEntry(
         base::StringPrintf(L"extension-%i", i).c_str(), L""));
   }
 
-  // Add empty values for the gpu_info. We'll put the actual values when we
-  // collect them at this location.
-  g_gpu_info_offset = g_custom_entries->size();
-  static const wchar_t* const kGpuEntries[] = {
-    L"gpu-venid",
-    L"gpu-devid",
-    L"gpu-driver",
-    L"gpu-psver",
-    L"gpu-vsver",
-  };
-  for (size_t i = 0; i < arraysize(kGpuEntries); ++i) {
-    g_custom_entries->push_back(
-        google_breakpad::CustomInfoEntry(kGpuEntries[i], L""));
-  }
-
   // Add empty values for the prn_info-*. We'll put the actual values when we
   // collect them at this location.
   g_printer_info_offset = g_custom_entries->size();
   // one-based index for the name suffix.
   for (size_t i = 1; i <= kMaxReportedPrinterRecords; ++i) {
     g_custom_entries->push_back(
         google_breakpad::CustomInfoEntry(
             base::StringPrintf(L"prn-info-%d", i).c_str(), L""));
   }
 
@@ skipping 201 matching lines @@
   DCHECK(index < kMaxReportedActiveExtensions);
 
   if (!g_custom_entries)
     return;
 
   base::wcslcpy((*g_custom_entries)[g_extension_ids_offset + index].value,
                 id,
                 google_breakpad::CustomInfoEntry::kValueMaxLength);
 }
 
-extern "C" void __declspec(dllexport) __cdecl SetGpuInfo(
-    const wchar_t* vendor_id, const wchar_t* device_id,
-    const wchar_t* driver_version, const wchar_t* pixel_shader_version,
-    const wchar_t* vertex_shader_version) {
-  if (!g_custom_entries)
-    return;
-
-  const wchar_t* info[] = {
-    vendor_id,
-    device_id,
-    driver_version,
-    pixel_shader_version,
-    vertex_shader_version
-  };
-
-  for (size_t i = 0; i < arraysize(info); ++i) {
-    base::wcslcpy((*g_custom_entries)[g_gpu_info_offset + i].value,
-                  info[i],
-                  google_breakpad::CustomInfoEntry::kValueMaxLength);
-  }
-}
-
 extern "C" void __declspec(dllexport) __cdecl SetPrinterInfo(
     const wchar_t* printer_info) {
   if (!g_custom_entries)
     return;
   std::vector<string16> info;
   base::SplitString(printer_info, L';', &info);
   DCHECK_LE(info.size(), kMaxReportedPrinterRecords);
   info.resize(kMaxReportedPrinterRecords);
   for (size_t i = 0; i < info.size(); ++i) {
     base::wcslcpy((*g_custom_entries)[g_printer_info_offset + i].value,
@@ skipping 372 matching lines @@
   previous_filter = SetUnhandledExceptionFilter(filter);
 }
 
 void StringVectorToCStringVector(const std::vector<std::wstring>& wstrings,
                                  std::vector<const wchar_t*>* cstrings) {
   cstrings->clear();
   cstrings->reserve(wstrings.size());
   for (size_t i = 0; i < wstrings.size(); ++i)
     cstrings->push_back(wstrings[i].c_str());
 }