Rejig stability intstrumentation filenames and targets

components/browser_watcher/BUILD.gn

Index: components/browser_watcher/BUILD.gn
diff --git a/components/browser_watcher/BUILD.gn b/components/browser_watcher/BUILD.gn
index ecb1d99567631d7b0e1b6aee0ad13c0c920dce4c..380a17521cd952364464eb973317aaea2f76ae00 100644
--- a/components/browser_watcher/BUILD.gn
+++ b/components/browser_watcher/BUILD.gn
@@ -35,27 +35,26 @@ if (is_win) {
       "watcher_metrics_provider_win.h",
     ]
     deps = [
-      ":postmortem_report_collector",
-      ":stability",
+      ":postmortem_stability",
+      ":stability_client",
       "//base",
       "//components/metrics",
       "//third_party/crashpad/crashpad/client",
     ]
   }
 
-  static_library("postmortem_report_collector") {
+  static_library("postmortem_stability") {
     sources = [
       "postmortem_minidump_writer.h",
       "postmortem_minidump_writer_win.cc",
       "postmortem_report_collector.cc",
       "postmortem_report_collector.h",
-      "postmortem_report_extractor.cc",
-      "postmortem_report_extractor.h",
       "system_session_analyzer_win.cc",
       "system_session_analyzer_win.h",
     ]
     deps = [
-      ":stability_data",
+      ":stability_client",
+      ":stability_common",
       ":stability_report_proto",
       "//base",
       "//components/variations",
@@ -66,27 +65,38 @@ if (is_win) {
     libs = [ "wevtapi.lib" ]
     ldflags = [ "/DELAYLOAD:wevtapi.dll" ]  # Only used after unclean shutdowns.
   }
+
+  static_library("stability_common") {
+    sources = [
+      "stability_report_extractor.cc",
+      "stability_report_extractor.h",
+    ]
+    deps = [
+      ":stability_client",
+      ":stability_report_proto",
+      "//base",
+      "//components/variations",
+      "//third_party/crashpad/crashpad/util",
+    ]
+  }
 }
 
-static_library("stability") {
+static_library("stability_client") {
   sources = [
     "features.cc",
     "features.h",
+    "stability_data_names.cc",
+    "stability_data_names.h",
     "stability_debugging.cc",
     "stability_debugging.h",
+    "stability_paths.cc",
+    "stability_paths.h",
   ]
   deps = [
     "//base",
   ]
 }
 
-static_library("stability_data") {
-  sources = [
-    "stability_data_names.cc",
-    "stability_data_names.h",
-  ]
-}
-
 if (is_win) {
   source_set("unit_tests") {
     testonly = true
@@ -105,9 +115,9 @@ if (is_win) {
     deps = [
       ":browser_watcher",
       ":browser_watcher_client",
-      ":postmortem_report_collector",
-      ":stability",
-      ":stability_data",
+      ":postmortem_stability",
+      ":stability_client",
+      ":stability_common",
       ":stability_report_proto",
       "//base",
       "//base/test:test_support",
@@ -138,7 +148,7 @@ if (is_win) {
       "fetch_system_session_events_main_win.cc",
     ]
     deps = [
-      ":postmortem_report_collector",
+      ":postmortem_stability",
       "//base",
     ]
   }