[WebLayer] Actually filter components_chromium_strings.

Updates to the build.gn configuration per feedback here:
https://chromium-review.googlesource.com/c/chromium/src/+/2166162/1/weblayer/BUILD.gn#67

Bug: 1052375
Change-Id: I6cfac8ff7f7d744e7ad024f42b0955ac94c822b2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2171076
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Clark DuVall <cduvall@chromium.org>
Commit-Queue: Mugdha Lakhani <nator@chromium.org>
Cr-Commit-Position: refs/heads/master@{#764178}

build/android/lint/suppressions.xml

@@ -465,6 +465,8 @@ Still reading?
     <ignore regexp="chrome/android/java/res/layout/tab_switcher_action_menu_layout.xml"/>
     <!--TODO(crbug.com/1052375): Remove this suppression once ConnectionInfoPopAndroid moves to components.-->
     <ignore regexp="components/page_info/android/java/res/drawable-hdpi/pageinfo_*"/>
+    <!--TODO(crbug.com/1052375): Remove this suppression once PermissionParamsListBuilder moves to components.-->
+    <ignore regexp="The resource `R.string.page_info_permission_ads_subtitle` appears to be unused" />
   </issue>
   <issue id="UseCompoundDrawables">
     <!-- Upscaling 24dp to 48dp doesn't work as expected with a TextView compound drawable. -->

weblayer/BUILD.gn

@@ -59,17 +59,35 @@ if (is_android) {
                               [ "components_strings_{{source_name_part}}.pak" ])
   }
 
+  grit("generate_components_chromium_strings") {
+    source = "../components/components_chromium_strings.grd"
+
+    # components_chromium_strings contains Chromium-specific strings. WebLayer
+    # will never display most of them, so we try to limit the included
+    # strings.
+    whitelist = rebase_path("grit_strings_whitelist.txt", root_build_dir)
+    inputs = [ "//weblayer/grit_strings_whitelist.txt" ]
+    grit_flags = [
+      "-w",
+      whitelist,
+    ]
+    outputs = [ "grit/components_chromium_strings.h" ] +
+              process_file_template(
+                  locales_with_fake_bidi,
+                  [ "components_chromium_strings_{{source_name_part}}.pak" ])
+  }
+
   repack_locales("weblayer_locales") {
     input_locales = locales
     output_locales = locales
     source_patterns = [
-      "${root_gen_dir}/components/strings/components_chromium_strings_",
       "${root_gen_dir}/components/strings/components_locale_settings_",
+      "${root_gen_dir}/weblayer/components_chromium_strings_",
       "${root_gen_dir}/weblayer/components_strings_",
     ]
     deps = [
+      ":generate_components_chromium_strings",
       ":generate_components_strings",
-      "//components/strings:components_chromium_strings",
       "//components/strings:components_locale_settings",
     ]
     output_dir = "$root_out_dir/weblayer/locales"

weblayer/grit_strings_whitelist.txt

@@ -94,9 +94,54 @@ IDS_NOTIFICATIONS_INFOBAR_TEXT
 IDS_NOTIFICATION_PERMISSIONS_FRAGMENT
 IDS_NOTIFICATION_QUIET_PERMISSION_PROMPT_MESSAGE
 IDS_NOTIFICATION_QUIET_PERMISSION_PROMPT_TITLE
+IDS_PAGE_INFO_BILLING_DETAILS
+IDS_PAGE_INFO_BILLING_SUMMARY
+IDS_PAGE_INFO_BLUETOOTH_DEVICE_SECONDARY_LABEL
+IDS_PAGE_INFO_BUTTON_TEXT_ALLOWED_BY_DEFAULT
+IDS_PAGE_INFO_BUTTON_TEXT_ALLOWED_BY_USER
+IDS_PAGE_INFO_BUTTON_TEXT_ASK_BY_DEFAULT
+IDS_PAGE_INFO_BUTTON_TEXT_ASK_BY_USER
+IDS_PAGE_INFO_BUTTON_TEXT_AUTOMATIC_BY_DEFAULT
+IDS_PAGE_INFO_BUTTON_TEXT_BLOCKED_BY_DEFAULT
+IDS_PAGE_INFO_BUTTON_TEXT_BLOCKED_BY_USER
+IDS_PAGE_INFO_BUTTON_TEXT_DETECT_IMPORTANT_CONTENT_BY_DEFAULT
+IDS_PAGE_INFO_BUTTON_TEXT_DETECT_IMPORTANT_CONTENT_BY_USER
+IDS_PAGE_INFO_BUTTON_TEXT_MUTED_BY_DEFAULT
+IDS_PAGE_INFO_BUTTON_TEXT_MUTED_BY_USER
+IDS_PAGE_INFO_CERT_INFO_BUTTON
+IDS_PAGE_INFO_DELETE_BLUETOOTH_DEVICE
+IDS_PAGE_INFO_DELETE_SERIAL_PORT
+IDS_PAGE_INFO_DELETE_USB_DEVICE
+IDS_PAGE_INFO_HELP_CENTER_LINK
+IDS_PAGE_INFO_INTERNAL_PAGE
+IDS_PAGE_INFO_LEGACY_TLS_DETAILS
+IDS_PAGE_INFO_MALWARE_DETAILS
+IDS_PAGE_INFO_MALWARE_SUMMARY
+IDS_PAGE_INFO_MIXED_CONTENT_DETAILS
+IDS_PAGE_INFO_MIXED_CONTENT_SUMMARY
+IDS_PAGE_INFO_NOT_SECURE_DETAILS
+IDS_PAGE_INFO_NOT_SECURE_SUMMARY
+IDS_PAGE_INFO_PERMISSION_ADS_SUBTITLE
+IDS_PAGE_INFO_PERMISSION_ALLOWED_BY_EXTENSION
+IDS_PAGE_INFO_PERMISSION_ALLOWED_BY_POLICY
+IDS_PAGE_INFO_PERMISSION_ASK_BY_EXTENSION
+IDS_PAGE_INFO_PERMISSION_ASK_BY_POLICY
+IDS_PAGE_INFO_PERMISSION_AUTOMATICALLY_BLOCKED
+IDS_PAGE_INFO_PERMISSION_BLOCKED_BY_EXTENSION
+IDS_PAGE_INFO_PERMISSION_BLOCKED_BY_POLICY
+IDS_PAGE_INFO_RESET_INVALID_CERTIFICATE_DECISIONS_BUTTON
+IDS_PAGE_INFO_SAFETY_TIP_BAD_REPUTATION_DESCRIPTION
+IDS_PAGE_INFO_SAFETY_TIP_BAD_REPUTATION_TITL
+IDS_PAGE_INFO_SAFETY_TIP_LOOKALIKE_DESCRIPTION
+IDS_PAGE_INFO_SAFETY_TIP_LOOKALIKE_TITLE
+IDS_PAGE_INFO_SECURE_DETAILS
 IDS_PAGE_INFO_SECURE_IDENTITY_VERIFIED
-IDS_PAGE_INFO_SECURITY_TAB_DEPRECATED_SIGNATURE_ALGORITHM);
+IDS_PAGE_INFO_SECURE_SUMMARY
+IDS_PAGE_INFO_SECURITY_TAB_DEPRECATED_SIGNATURE_ALGORITHM
 IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_CONNECTION_TEXT
+IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_INSECURE_CONTENT_ERROR
+IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_INSECURE_CONTENT_WARNING
+IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_INSECURE_FORM_WARNING
 IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_SENTENCE_LINK
 IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTION_DETAILS
 IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTION_DETAILS_AEAD
@@ -106,6 +151,18 @@ IDS_PAGE_INFO_SECURITY_TAB_NOT_ENCRYPTED_CONNECTION_TEXT
 IDS_PAGE_INFO_SECURITY_TAB_SSL_VERSION
 IDS_PAGE_INFO_SECURITY_TAB_UNKNOWN_PARTY
 IDS_PAGE_INFO_SECURITY_TAB_WEAK_ENCRYPTION_CONNECTION_TEXT
+IDS_PAGE_INFO_SERIAL_PORT_SECONDARY_LABEL
+IDS_PAGE_INFO_SOCIAL_ENGINEERING_DETAILS
+IDS_PAGE_INFO_SOCIAL_ENGINEERING_SUMMARY
+IDS_PAGE_INFO_TYPE_BLUETOOTH_SCANNING
+IDS_PAGE_INFO_TYPE_MOTION_SENSORS
+IDS_PAGE_INFO_TYPE_NATIVE_FILE_SYSTEM_WRITE
+IDS_PAGE_INFO_TYPE_PROTECTED_MEDIA_IDENTIFIER
+IDS_PAGE_INFO_TYPE_SENSORS
+IDS_PAGE_INFO_UNWANTED_SOFTWARE_DETAILS
+IDS_PAGE_INFO_UNWANTED_SOFTWARE_SUMMARY
+IDS_PAGE_INFO_USB_DEVICE_ALLOWED_BY_POLICY_LABEL
+IDS_PAGE_INFO_USB_DEVICE_SECONDARY_LABEL
 IDS_PERMISSION_ALLOW
 IDS_PERMISSION_DENY
 IDS_PROTECTED_MEDIA_IDENTIFIER_PERMISSION_FRAGMENT