Collect threat details for phishing and UwS

chrome/chrome_browser.gypi

Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 5783f7a856a473e9d393eeabce86add0af00ef90..4a64fff871b191b062b8205da4311276760200ed 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -3470,7 +3470,7 @@
           'dependencies': [
             'safe_browsing_chunk_proto',
             'safe_browsing_metadata_proto',
-            'safe_browsing_report_proto',
+            'safe_browsing_proto',
           ],
           'conditions': [
             ['safe_browsing == 1', {
@@ -3902,19 +3902,6 @@
       'includes': [ '../build/protoc.gypi' ]
     },
     {
-      # Protobuf compiler / generator for the safebrowsing reporting
-      # protocol buffer.
-      # GN version: //chrome/browser/safe_browsing:report_proto
-      'target_name': 'safe_browsing_report_proto',
-      'type': 'static_library',
-      'sources': [ 'browser/safe_browsing/report.proto' ],
-      'variables': {
-        'proto_in_dir': 'browser/safe_browsing',
-        'proto_out_dir': 'chrome/browser/safe_browsing',
-      },
-      'includes': [ '../build/protoc.gypi' ]
-    },
-    {
       # Protobuf compiler / generator for the safebrowsing incident reporting
       # service state store data protocol buffer.
       # GN version: //chrome/browser/safe_browsing/incident_reporting:state_store_data_proto