Revert of gpu: Add a util method to set crash-keys from a GPUInfo.

chrome/common/crash_keys.cc

 // Copyright (c) 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 "chrome/common/crash_keys.h"
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/format_macros.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
 #include "chrome/common/chrome_switches.h"
 #include "components/flags_ui/flags_ui_switches.h"
 #include "content/public/common/content_switches.h"
-#include "gpu/config/gpu_util.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/common/chrome_switches.h"
 #include "gpu/command_buffer/service/gpu_switches.h"
 #include "ui/gl/gl_switches.h"
 #endif
 
 namespace crash_keys {
 
 const char kActiveURL[] = "url-chunk";
 
 const char kFontKeyName[] = "font_key_name";
 
 const char kExtensionID[] = "extension-%" PRIuS;
 const char kNumExtensionsCount[] = "num-extensions";
 
 const char kShutdownType[] = "shutdown-type";
 const char kBrowserUnpinTrace[] = "browser-unpin-trace";
 
+#if !defined(OS_ANDROID)
+const char kGPUVendorID[] = "gpu-venid";
+const char kGPUDeviceID[] = "gpu-devid";
+#endif
+const char kGPUDriverVersion[] = "gpu-driver";
+const char kGPUPixelShaderVersion[] = "gpu-psver";
+const char kGPUVertexShaderVersion[] = "gpu-vsver";
+#if defined(OS_MACOSX)
+const char kGPUGLVersion[] = "gpu-glver";
+#elif defined(OS_POSIX)
+const char kGPUVendor[] = "gpu-gl-vendor";
+const char kGPURenderer[] = "gpu-gl-renderer";
+#endif
+
 #if defined(OS_WIN)
 const char kHungRendererOutstandingAckCount[] = "hung-outstanding-acks";
 const char kHungRendererOutstandingEventType[] = "hung-outstanding-event-type";
 const char kHungRendererLastEventType[] = "hung-last-event-type";
 const char kHungRendererReason[] = "hung-reason";
 
 const char kThirdPartyModulesLoaded[] = "third-party-modules-loaded";
 const char kThirdPartyModulesNotLoaded[] = "third-party-modules-not-loaded";
 
 const char kIsEnterpriseManaged[] = "is-enterprise-managed";
@@ skipping 50 matching lines @@
     {kClientId, kSmallSize},
 #endif
     {kChannel, kSmallSize},
     {kActiveURL, kLargeSize},
     {kNumVariations, kSmallSize},
     {kVariations, kHugeSize},
     {kNumExtensionsCount, kSmallSize},
     {kShutdownType, kSmallSize},
     {kBrowserUnpinTrace, kMediumSize},
 #if !defined(OS_ANDROID)
-    {gpu::crash_keys::kGPUVendorID, kSmallSize},
-    {gpu::crash_keys::kGPUDeviceID, kSmallSize},
+    {kGPUVendorID, kSmallSize},
+    {kGPUDeviceID, kSmallSize},
 #endif
-    {gpu::crash_keys::kGPUDriverVersion, kSmallSize},
-    {gpu::crash_keys::kGPUPixelShaderVersion, kSmallSize},
-    {gpu::crash_keys::kGPUVertexShaderVersion, kSmallSize},
+    {kGPUDriverVersion, kSmallSize},
+    {kGPUPixelShaderVersion, kSmallSize},
+    {kGPUVertexShaderVersion, kSmallSize},
 #if defined(OS_MACOSX)
-    {gpu::crash_keys::kGPUGLVersion, kSmallSize},
+    {kGPUGLVersion, kSmallSize},
 #elif defined(OS_POSIX)
-    {gpu::crash_keys::kGPUVendor, kSmallSize},
-    {gpu::crash_keys::kGPURenderer, kSmallSize},
+    {kGPUVendor, kSmallSize},
+    {kGPURenderer, kSmallSize},
 #endif
 
     // content/:
     {"bad_message_reason", kSmallSize},
     {"discardable-memory-allocated", kSmallSize},
     {"discardable-memory-free", kSmallSize},
     {kFontKeyName, kSmallSize},
     {"mojo-message-error", kMediumSize},
     {"ppapi_path", kMediumSize},
     {"subresource_url", kLargeSize},
@@ skipping 240 matching lines @@
 }
 
 ScopedPrinterInfo::~ScopedPrinterInfo() {
   for (size_t i = 0; i < kPrinterInfoCount; ++i) {
     std::string key = base::StringPrintf(kPrinterInfo, i + 1);
     base::debug::ClearCrashKey(key);
   }
 }
 
 }  // namespace crash_keys