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

android_webview/common/aw_content_client.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 "android_webview/common/aw_content_client.h"
 
 #include "android_webview/common/aw_media_client_android.h"
 #include "android_webview/common/aw_resource.h"
 #include "android_webview/common/aw_version_info_values.h"
 #include "android_webview/common/crash_reporter/crash_keys.h"
 #include "android_webview/common/url_constants.h"
 #include "base/command_line.h"
 #include "base/debug/crash_logging.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/user_agent.h"
 #include "gpu/config/gpu_info.h"
-#include "gpu/config/gpu_util.h"
 #include "ipc/ipc_message.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 namespace android_webview {
 
 std::string GetProduct() {
   return "Chrome/" PRODUCT_VERSION;
 }
 
@@ skipping 49 matching lines @@
   // Because of this we should never drop any synchronous IPC replies.
   return message->type() == IPC_REPLY_ID;
 }
 
 void AwContentClient::SetGpuInfo(const gpu::GPUInfo& gpu_info) {
   gpu_fingerprint_ = gpu_info.gl_version + '|' + gpu_info.gl_vendor + '|' +
                      gpu_info.gl_renderer;
   std::replace_if(gpu_fingerprint_.begin(), gpu_fingerprint_.end(),
                   [](char c) { return !::isprint(c); }, '_');
 
-  gpu::SetKeysForCrashLogging(gpu_info);
+  base::debug::SetCrashKeyValue(crash_keys::kGPUDriverVersion,
+                                gpu_info.driver_version);
+  base::debug::SetCrashKeyValue(crash_keys::kGPUPixelShaderVersion,
+                                gpu_info.pixel_shader_version);
+  base::debug::SetCrashKeyValue(crash_keys::kGPUVertexShaderVersion,
+                                gpu_info.vertex_shader_version);
+  base::debug::SetCrashKeyValue(crash_keys::kGPUVendor, gpu_info.gl_vendor);
+  base::debug::SetCrashKeyValue(crash_keys::kGPURenderer, gpu_info.gl_renderer);
 }
 
 bool AwContentClient::UsingSynchronousCompositing() {
   return true;
 }
 
 media::MediaClientAndroid* AwContentClient::GetMediaClientAndroid() {
   return new AwMediaClientAndroid(AwResource::GetConfigKeySystemUuidMapping());
 }
 
 }  // namespace android_webview