Merge //gpu/config:crash_keys into //gpu/config

After crrev.com/c/812525, crash_keys doesn't need to be a separate
source_set duplicated in many components. Just make it part of the gpu
component.

Bug: 598854
Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
Change-Id: Ibaa2e994087401f267a685e0a3c3c7a8f930656d
Reviewed-on: https://chromium-review.googlesource.com/849492Reviewed-by: Kenneth Russell <kbr@chromium.org>
Commit-Queue: Antoine Labour <piman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#526905}

chrome/test/BUILD.gn

@@ -4856,7 +4856,6 @@ if (is_android) {
       "//chrome/child",
       "//components/crash/core/common",
       "//components/flags_ui:switches",
-      "//gpu/config:crash_keys",
     ]
     if (!is_fuchsia) {
       # TODO(crbug.com/753619): Enable crash reporting on Fuchsia.

gpu/config/BUILD.gn

@@ -18,17 +18,6 @@ group("config") {
   }
 }
 
-source_set("crash_keys") {
-  sources = [
-    "gpu_crash_keys.cc",
-    "gpu_crash_keys.h",
-  ]
-
-  deps = [
-    "//components/crash/core/common:crash_key",
-  ]
-}
-
 process_json_outputs = [
   "$target_gen_dir/gpu_driver_bug_list_arrays_and_structs_autogen.h",
   "$target_gen_dir/gpu_driver_bug_list_autogen.cc",
@@ -85,6 +74,8 @@ source_set("config_sources") {
     "gpu_blacklist.h",
     "gpu_control_list.cc",
     "gpu_control_list.h",
+    "gpu_crash_keys.cc",
+    "gpu_crash_keys.h",
     "gpu_driver_bug_list.cc",
     "gpu_driver_bug_list.h",
     "gpu_driver_bug_workaround_type.h",
@@ -124,8 +115,11 @@ source_set("config_sources") {
 
   configs += [ "//gpu:gpu_implementation" ]
 
+  public_deps = [
+    "//components/crash/core/common:crash_key",
+  ]
+
   deps = [
-    ":crash_keys",
     ":process_json",
     "//base",
     "//third_party/re2",

gpu/config/gpu_crash_keys.h

@@ -7,25 +7,26 @@
 
 #include "build/build_config.h"
 #include "components/crash/core/common/crash_key.h"
+#include "gpu/gpu_export.h"
 
 namespace gpu {
 namespace crash_keys {
 
 // Keys that can be used for crash reporting.
 #if !defined(OS_ANDROID)
-extern crash_reporter::CrashKeyString<16> gpu_vendor_id;
-extern crash_reporter::CrashKeyString<16> gpu_device_id;
+extern GPU_EXPORT crash_reporter::CrashKeyString<16> gpu_vendor_id;
+extern GPU_EXPORT crash_reporter::CrashKeyString<16> gpu_device_id;
 #endif
-extern crash_reporter::CrashKeyString<64> gpu_driver_version;
-extern crash_reporter::CrashKeyString<16> gpu_pixel_shader_version;
-extern crash_reporter::CrashKeyString<16> gpu_vertex_shader_version;
+extern GPU_EXPORT crash_reporter::CrashKeyString<64> gpu_driver_version;
+extern GPU_EXPORT crash_reporter::CrashKeyString<16> gpu_pixel_shader_version;
+extern GPU_EXPORT crash_reporter::CrashKeyString<16> gpu_vertex_shader_version;
 #if defined(OS_MACOSX)
-extern crash_reporter::CrashKeyString<64> gpu_gl_version;
+extern GPU_EXPORT crash_reporter::CrashKeyString<64> gpu_gl_version;
 #elif defined(OS_POSIX)
-extern crash_reporter::CrashKeyString<256> gpu_vendor;
-extern crash_reporter::CrashKeyString<128> gpu_renderer;
+extern GPU_EXPORT crash_reporter::CrashKeyString<256> gpu_vendor;
+extern GPU_EXPORT crash_reporter::CrashKeyString<128> gpu_renderer;
 #endif
-extern crash_reporter::CrashKeyString<4> gpu_gl_context_is_virtual;
+extern GPU_EXPORT crash_reporter::CrashKeyString<4> gpu_gl_context_is_virtual;
 
 }  // namespace crash_keys
 }  // namespace gpu

gpu/ipc/BUILD.gn

@@ -40,7 +40,6 @@ target(link_target_type, "command_buffer_sources") {
     "//gpu/command_buffer/service:gles2_sources",
     "//gpu/command_buffer/service:service_sources",
     "//gpu/config:config_sources",
-    "//gpu/config:crash_keys",
     "//gpu/ipc/client:ipc_client_sources",
     "//gpu/ipc/service:ipc_service_sources",
     "//ui/gfx",

gpu/ipc/service/BUILD.gn

@@ -78,7 +78,6 @@ target(link_target_type, "ipc_service_sources") {
     "//gpu/command_buffer/service:gles2_sources",
     "//gpu/command_buffer/service:service_sources",
     "//gpu/config:config_sources",
-    "//gpu/config:crash_keys",
     "//gpu/ipc/common:ipc_common_sources",
   ]
   libs = []