Improve iOS localisation and resource packing.

Stop using whitelisting for resources from components on the rationale that it causes confusion for the developers and most of those resources are used on iOS. Stop support for whitelisting for resources when using gn as meta-build system on the rationale that the migration will happen after Chrome on iOS is unforked at which point whitelisting will not be used with gyp either. Update build/ios/grit_whitelist.txt to: 1. remove all resources from //components, 2. remove all resources that no longer exists, 3. add all resources used downstream (i.e. unfork the file). TEST=Checked that clobber build compiled and all tests passed on both the upstream and downstream tree with this CL. BUG=429756 Review URL: https://codereview.chromium.org/1350453004 Cr-Original-Commit-Position: refs/heads/master@{#350526} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: 502be01eec9af4fa82ce8abe4f6470735288b5e4
2015-09-24 03:48:08 -07:00 · 2015-09-24 03:48:08 -07:00 · 959a45f513
--- a/ios/grit_whitelist.txt
+++ b/ios/grit_whitelist.txt
@ -1,49 +1,31 @@
-IDR_ABOUT_DOM_DISTILLER_CSS
-IDR_ABOUT_DOM_DISTILLER_HTML
-IDR_ABOUT_DOM_DISTILLER_JS
-IDR_ABOUT_STATS_HTML
-IDR_ABOUT_STATS_JS
 IDR_ABOUT_VERSION_CSS
 IDR_ABOUT_VERSION_HTML
 IDR_ABOUT_VERSION_JS
-IDR_CONTEXTUAL_SEARCH_PROMO_HTML
+IDR_APPLE_FLAGS_HTML
+IDR_AUTOFILL_TOOLTIP_ICON
+IDR_AUTOFILL_TOOLTIP_ICON_H
+IDR_CHECKMARK
 IDR_CONTROLLED_SETTING_MANDATORY
 IDR_CRASHES_HTML
 IDR_CRASHES_JS
 IDR_CREDITS_HTML
 IDR_CREDITS_JS
-IDR_CREDIT_CARD_CVC_HINT
-IDR_CREDIT_CARD_CVC_HINT_AMEX
-IDR_DATA_REDUCTION_PROXY_INTERSTITIAL_HTML
 IDR_DEFAULT_FAVICON
 IDR_DEFAULT_FAVICON_32
 IDR_DEFAULT_FAVICON_64
 IDR_DIR_HEADER_HTML
-IDR_DISTILLABLE_PAGE_SERIALIZED_MODEL
-IDR_DISTILLER_CSS
-IDR_DISTILLER_IOS_CSS
-IDR_DISTILLER_JS
-IDR_DOM_DISTILLER_VIEWER_HTML
-IDR_DOM_DISTILLER_VIEWER_JS
-IDR_EXTRACT_PAGE_FEATURES_JS
+IDR_ERROR
 IDR_FLAGS_FAVICON
 IDR_FLAGS_HTML
 IDR_FLAGS_JS
-IDR_GCM_DRIVER_GCM_INTERNALS_CSS
-IDR_GCM_DRIVER_GCM_INTERNALS_HTML
-IDR_GCM_DRIVER_GCM_INTERNALS_JS
 IDR_HISTORY_FAVICON
 IDR_HISTORY_HTML
 IDR_HISTORY_JS
 IDR_INCOGNITO_TAB_HTML
-IDR_INFOBAR_AUTOFILL_CC
 IDR_INFOBAR_AUTOLOGIN
 IDR_INFOBAR_RESTORE_SESSION
 IDR_INFOBAR_SAVE_PASSWORD
-IDR_INFOBAR_TRANSLATE_IOS
 IDR_INFOBAR_WARNING
-IDR_IS_DISTILLABLE_JS
-IDR_LOCATION_BAR_HTTP
 IDR_NET_ERROR_HTML
 IDR_NET_EXPORT_HTML
 IDR_NET_EXPORT_JS
@ -51,26 +33,18 @@ IDR_NET_INTERNALS_INDEX_HTML
 IDR_NET_INTERNALS_INDEX_JS
 IDR_OMAHA_HTML
 IDR_OMAHA_JS
-IDR_OMNIBOX_CALCULATOR
 IDR_OMNIBOX_CLEAR_IOS
 IDR_OMNIBOX_CLEAR_OTR_IOS
 IDR_OMNIBOX_CLEAR_OTR_PRESSED_IOS
 IDR_OMNIBOX_CLEAR_PRESSED_IOS
-IDR_OMNIBOX_EXTENSION_APP
-IDR_OMNIBOX_HISTORY
-IDR_OMNIBOX_HISTORY_INCOGNITO
-IDR_OMNIBOX_HTTP
 IDR_OMNIBOX_HTTPS_INVALID
 IDR_OMNIBOX_HTTPS_POLICY_WARNING
 IDR_OMNIBOX_HTTPS_VALID
 IDR_OMNIBOX_HTTPS_WARNING
-IDR_OMNIBOX_HTTP_INCOGNITO
 IDR_OMNIBOX_KEYBOARD_VIEW_APPEND
 IDR_OMNIBOX_KEYBOARD_VIEW_APPEND_HIGHLIGHTED
 IDR_OMNIBOX_KEYBOARD_VIEW_APPEND_INCOGNITO
 IDR_OMNIBOX_KEYBOARD_VIEW_APPEND_INCOGNITO_HIGHLIGHTED
-IDR_OMNIBOX_SEARCH
-IDR_OMNIBOX_SEARCH_INCOGNITO
 IDR_OMNIBOX_SEARCH_SECURED
 IDR_OMNIBOX_STAR
 IDR_OMNIBOX_STAR_INCOGNITO
@ -83,31 +57,95 @@ IDR_PAGEINFO_WARNING_MINOR
 IDR_POLICY_CSS
 IDR_POLICY_HTML
 IDR_POLICY_JS
+IDR_PREF_HASH_SEED_BIN
 IDR_PRINTER_FAVICON
 IDR_SAD_FAVICON
 IDR_SAD_TAB
-IDR_SECURITY_INTERSTITIAL_HTML
 IDR_SIGNIN_INTERNALS_INDEX_HTML
 IDR_SIGNIN_INTERNALS_INDEX_JS
-IDR_SYNC_INTERNALS_ABOUT_JS
-IDR_SYNC_INTERNALS_CHROME_SYNC_JS
-IDR_SYNC_INTERNALS_DATA_JS
-IDR_SYNC_INTERNALS_EVENTS_JS
-IDR_SYNC_INTERNALS_INDEX_HTML
-IDR_SYNC_INTERNALS_INDEX_JS
-IDR_SYNC_INTERNALS_SEARCH_JS
-IDR_SYNC_INTERNALS_SYNC_LOG_JS
-IDR_SYNC_INTERNALS_SYNC_NODE_BROWSER_JS
-IDR_SYNC_INTERNALS_SYNC_SEARCH_JS
-IDR_SYNC_INTERNALS_TYPES_JS
 IDR_TOOLBAR_SHADOW_FULL_BLEED
-IDR_TRANSLATE_JS
 IDR_UBER_UTILS_JS
+IDR_WEBUI_CSS_ACTION_LINK
+IDR_WEBUI_CSS_ALERT_OVERLAY
+IDR_WEBUI_CSS_APPS_COMMON
+IDR_WEBUI_CSS_APPS_TOPBUTTON_BAR
+IDR_WEBUI_CSS_BUBBLE
+IDR_WEBUI_CSS_BUBBLE_BUTTON
+IDR_WEBUI_CSS_BUTTER_BAR
+IDR_WEBUI_CSS_CHROME
+IDR_WEBUI_CSS_DIALOGS
+IDR_WEBUI_CSS_I18N_PROCESS
+IDR_WEBUI_CSS_LIST
+IDR_WEBUI_CSS_MENU
+IDR_WEBUI_CSS_MENU_BUTTON
+IDR_WEBUI_CSS_OVERLAY
+IDR_WEBUI_CSS_SPINNER
+IDR_WEBUI_CSS_TABLE
+IDR_WEBUI_CSS_TABS
 IDR_WEBUI_CSS_TEXT_DEFAULTS
+IDR_WEBUI_CSS_THROBBER
+IDR_WEBUI_CSS_TRASH
+IDR_WEBUI_CSS_TREE
+IDR_WEBUI_CSS_UI_ACCOUNT_TWEAKS
+IDR_WEBUI_CSS_WIDGETS
 IDR_WEBUI_I18N_TEMPLATE_JS
+IDR_WEBUI_IMAGES_SELECT
 IDR_WEBUI_JSTEMPLATE_JS
+IDR_WEBUI_JS_ACTION_LINK
+IDR_WEBUI_JS_ASSERT
+IDR_WEBUI_JS_CR
+IDR_WEBUI_JS_CR_EVENT_TARGET
+IDR_WEBUI_JS_CR_LINK_CONTROLLER
+IDR_WEBUI_JS_CR_UI
+IDR_WEBUI_JS_CR_UI_ALERT_OVERLAY
+IDR_WEBUI_JS_CR_UI_ARRAY_DATA_MODEL
+IDR_WEBUI_JS_CR_UI_AUTOCOMPLETE_LIST
+IDR_WEBUI_JS_CR_UI_BUBBLE
+IDR_WEBUI_JS_CR_UI_BUBBLE_BUTTON
+IDR_WEBUI_JS_CR_UI_CARD_SLIDER
+IDR_WEBUI_JS_CR_UI_COMMAND
+IDR_WEBUI_JS_CR_UI_CONTEXT_MENU_BUTTON
+IDR_WEBUI_JS_CR_UI_CONTEXT_MENU_HANDLER
+IDR_WEBUI_JS_CR_UI_DIALOGS
+IDR_WEBUI_JS_CR_UI_DRAG_WRAPPER
+IDR_WEBUI_JS_CR_UI_FOCUS_GRID
+IDR_WEBUI_JS_CR_UI_FOCUS_MANAGER
+IDR_WEBUI_JS_CR_UI_FOCUS_OUTLINE_MANAGER
+IDR_WEBUI_JS_CR_UI_FOCUS_ROW
+IDR_WEBUI_JS_CR_UI_GRID
+IDR_WEBUI_JS_CR_UI_LIST
+IDR_WEBUI_JS_CR_UI_LIST_ITEM
+IDR_WEBUI_JS_CR_UI_LIST_SELECTION_CONTROLLER
+IDR_WEBUI_JS_CR_UI_LIST_SELECTION_MODEL
+IDR_WEBUI_JS_CR_UI_LIST_SINGLE_SELECTION_MODEL
+IDR_WEBUI_JS_CR_UI_MENU
+IDR_WEBUI_JS_CR_UI_MENU_BUTTON
+IDR_WEBUI_JS_CR_UI_MENU_ITEM
+IDR_WEBUI_JS_CR_UI_OVERLAY
+IDR_WEBUI_JS_CR_UI_PAGE_MANAGER_PAGE
+IDR_WEBUI_JS_CR_UI_PAGE_MANAGER_PAGE_MANAGER
+IDR_WEBUI_JS_CR_UI_POSITION_UTIL
+IDR_WEBUI_JS_CR_UI_REPEATING_BUTTON
+IDR_WEBUI_JS_CR_UI_SPLITTER
+IDR_WEBUI_JS_CR_UI_TABLE
+IDR_WEBUI_JS_CR_UI_TABLE_COLUMN
+IDR_WEBUI_JS_CR_UI_TABLE_COLUMN_MODEL
+IDR_WEBUI_JS_CR_UI_TABLE_HEADER
+IDR_WEBUI_JS_CR_UI_TABLE_LIST
+IDR_WEBUI_JS_CR_UI_TABLE_SPLITTER
+IDR_WEBUI_JS_CR_UI_TABS
+IDR_WEBUI_JS_CR_UI_TOUCH_HANDLER
+IDR_WEBUI_JS_CR_UI_TREE
+IDR_WEBUI_JS_EVENT_TRACKER
+IDR_WEBUI_JS_I18N_TEMPLATE_NO_PROCESS
 IDR_WEBUI_JS_LOAD_TIME_DATA
+IDR_WEBUI_JS_MEDIA_COMMON
+IDR_WEBUI_JS_PARSE_HTML_SUBSET
+IDR_WEBUI_JS_UI_ACCOUNT_TWEAKS
+IDR_WEBUI_JS_UTIL
 IDS_ABOUT_MAC
+IDS_ABOUT_VERSION_32BIT
+IDS_ABOUT_VERSION_64BIT
 IDS_ABOUT_VERSION_COMMAND_LINE
 IDS_ABOUT_VERSION_COMPANY_NAME
 IDS_ABOUT_VERSION_COPYRIGHT
@ -118,66 +156,32 @@ IDS_ABOUT_VERSION_PATH_NOTFOUND
 IDS_ABOUT_VERSION_PROFILE_PATH
 IDS_ABOUT_VERSION_REVISION
 IDS_ABOUT_VERSION_TITLE
-IDS_ABOUT_VERSION_UNOFFICIAL
 IDS_ABOUT_VERSION_USER_AGENT
 IDS_ABOUT_VERSION_VARIATIONS
 IDS_ACCEPT_LANGUAGES
 IDS_ACCNAME_BACK
 IDS_ACCNAME_CLEAR_TEXT
+IDS_ACCNAME_CLOSE
 IDS_ACCNAME_FORWARD
 IDS_ACCNAME_LOCATION
 IDS_ACCNAME_VOICE_SEARCH
 IDS_ALLOW_INSECURE_CONTENT_BUTTON
+IDS_ALLOW_INSECURE_LOCALHOST
+IDS_ALLOW_INSECURE_LOCALHOST_DESCRIPTION
 IDS_ALTERNATE_NAV_URL_VIEW_LABEL
-IDS_ANNOTATED_SUGGESTION
 IDS_APP_CANCEL
 IDS_APP_OK
 IDS_APP_UNTITLED_SHORTCUT_FILE_NAME
-IDS_AUTOCOMPLETE_SEARCH_DESCRIPTION
-IDS_AUTOFILL_ADDRESS_LINE_SEPARATOR
-IDS_AUTOFILL_ADDRESS_SUMMARY_SEPARATOR
-IDS_AUTOFILL_CARD_UNMASK_PROMPT_ERROR_NETWORK
-IDS_AUTOFILL_CARD_UNMASK_PROMPT_ERROR_PERMANENT
-IDS_AUTOFILL_CARD_UNMASK_PROMPT_ERROR_TRY_AGAIN
-IDS_AUTOFILL_CARD_UNMASK_PROMPT_INSTRUCTIONS
-IDS_AUTOFILL_CARD_UNMASK_PROMPT_INSTRUCTIONS_AMEX
-IDS_AUTOFILL_CARD_UNMASK_PROMPT_INSTRUCTIONS_EXPIRED
-IDS_AUTOFILL_CARD_UNMASK_PROMPT_INSTRUCTIONS_EXPIRED_AMEX
-IDS_AUTOFILL_CC_AMEX
-IDS_AUTOFILL_CC_AMEX_SHORT
-IDS_AUTOFILL_CC_DINERS
-IDS_AUTOFILL_CC_DISCOVER
-IDS_AUTOFILL_CC_GENERIC
-IDS_AUTOFILL_CC_INFOBAR_ACCEPT
-IDS_AUTOFILL_CC_INFOBAR_DENY
-IDS_AUTOFILL_CC_INFOBAR_TEXT
-IDS_AUTOFILL_CC_JCB
-IDS_AUTOFILL_CC_MASTERCARD
-IDS_AUTOFILL_CC_UNION_PAY
-IDS_AUTOFILL_CC_VISA
-IDS_AUTOFILL_CLEAR_FORM_MENU_ITEM
-IDS_AUTOFILL_DELETE_AUTOCOMPLETE_SUGGESTION_CONFIRMATION_BODY
-IDS_AUTOFILL_DELETE_CREDIT_CARD_SUGGESTION_CONFIRMATION_BODY
-IDS_AUTOFILL_DELETE_PROFILE_SUGGESTION_CONFIRMATION_BODY
-IDS_AUTOFILL_DIALOG_PRIVACY_POLICY_LINK
-IDS_AUTOFILL_FIELD_LABEL_AREA
-IDS_AUTOFILL_FIELD_LABEL_COUNTY
-IDS_AUTOFILL_FIELD_LABEL_DEPARTMENT
-IDS_AUTOFILL_FIELD_LABEL_DISTRICT
-IDS_AUTOFILL_FIELD_LABEL_EMIRATE
-IDS_AUTOFILL_FIELD_LABEL_ISLAND
-IDS_AUTOFILL_FIELD_LABEL_PARISH
-IDS_AUTOFILL_FIELD_LABEL_POSTAL_CODE
-IDS_AUTOFILL_FIELD_LABEL_PREFECTURE
-IDS_AUTOFILL_FIELD_LABEL_PROVINCE
-IDS_AUTOFILL_FIELD_LABEL_STATE
-IDS_AUTOFILL_FIELD_LABEL_ZIP_CODE
-IDS_AUTOFILL_OPTIONS_CONTENT_DESCRIPTION
-IDS_AUTOFILL_OPTIONS_POPUP
-IDS_AUTOFILL_PASSWORD_FIELD_SUGGESTIONS_TITLE
-IDS_AUTOFILL_SCAN_CREDIT_CARD
-IDS_AUTOFILL_WARNING_FORM_DISABLED
-IDS_AUTOFILL_WARNING_INSECURE_CONNECTION
+IDS_AUTOFILL_CARD_UNMASK_CONFIRM_BUTTON
+IDS_AUTOFILL_CARD_UNMASK_EXPIRATION_DATE_SEPARATOR
+IDS_AUTOFILL_CARD_UNMASK_INVALID_EXPIRATION_DATE
+IDS_AUTOFILL_CARD_UNMASK_NEW_CARD_LINK
+IDS_AUTOFILL_CARD_UNMASK_PROMPT_STORAGE_CHECKBOX
+IDS_AUTOFILL_CARD_UNMASK_PROMPT_STORAGE_TOOLTIP_IOS
+IDS_AUTOFILL_CARD_UNMASK_VERIFICATION_IN_PROGRESS
+IDS_AUTOFILL_CARD_UNMASK_VERIFICATION_SUCCESS
+IDS_AUTOFILL_CLEAR_LOCAL_COPY_BUTTON
+IDS_AUTOFILL_DIALOG_PLACEHOLDER_CVC
 IDS_AUTOLOGIN_INFOBAR_CANCEL_BUTTON
 IDS_AUTOLOGIN_INFOBAR_MESSAGE
 IDS_AUTOLOGIN_INFOBAR_OK_BUTTON
@ -185,24 +189,6 @@ IDS_BLOCKED_DISPLAYING_INSECURE_CONTENT
 IDS_BLOCK_INSECURE_CONTENT_BUTTON
 IDS_BOOKMARK_ADD_EDITOR_TITLE
 IDS_BOOKMARK_ALL_TABS_DIALOG_TITLE
-IDS_BOOKMARK_BAR_FOLDER_NAME
-IDS_BOOKMARK_BAR_MANAGED_FOLDER_DEFAULT_NAME
-IDS_BOOKMARK_BAR_MANAGED_FOLDER_DOMAIN_NAME
-IDS_BOOKMARK_BAR_MOBILE_FOLDER_NAME
-IDS_BOOKMARK_BAR_OTHER_FOLDER_NAME
-IDS_BOOKMARK_BAR_REDO
-IDS_BOOKMARK_BAR_REDO_ADD
-IDS_BOOKMARK_BAR_REDO_DELETE
-IDS_BOOKMARK_BAR_REDO_EDIT
-IDS_BOOKMARK_BAR_REDO_MOVE
-IDS_BOOKMARK_BAR_REDO_REORDER
-IDS_BOOKMARK_BAR_SUPERVISED_FOLDER_DEFAULT_NAME
-IDS_BOOKMARK_BAR_UNDO
-IDS_BOOKMARK_BAR_UNDO_ADD
-IDS_BOOKMARK_BAR_UNDO_DELETE
-IDS_BOOKMARK_BAR_UNDO_EDIT
-IDS_BOOKMARK_BAR_UNDO_MOVE
-IDS_BOOKMARK_BAR_UNDO_REORDER
 IDS_BOOKMARK_BUBBLE_CHOOSER_ANOTHER_FOLDER
 IDS_BOOKMARK_BUBBLE_REMOVE_BOOKMARK
 IDS_BOOKMARK_EDITOR_CONFIRM_DELETE
@ -219,64 +205,7 @@ IDS_BOOKMARK_MANAGER_REMOVE_TITLE
 IDS_BOOKMARK_MANAGER_URL_INPUT_PLACE_HOLDER
 IDS_BOOKMARK_NEW_FOLDER_BUTTON_TITLE
 IDS_CANCEL
-IDS_CERT_ERROR_AUTHORITY_INVALID_DESCRIPTION
-IDS_CERT_ERROR_AUTHORITY_INVALID_DETAILS
-IDS_CERT_ERROR_AUTHORITY_INVALID_EXTRA_INFO_2
-IDS_CERT_ERROR_AUTHORITY_INVALID_TITLE
-IDS_CERT_ERROR_CHAIN_EXPIRED_DESCRIPTION
-IDS_CERT_ERROR_CHAIN_EXPIRED_DETAILS
-IDS_CERT_ERROR_COMMON_NAME_INVALID_DESCRIPTION
-IDS_CERT_ERROR_COMMON_NAME_INVALID_DETAILS
-IDS_CERT_ERROR_COMMON_NAME_INVALID_EXTRA_INFO_2
-IDS_CERT_ERROR_COMMON_NAME_INVALID_TITLE
-IDS_CERT_ERROR_CONTAINS_ERRORS_DESCRIPTION
-IDS_CERT_ERROR_CONTAINS_ERRORS_DETAILS
-IDS_CERT_ERROR_CONTAINS_ERRORS_EXTRA_INFO_2
-IDS_CERT_ERROR_CONTAINS_ERRORS_TITLE
-IDS_CERT_ERROR_EXPIRED_DESCRIPTION
-IDS_CERT_ERROR_EXPIRED_DETAILS
-IDS_CERT_ERROR_EXPIRED_DETAILS_EXTRA_INFO_2
-IDS_CERT_ERROR_EXPIRED_TITLE
-IDS_CERT_ERROR_EXTRA_INFO_1
-IDS_CERT_ERROR_EXTRA_INFO_TITLE
-IDS_CERT_ERROR_INVALID_CERT_DESCRIPTION
-IDS_CERT_ERROR_INVALID_CERT_DETAILS
-IDS_CERT_ERROR_INVALID_CERT_EXTRA_INFO_2
-IDS_CERT_ERROR_INVALID_CERT_TITLE
-IDS_CERT_ERROR_NAME_CONSTRAINT_VIOLATION_DESCRIPTION
-IDS_CERT_ERROR_NAME_CONSTRAINT_VIOLATION_DETAILS
-IDS_CERT_ERROR_NAME_CONSTRAINT_VIOLATION_TITLE
-IDS_CERT_ERROR_NOT_VALID_AT_THIS_TIME_DESCRIPTION
-IDS_CERT_ERROR_NOT_VALID_AT_THIS_TIME_DETAILS
-IDS_CERT_ERROR_NOT_YET_VALID_DESCRIPTION
-IDS_CERT_ERROR_NOT_YET_VALID_DETAILS
-IDS_CERT_ERROR_NOT_YET_VALID_DETAILS_EXTRA_INFO_2
-IDS_CERT_ERROR_NOT_YET_VALID_TITLE
-IDS_CERT_ERROR_NO_REVOCATION_MECHANISM_DESCRIPTION
-IDS_CERT_ERROR_NO_REVOCATION_MECHANISM_DETAILS
-IDS_CERT_ERROR_NO_REVOCATION_MECHANISM_TITLE
-IDS_CERT_ERROR_REVOKED_CERT_DESCRIPTION
-IDS_CERT_ERROR_REVOKED_CERT_DETAILS
-IDS_CERT_ERROR_REVOKED_CERT_EXTRA_INFO_2
-IDS_CERT_ERROR_REVOKED_CERT_TITLE
-IDS_CERT_ERROR_SUMMARY_PINNING_FAILURE_DESCRIPTION
-IDS_CERT_ERROR_SUMMARY_PINNING_FAILURE_DETAILS
-IDS_CERT_ERROR_UNABLE_TO_CHECK_REVOCATION_DESCRIPTION
-IDS_CERT_ERROR_UNABLE_TO_CHECK_REVOCATION_DETAILS
-IDS_CERT_ERROR_UNABLE_TO_CHECK_REVOCATION_TITLE
-IDS_CERT_ERROR_UNKNOWN_ERROR_DESCRIPTION
-IDS_CERT_ERROR_UNKNOWN_ERROR_DETAILS
-IDS_CERT_ERROR_UNKNOWN_ERROR_TITLE
-IDS_CERT_ERROR_VALIDITY_TOO_LONG_DESCRIPTION
-IDS_CERT_ERROR_VALIDITY_TOO_LONG_DETAILS
-IDS_CERT_ERROR_WEAK_KEY_DESCRIPTION
-IDS_CERT_ERROR_WEAK_KEY_DETAILS
-IDS_CERT_ERROR_WEAK_KEY_EXTRA_INFO_2
-IDS_CERT_ERROR_WEAK_KEY_TITLE
-IDS_CERT_ERROR_WEAK_SIGNATURE_ALGORITHM_DESCRIPTION
-IDS_CERT_ERROR_WEAK_SIGNATURE_ALGORITHM_DETAILS
-IDS_CERT_ERROR_WEAK_SIGNATURE_ALGORITHM_EXTRA_INFO_2
-IDS_CERT_ERROR_WEAK_SIGNATURE_ALGORITHM_TITLE
+IDS_CHILD_AVATAR_LABEL
 IDS_CHROME_TO_DEVICE_PRINT_TO_PHONE
 IDS_CHROME_TO_DEVICE_SNAPSHOTS
 IDS_CLOSE
@ -296,12 +225,6 @@ IDS_CRASHES_DISABLED_MESSAGE
 IDS_CRASHES_NO_CRASHES_MESSAGE
 IDS_CRASHES_TITLE
 IDS_CRASHES_UPLOAD_MESSAGE
-IDS_DATA_REDUCTION_PROXY_BACK_BUTTON
-IDS_DATA_REDUCTION_PROXY_CANNOT_PROXY_HEADING
-IDS_DATA_REDUCTION_PROXY_CANNOT_PROXY_PRIMARY_PARAGRAPH
-IDS_DATA_REDUCTION_PROXY_CANNOT_PROXY_SECONDARY_PARAGRAPH
-IDS_DATA_REDUCTION_PROXY_CONTINUE_BUTTON
-IDS_DATA_REDUCTION_PROXY_TITLE
 IDS_DEFAULT_AVATAR_NAME_10
 IDS_DEFAULT_AVATAR_NAME_11
 IDS_DEFAULT_AVATAR_NAME_12
@ -327,30 +250,10 @@ IDS_DEFAULT_TAB_TITLE
 IDS_DELETE
 IDS_DISABLE_TOUCH_ADJUSTMENT_DESCRIPTION
 IDS_DISABLE_TOUCH_ADJUSTMENT_NAME
-IDS_DOM_DISTILLER_JAVASCRIPT_DISABLED_CONTENT
-IDS_DOM_DISTILLER_QUALITY_ANSWER_NO
-IDS_DOM_DISTILLER_QUALITY_ANSWER_YES
-IDS_DOM_DISTILLER_QUALITY_QUESTION
-IDS_DOM_DISTILLER_VIEWER_CLOSE_READER_VIEW
-IDS_DOM_DISTILLER_VIEWER_FAILED_TO_FIND_ARTICLE_CONTENT
-IDS_DOM_DISTILLER_VIEWER_FAILED_TO_FIND_ARTICLE_TITLE
-IDS_DOM_DISTILLER_VIEWER_LOADING_STRING
-IDS_DOM_DISTILLER_VIEWER_LOADING_TITLE
-IDS_DOM_DISTILLER_VIEWER_NO_DATA_CONTENT
-IDS_DOM_DISTILLER_VIEWER_NO_DATA_TITLE
-IDS_DOM_DISTILLER_VIEWER_VIEW_ORIGINAL
-IDS_DOM_DISTILLER_WEBUI_ENTRY_ADD
-IDS_DOM_DISTILLER_WEBUI_ENTRY_ADD_FAILED
-IDS_DOM_DISTILLER_WEBUI_ENTRY_URL
-IDS_DOM_DISTILLER_WEBUI_FETCHING_ENTRIES
-IDS_DOM_DISTILLER_WEBUI_REFRESH
-IDS_DOM_DISTILLER_WEBUI_TITLE
-IDS_DOM_DISTILLER_WEBUI_VIEW_URL
-IDS_DOM_DISTILLER_WEBUI_VIEW_URL_FAILED
 IDS_DONE
 IDS_EASY_UNLOCK_SCREENLOCK_USER_POD_AUTH_VALUE
 IDS_EDIT_FIND_MAC
-IDS_EMPTY_KEYWORD_VALUE
+IDS_ERRORPAGES_BUTTON_DIAGNOSE
 IDS_ERRORPAGES_BUTTON_LESS
 IDS_ERRORPAGES_BUTTON_MORE
 IDS_ERRORPAGES_BUTTON_RELOAD
@ -385,7 +288,6 @@ IDS_ERRORPAGES_DETAILS_NETWORK_ACCESS_DENIED
 IDS_ERRORPAGES_DETAILS_NETWORK_CHANGED
 IDS_ERRORPAGES_DETAILS_NETWORK_IO_SUSPENDED
 IDS_ERRORPAGES_DETAILS_NOT_IMPLEMENTED
-IDS_ERRORPAGES_DETAILS_PINNING_FAILURE
 IDS_ERRORPAGES_DETAILS_PROXY_CONNECTION_FAILED
 IDS_ERRORPAGES_DETAILS_RESPONSE_HEADERS_MULTIPLE_CONTENT_DISPOSITION
 IDS_ERRORPAGES_DETAILS_RESPONSE_HEADERS_MULTIPLE_CONTENT_LENGTH
@ -395,6 +297,7 @@ IDS_ERRORPAGES_DETAILS_SSL_FALLBACK_BEYOND_MINIMUM_VERSION
 IDS_ERRORPAGES_DETAILS_SSL_PROTOCOL_ERROR
 IDS_ERRORPAGES_DETAILS_SSL_VERSION_OR_CIPHER_MISMATCH
 IDS_ERRORPAGES_DETAILS_TEMPORARILY_THROTTLED
+IDS_ERRORPAGES_DETAILS_TEMPORARY_BACKOFF
 IDS_ERRORPAGES_DETAILS_TIMED_OUT
 IDS_ERRORPAGES_DETAILS_TOO_MANY_REDIRECTS
 IDS_ERRORPAGES_DETAILS_UNKNOWN
@ -424,18 +327,11 @@ IDS_ERRORPAGES_HEADING_WEAK_SERVER_EPHEMERAL_DH_KEY
 IDS_ERRORPAGES_HTTP_POST_WARNING
 IDS_ERRORPAGES_SUGGESTION_CHECK_CONNECTION_BODY
 IDS_ERRORPAGES_SUGGESTION_CHECK_CONNECTION_HEADER
-IDS_ERRORPAGES_SUGGESTION_CONTACT_ADMINISTRATOR
-IDS_ERRORPAGES_SUGGESTION_DNS_CONFIG
-IDS_ERRORPAGES_SUGGESTION_FIREWALL_CONFIG
 IDS_ERRORPAGES_SUGGESTION_GOOGLE_SEARCH
 IDS_ERRORPAGES_SUGGESTION_LEARNMORE_BODY
-IDS_ERRORPAGES_SUGGESTION_NETWORK_PREDICTION
-IDS_ERRORPAGES_SUGGESTION_PROXY_CONFIG
 IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM
-IDS_ERRORPAGES_SUGGESTION_RELOAD
 IDS_ERRORPAGES_SUGGESTION_RELOAD_REPOST_BODY
 IDS_ERRORPAGES_SUGGESTION_RELOAD_REPOST_HEADER
-IDS_ERRORPAGES_SUGGESTION_VIEW_POLICIES
 IDS_ERRORPAGES_SUMMARY_ADDRESS_UNREACHABLE
 IDS_ERRORPAGES_SUMMARY_BAD_GATEWAY
 IDS_ERRORPAGES_SUMMARY_BAD_SSL_CLIENT_AUTH_CERT
@ -465,13 +361,13 @@ IDS_ERRORPAGES_SUMMARY_NETWORK_CHANGED
 IDS_ERRORPAGES_SUMMARY_NETWORK_IO_SUSPENDED
 IDS_ERRORPAGES_SUMMARY_NOT_AVAILABLE
 IDS_ERRORPAGES_SUMMARY_NOT_FOUND
-IDS_ERRORPAGES_SUMMARY_PINNING_FAILURE
 IDS_ERRORPAGES_SUMMARY_PROXY_CONNECTION_FAILED
 IDS_ERRORPAGES_SUMMARY_SERVICE_UNAVAILABLE
 IDS_ERRORPAGES_SUMMARY_SSL_FALLBACK_BEYOND_MINIMUM_VERSION
 IDS_ERRORPAGES_SUMMARY_SSL_PROTOCOL_ERROR
 IDS_ERRORPAGES_SUMMARY_SSL_VERSION_OR_CIPHER_MISMATCH
 IDS_ERRORPAGES_SUMMARY_TEMPORARILY_THROTTLED
+IDS_ERRORPAGES_SUMMARY_TEMPORARY_BACKOFF
 IDS_ERRORPAGES_SUMMARY_TIMED_OUT
 IDS_ERRORPAGES_SUMMARY_TOO_MANY_REDIRECTS
 IDS_ERRORPAGES_SUMMARY_WEAK_SERVER_EPHEMERAL_DH_KEY
@ -483,7 +379,6 @@ IDS_ERRORPAGES_TITLE_NOT_AVAILABLE
 IDS_ERRORPAGES_TITLE_NOT_FOUND
 IDS_ERRORPAGE_NET_BUTTON_DETAILS
 IDS_ERRORPAGE_NET_BUTTON_HIDE_DETAILS
-IDS_EXTENSION_KEYWORD_COMMAND
 IDS_FEEDBACK_REPORT_PAGE_TITLE
 IDS_FEEDBACK_REPORT_URL_LABEL
 IDS_FEEDBACK_SEND_REPORT
@ -498,13 +393,21 @@ IDS_FLAGS_ALLOW_NACL_SOCKET_API_DESCRIPTION
 IDS_FLAGS_ALLOW_NACL_SOCKET_API_NAME
 IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_CLICK_DESCRIPTION
 IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_CLICK_NAME
+IDS_FLAGS_BYPASS_APP_BANNER_ENGAGEMENT_CHECKS_DESCRIPTION
+IDS_FLAGS_BYPASS_APP_BANNER_ENGAGEMENT_CHECKS_NAME
 IDS_FLAGS_COMPOSITED_LAYER_BORDERS
 IDS_FLAGS_COMPOSITED_LAYER_BORDERS_DESCRIPTION
 IDS_FLAGS_COMPOSITING_FOR_FIXED_POSITION_DESCRIPTION
 IDS_FLAGS_COMPOSITING_FOR_FIXED_POSITION_HIGH_DPI
 IDS_FLAGS_COMPOSITING_FOR_FIXED_POSITION_NAME
-IDS_FLAGS_CONFLICTS_CHECK_DESCRIPTION
-IDS_FLAGS_CONFLICTS_CHECK_NAME
+IDS_FLAGS_DATA_REDUCTION_PROXY_CONFIG_CLIENT_DESCRIPTION
+IDS_FLAGS_DATA_REDUCTION_PROXY_CONFIG_CLIENT_NAME
+IDS_FLAGS_DATA_REDUCTION_PROXY_LO_FI_ALWAYS_ON
+IDS_FLAGS_DATA_REDUCTION_PROXY_LO_FI_CELLULAR_ONLY
+IDS_FLAGS_DATA_REDUCTION_PROXY_LO_FI_DISABLED
+IDS_FLAGS_DATA_REDUCTION_PROXY_LO_FI_SLOW_CONNECTIONS_ONLY
+IDS_FLAGS_DATA_REDUCTION_PROXY_RESET_SAVINGS_DESCRIPTION
+IDS_FLAGS_DATA_REDUCTION_PROXY_RESET_SAVINGS_NAME
 IDS_FLAGS_DEBUG_PACKED_APP_DESCRIPTION
 IDS_FLAGS_DEBUG_PACKED_APP_NAME
 IDS_FLAGS_DEBUG_SHORTCUTS_DESCRIPTION
@ -534,15 +437,15 @@ IDS_FLAGS_DISABLE_GESTURE_REQUIREMENT_FOR_MEDIA_PLAYBACK_DESCRIPTION
 IDS_FLAGS_DISABLE_GESTURE_REQUIREMENT_FOR_MEDIA_PLAYBACK_NAME
 IDS_FLAGS_DISABLE_HYPERLINK_AUDITING_DESCRIPTION
 IDS_FLAGS_DISABLE_HYPERLINK_AUDITING_NAME
-IDS_FLAGS_DISABLE_PNACL_DESCRIPTION
-IDS_FLAGS_DISABLE_PNACL_NAME
 IDS_FLAGS_DISABLE_SOFTWARE_RASTERIZER_DESCRIPTION
 IDS_FLAGS_DISABLE_SOFTWARE_RASTERIZER_NAME
-IDS_FLAGS_DISABLE_WEBGL_DESCRIPTION
-IDS_FLAGS_DISABLE_WEBGL_NAME
 IDS_FLAGS_ENABLE
+IDS_FLAGS_ENABLE_ADD_TO_SHELF_DESCRIPTION
+IDS_FLAGS_ENABLE_ADD_TO_SHELF_NAME
 IDS_FLAGS_ENABLE_APPS_SHOW_ON_FIRST_PAINT_DESCRIPTION
 IDS_FLAGS_ENABLE_APPS_SHOW_ON_FIRST_PAINT_NAME
+IDS_FLAGS_ENABLE_CLEAR_BROWSING_DATA_COUNTERS_DESCRIPTION
+IDS_FLAGS_ENABLE_CLEAR_BROWSING_DATA_COUNTERS_NAME
 IDS_FLAGS_ENABLE_CONTEXTUAL_SEARCH
 IDS_FLAGS_ENABLE_CONTEXTUAL_SEARCH_DESCRIPTION
 IDS_FLAGS_ENABLE_DEVTOOLS_EXPERIMENTS_DESCRIPTION
@ -571,8 +474,6 @@ IDS_FLAGS_ENABLE_PINCH_SCALE_DESCRIPTION
 IDS_FLAGS_ENABLE_PINCH_SCALE_NAME
 IDS_FLAGS_ENABLE_REQUEST_TABLET_SITE_DESCRIPTION
 IDS_FLAGS_ENABLE_REQUEST_TABLET_SITE_NAME
-IDS_FLAGS_ENABLE_SCREEN_CAPTURE_DESCRIPTION
-IDS_FLAGS_ENABLE_SCREEN_CAPTURE_NAME
 IDS_FLAGS_ENABLE_SIMPLE_CACHE_BACKEND_DESCRIPTION
 IDS_FLAGS_ENABLE_SIMPLE_CACHE_BACKEND_NAME
 IDS_FLAGS_ENABLE_SMOOTH_SCROLLING_DESCRIPTION
@ -581,10 +482,10 @@ IDS_FLAGS_ENABLE_STALE_WHILE_REVALIDATE_DESCRIPTION
 IDS_FLAGS_ENABLE_STALE_WHILE_REVALIDATE_NAME
 IDS_FLAGS_ENABLE_SUGGESTIONS_SERVICE_DESCRIPTION
 IDS_FLAGS_ENABLE_SUGGESTIONS_SERVICE_NAME
-IDS_FLAGS_ENABLE_SYNCED_NOTIFICATIONS_DESCRIPTION
-IDS_FLAGS_ENABLE_SYNCED_NOTIFICATIONS_NAME
 IDS_FLAGS_ENABLE_TCP_FAST_OPEN_DESCRIPTION
 IDS_FLAGS_ENABLE_TCP_FAST_OPEN_NAME
+IDS_FLAGS_ENABLE_THREADED_GPU_RASTERIZATION_DESCRIPTION
+IDS_FLAGS_ENABLE_THREADED_GPU_RASTERIZATION_NAME
 IDS_FLAGS_ENABLE_TOUCH_DRAG_DROP_DESCRIPTION
 IDS_FLAGS_ENABLE_TOUCH_DRAG_DROP_NAME
 IDS_FLAGS_ENABLE_TOUCH_EDITING_DESCRIPTION
@ -599,8 +500,6 @@ IDS_FLAGS_EXTENSIONS_ON_CHROME_URLS_DESCRIPTION
 IDS_FLAGS_EXTENSIONS_ON_CHROME_URLS_NAME
 IDS_FLAGS_FORCE_ACCELERATED_OVERFLOW_SCROLL_MODE_DESCRIPTION
 IDS_FLAGS_FORCE_ACCELERATED_OVERFLOW_SCROLL_MODE_NAME
-IDS_FLAGS_FORCE_HIGH_DPI_DESCRIPTION
-IDS_FLAGS_FORCE_HIGH_DPI_NAME
 IDS_FLAGS_IGNORE_GPU_BLACKLIST_DESCRIPTION
 IDS_FLAGS_IGNORE_GPU_BLACKLIST_NAME
 IDS_FLAGS_LONG_TITLE
@ -609,8 +508,8 @@ IDS_FLAGS_NACL_DEBUG_MASK_NAME
 IDS_FLAGS_NOT_AVAILABLE
 IDS_FLAGS_NO_EXPERIMENTS_AVAILABLE
 IDS_FLAGS_NO_UNSUPPORTED_EXPERIMENTS
-IDS_FLAGS_PERFORMANCE_MONITOR_GATHERING_DESCRIPTION
-IDS_FLAGS_PERFORMANCE_MONITOR_GATHERING_NAME
+IDS_FLAGS_REDUCED_REFERRER_GRANULARITY_DESCRIPTION
+IDS_FLAGS_REDUCED_REFERRER_GRANULARITY_NAME
 IDS_FLAGS_RELAUNCH_BUTTON
 IDS_FLAGS_RELAUNCH_NOTICE
 IDS_FLAGS_RESET_ALL_BUTTON
@ -626,16 +525,11 @@ IDS_FLAGS_SILENT_DEBUGGER_EXTENSION_API_DESCRIPTION
 IDS_FLAGS_SILENT_DEBUGGER_EXTENSION_API_NAME
 IDS_FLAGS_SPELLCHECK_AUTOCORRECT
 IDS_FLAGS_SPELLCHECK_AUTOCORRECT_DESCRIPTION
-IDS_FLAGS_STACKED_TAB_STRIP_DESCRIPTION
-IDS_FLAGS_STACKED_TAB_STRIP_NAME
+IDS_FLAGS_SYNC_SANDBOX_DESCRIPTION
+IDS_FLAGS_SYNC_SANDBOX_NAME
 IDS_FLAGS_TABLE_TITLE
 IDS_FLAGS_THREADED_COMPOSITING_MODE_DESCRIPTION
 IDS_FLAGS_THREADED_COMPOSITING_MODE_NAME
-IDS_FLAGS_TOUCH_SCROLLING_MODE_ABSORB_TOUCHMOVE
-IDS_FLAGS_TOUCH_SCROLLING_MODE_DESCRIPTION
-IDS_FLAGS_TOUCH_SCROLLING_MODE_NAME
-IDS_FLAGS_TOUCH_SCROLLING_MODE_SYNC_TOUCHMOVE
-IDS_FLAGS_TOUCH_SCROLLING_MODE_TOUCHCANCEL
 IDS_FLAGS_UNSUPPORTED_TABLE_TITLE
 IDS_FLAGS_WALLET_SERVICE_USE_SANDBOX_DESCRIPTION
 IDS_FLAGS_WALLET_SERVICE_USE_SANDBOX_NAME
@ -652,6 +546,7 @@ IDS_HARMFUL_V3_EXPLANATION_PARAGRAPH
 IDS_HARMFUL_V3_HEADING
 IDS_HARMFUL_V3_PRIMARY_PARAGRAPH
 IDS_HARMFUL_V3_PROCEED_PARAGRAPH
+IDS_HELPER_NAME
 IDS_HISTORY_ACTION_MENU_DESCRIPTION
 IDS_HISTORY_BLOCKED_VISIT_TEXT
 IDS_HISTORY_BROWSERESULTS
@ -659,15 +554,16 @@ IDS_HISTORY_CONTINUED
 IDS_HISTORY_DATE_WITH_RELATIVE_TIME
 IDS_HISTORY_DELETE_PRIOR_VISITS_CONFIRM_BUTTON
 IDS_HISTORY_DELETE_PRIOR_VISITS_WARNING
+IDS_HISTORY_DELETE_PRIOR_VISITS_WARNING_NO_INCOGNITO
 IDS_HISTORY_FILTER_ALLOWED
 IDS_HISTORY_FILTER_ALLOW_ITEMS
 IDS_HISTORY_FILTER_BLOCKED
 IDS_HISTORY_FILTER_BLOCK_ITEMS
+IDS_HISTORY_FOUND_SEARCH_RESULTS
 IDS_HISTORY_HAS_SYNCED_RESULTS
 IDS_HISTORY_INTERVAL
 IDS_HISTORY_IN_CONTENT_PACK
 IDS_HISTORY_LOADING
-IDS_HISTORY_LOCK_BUTTON
 IDS_HISTORY_MORE_FROM_SITE
 IDS_HISTORY_NEWER
 IDS_HISTORY_NEWEST
@ -677,6 +573,7 @@ IDS_HISTORY_NO_SYNCED_RESULTS
 IDS_HISTORY_NUMBER_VISITS
 IDS_HISTORY_OLDER
 IDS_HISTORY_OPEN_CLEAR_BROWSING_DATA_DIALOG
+IDS_HISTORY_OTHER_DEVICES_X_MORE
 IDS_HISTORY_OTHER_SESSIONS_COLLAPSE_SESSION
 IDS_HISTORY_OTHER_SESSIONS_EXPAND_SESSION
 IDS_HISTORY_OTHER_SESSIONS_OPEN_ALL
@ -692,21 +589,17 @@ IDS_HISTORY_REMOVE_PAGE
 IDS_HISTORY_REMOVE_SELECTED_ITEMS
 IDS_HISTORY_SEARCHRESULTSFOR
 IDS_HISTORY_SEARCH_BUTTON
+IDS_HISTORY_SEARCH_RESULT
+IDS_HISTORY_SEARCH_RESULTS
 IDS_HISTORY_TITLE
 IDS_HISTORY_UNKNOWN_DEVICE
-IDS_HISTORY_UNLOCK_BUTTON
 IDS_HTTP_POST_WARNING
 IDS_HTTP_POST_WARNING_RESEND
 IDS_HTTP_POST_WARNING_TITLE
 IDS_IMPORT_FROM_FIREFOX
 IDS_IMPORT_FROM_ICEWEASEL
-IDS_JAVASCRIPT_ALERT_DEFAULT_TITLE
-IDS_JAVASCRIPT_ALERT_TITLE
-IDS_JAVASCRIPT_MESSAGEBOX_DEFAULT_TITLE
-IDS_JAVASCRIPT_MESSAGEBOX_TITLE
-IDS_KEYWORD_SEARCH
-IDS_LEARN_MORE
 IDS_LEGACY_DEFAULT_PROFILE_NAME
+IDS_LEGACY_SUPERVISED_USER_NEW_AVATAR_LABEL
 IDS_LIBADDRESSINPUT_ADDRESS_LINE_1_LABEL
 IDS_LIBADDRESSINPUT_AREA
 IDS_LIBADDRESSINPUT_COUNTRY_OR_REGION_LABEL
@ -748,7 +641,6 @@ IDS_LIBADDRESSINPUT_UNRECOGNIZED_FORMAT_ZIP_CODE_EXAMPLE
 IDS_LIBADDRESSINPUT_UNRECOGNIZED_FORMAT_ZIP_CODE_EXAMPLE_AND_URL
 IDS_LIBADDRESSINPUT_VILLAGE_TOWNSHIP
 IDS_LIBADDRESSINPUT_ZIP_CODE_LABEL
-IDS_LINK_FROM_CLIPBOARD
 IDS_LOGIN_DIALOG_OK_BUTTON_LABEL
 IDS_LOGIN_DIALOG_PASSWORD_FIELD
 IDS_LOGIN_DIALOG_TITLE
@ -765,7 +657,6 @@ IDS_MALWARE_V3_PRIMARY_PARAGRAPH
 IDS_MALWARE_V3_PROCEED_PARAGRAPH
 IDS_MALWARE_V3_PROCEED_PARAGRAPH_NOT_RECOMMEND
 IDS_MALWARE_V3_PROCEED_PARAGRAPH_SOCIAL
-IDS_MANAGED_USER_AVATAR_LABEL
 IDS_MIDI_SYSEX_INFOBAR_QUESTION
 IDS_MIDI_SYSEX_PERMISSION_FRAGMENT
 IDS_MOBILE_WELCOME_URL
@ -779,7 +670,6 @@ IDS_NEW_INCOGNITO_WINDOW_MAC
 IDS_NEW_NUMBERED_PROFILE_NAME
 IDS_NEW_TAB_CHROME_WELCOME_PAGE_TITLE
 IDS_NEW_TAB_MOST_VISITED
-IDS_NEW_TAB_RECENTLY_CLOSED
 IDS_NEW_TAB_RESTORE_THUMBNAILS_SHORT_LINK
 IDS_NEW_TAB_THUMBNAIL_REMOVED_NOTIFICATION
 IDS_NEW_TAB_TITLE
@ -795,10 +685,7 @@ IDS_OPTIONS_DISABLE_WEB_SERVICES
 IDS_OPTIONS_ENABLE_LOGGING
 IDS_OPTIONS_IMPROVE_BROWSING_EXPERIENCE
 IDS_OPTIONS_PROXIES_CONFIGURE_BUTTON
-IDS_OTHER_DEVICES_X_MORE
-IDS_PAGEINFO_ADDRESS
 IDS_PAGEINFO_CERT_INFO_BUTTON
-IDS_PAGEINFO_PARTIAL_ADDRESS
 IDS_PAGE_INFO_HELP_CENTER_LINK
 IDS_PAGE_INFO_INTERNAL_PAGE
 IDS_PAGE_INFO_SECURITY_BUTTON_ACCESSIBILITY_LABEL
@ -810,13 +697,11 @@ IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_SENTENCE_LINK
 IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTION_DETAILS
 IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTION_DETAILS_AEAD
 IDS_PAGE_INFO_SECURITY_TAB_FALLBACK_MESSAGE
-IDS_PAGE_INFO_SECURITY_TAB_FIRST_VISITED_TODAY
 IDS_PAGE_INFO_SECURITY_TAB_INSECURE_IDENTITY
 IDS_PAGE_INFO_SECURITY_TAB_NON_UNIQUE_NAME
 IDS_PAGE_INFO_SECURITY_TAB_NOT_ENCRYPTED_CONNECTION_TEXT
 IDS_PAGE_INFO_SECURITY_TAB_NO_REVOCATION_MECHANISM
 IDS_PAGE_INFO_SECURITY_TAB_RENEGOTIATION_MESSAGE
-IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_EV_NO_CT
 IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_NO_CT
 IDS_PAGE_INFO_SECURITY_TAB_SSL_VERSION
 IDS_PAGE_INFO_SECURITY_TAB_UNABLE_TO_CHECK_REVOCATION
@ -825,9 +710,10 @@ IDS_PAGE_INFO_SECURITY_TAB_WEAK_ENCRYPTION_CONNECTION_TEXT
 IDS_PASSWORDS_EXCEPTIONS_TAB_TITLE
 IDS_PASSWORDS_SHOW_PASSWORDS_TAB_TITLE
 IDS_PASSWORD_MANAGER_BLACKLIST_BUTTON
-IDS_PASSWORD_MANAGER_EMPTY_LOGIN
 IDS_PASSWORD_MANAGER_SAVE_BUTTON
-IDS_PASSWORD_MANAGER_SAVE_PASSWORD_PROMPT
+IDS_PASSWORD_MANAGER_SAVE_PASSWORD_SMART_LOCK_NO_THANKS_BUTTON
+IDS_PASSWORD_MANAGER_SMART_LOCK
+IDS_PASSWORD_MANAGER_SMART_LOCK_PAGE
 IDS_PAST_TIME_TODAY
 IDS_PAST_TIME_YESTERDAY
 IDS_PDF_INFOBAR_ALWAYS_USE_READER_BUTTON
@ -837,109 +723,13 @@ IDS_PHISHING_V3_EXPLANATION_PARAGRAPH
 IDS_PHISHING_V3_HEADING
 IDS_PHISHING_V3_PRIMARY_PARAGRAPH
 IDS_PHISHING_V3_PROCEED_PARAGRAPH
+IDS_PHISHING_V4_HEADING
+IDS_PHISHING_V4_PRIMARY_PARAGRAPH
+IDS_PHISHING_V4_PROCEED_AND_REPORT_PARAGRAPH
 IDS_PLATFORM_LABEL
 IDS_PLUGIN_CONFIRM_INSTALL_DIALOG_ACCEPT_BUTTON
 IDS_PLUGIN_CONFIRM_INSTALL_DIALOG_TITLE
 IDS_PLUGIN_NOT_SUPPORTED
-IDS_POLICY_ASSOCIATION_STATE_ACTIVE
-IDS_POLICY_ASSOCIATION_STATE_DEPROVISIONED
-IDS_POLICY_ASSOCIATION_STATE_UNMANAGED
-IDS_POLICY_DEFAULT_SEARCH_DISABLED
-IDS_POLICY_DEPRECATED
-IDS_POLICY_DM_STATUS_HTTP_STATUS_ERROR
-IDS_POLICY_DM_STATUS_REQUEST_FAILED
-IDS_POLICY_DM_STATUS_REQUEST_INVALID
-IDS_POLICY_DM_STATUS_RESPONSE_DECODING_ERROR
-IDS_POLICY_DM_STATUS_SERVICE_ACTIVATION_PENDING
-IDS_POLICY_DM_STATUS_SERVICE_DEPROVISIONED
-IDS_POLICY_DM_STATUS_SERVICE_DEVICE_ID_CONFLICT
-IDS_POLICY_DM_STATUS_SERVICE_DEVICE_NOT_FOUND
-IDS_POLICY_DM_STATUS_SERVICE_DOMAIN_MISMATCH
-IDS_POLICY_DM_STATUS_SERVICE_INVALID_SERIAL_NUMBER
-IDS_POLICY_DM_STATUS_SERVICE_MANAGEMENT_NOT_SUPPORTED
-IDS_POLICY_DM_STATUS_SERVICE_MANAGEMENT_TOKEN_INVALID
-IDS_POLICY_DM_STATUS_SERVICE_MISSING_LICENSES
-IDS_POLICY_DM_STATUS_SERVICE_POLICY_NOT_FOUND
-IDS_POLICY_DM_STATUS_SUCCESS
-IDS_POLICY_DM_STATUS_TEMPORARY_UNAVAILABLE
-IDS_POLICY_DM_STATUS_UNKNOWN_ERROR
-IDS_POLICY_FILTER_PLACEHOLDER
-IDS_POLICY_HEADER_LEVEL
-IDS_POLICY_HEADER_NAME
-IDS_POLICY_HEADER_SCOPE
-IDS_POLICY_HEADER_SOURCE
-IDS_POLICY_HEADER_STATUS
-IDS_POLICY_HEADER_VALUE
-IDS_POLICY_HIDE_EXPANDED_VALUE
-IDS_POLICY_INVALID_BOOKMARK
-IDS_POLICY_INVALID_PROXY_MODE_ERROR
-IDS_POLICY_INVALID_SEARCH_URL_ERROR
-IDS_POLICY_LABEL_ASSET_ID
-IDS_POLICY_LABEL_CLIENT_ID
-IDS_POLICY_LABEL_DIRECTORY_API_ID
-IDS_POLICY_LABEL_DOMAIN
-IDS_POLICY_LABEL_LOCATION
-IDS_POLICY_LABEL_REFRESH_INTERVAL
-IDS_POLICY_LABEL_STATUS
-IDS_POLICY_LABEL_TIME_SINCE_LAST_REFRESH
-IDS_POLICY_LABEL_USERNAME
-IDS_POLICY_LEVEL_ERROR
-IDS_POLICY_LEVEL_MANDATORY
-IDS_POLICY_LEVEL_RECOMMENDED
-IDS_POLICY_LIST_ENTRY_ERROR
-IDS_POLICY_NEVER_FETCHED
-IDS_POLICY_NOT_SPECIFIED
-IDS_POLICY_NOT_SPECIFIED_ERROR
-IDS_POLICY_NO_POLICIES_SET
-IDS_POLICY_OK
-IDS_POLICY_OUT_OF_RANGE_ERROR
-IDS_POLICY_OVERRIDDEN
-IDS_POLICY_PROXY_BOTH_SPECIFIED_ERROR
-IDS_POLICY_PROXY_MODE_AUTO_DETECT_ERROR
-IDS_POLICY_PROXY_MODE_DISABLED_ERROR
-IDS_POLICY_PROXY_MODE_FIXED_SERVERS_ERROR
-IDS_POLICY_PROXY_MODE_PAC_URL_ERROR
-IDS_POLICY_PROXY_MODE_SYSTEM_ERROR
-IDS_POLICY_PROXY_NEITHER_SPECIFIED_ERROR
-IDS_POLICY_RELOAD_POLICIES
-IDS_POLICY_SCHEMA_VALIDATION_ERROR
-IDS_POLICY_SCOPE_DEVICE
-IDS_POLICY_SCOPE_USER
-IDS_POLICY_SHOW_EXPANDED_VALUE
-IDS_POLICY_SHOW_UNSET
-IDS_POLICY_SOURCE_CLOUD
-IDS_POLICY_SOURCE_ENTERPRISE_DEFAULT
-IDS_POLICY_SOURCE_ENTERPRISE_OVERRIDE
-IDS_POLICY_SOURCE_PLATFORM
-IDS_POLICY_STATUS
-IDS_POLICY_STATUS_DEVICE
-IDS_POLICY_STATUS_USER
-IDS_POLICY_STORE_STATUS_BAD_STATE
-IDS_POLICY_STORE_STATUS_LOAD_ERROR
-IDS_POLICY_STORE_STATUS_OK
-IDS_POLICY_STORE_STATUS_PARSE_ERROR
-IDS_POLICY_STORE_STATUS_SERIALIZE_ERROR
-IDS_POLICY_STORE_STATUS_STORE_ERROR
-IDS_POLICY_STORE_STATUS_UNKNOWN_ERROR
-IDS_POLICY_STORE_STATUS_VALIDATION_ERROR
-IDS_POLICY_SUBKEY_ERROR
-IDS_POLICY_TITLE
-IDS_POLICY_TYPE_ERROR
-IDS_POLICY_UNKNOWN
-IDS_POLICY_UNSET
-IDS_POLICY_VALIDATION_BAD_INITIAL_SIGNATURE
-IDS_POLICY_VALIDATION_BAD_KEY_VERIFICATION_SIGNATURE
-IDS_POLICY_VALIDATION_BAD_SIGNATURE
-IDS_POLICY_VALIDATION_BAD_TIMESTAMP
-IDS_POLICY_VALIDATION_BAD_USERNAME
-IDS_POLICY_VALIDATION_ERROR_CODE_PRESENT
-IDS_POLICY_VALIDATION_OK
-IDS_POLICY_VALIDATION_PAYLOAD_PARSE_ERROR
-IDS_POLICY_VALIDATION_POLICY_PARSE_ERROR
-IDS_POLICY_VALIDATION_UNKNOWN_ERROR
-IDS_POLICY_VALIDATION_WRONG_POLICY_TYPE
-IDS_POLICY_VALIDATION_WRONG_SETTINGS_ENTITY_ID
-IDS_POLICY_VALIDATION_WRONG_TOKEN
 IDS_PREFERENCES_CORRUPT_ERROR
 IDS_PREFERENCES_UNREADABLE_ERROR
 IDS_PRINT
@ -949,9 +739,11 @@ IDS_PROFILES_GUEST_PROFILE_NAME
 IDS_PROFILES_LOCAL_PROFILE_STATE
 IDS_PROFILE_TOO_NEW_ERROR
 IDS_PUSH_MESSAGES_BUBBLE_FRAGMENT
-IDS_PUSH_MESSAGES_BUBBLE_TEXT
 IDS_PUSH_MESSAGES_PERMISSION_QUESTION
+IDS_RECENTLY_CLOSED
 IDS_RECENT_TABS_MENU
+IDS_SAD_TAB_HELP_LINK
+IDS_SAD_TAB_HELP_MESSAGE
 IDS_SAD_TAB_MESSAGE
 IDS_SAD_TAB_RELOAD_LABEL
 IDS_SAD_TAB_TITLE
@ -959,95 +751,36 @@ IDS_SAFEBROWSING_OVERRIDABLE_SAFETY_BUTTON
 IDS_SAFEBROWSING_V3_CLOSE_DETAILS_BUTTON
 IDS_SAFEBROWSING_V3_OPEN_DETAILS_BUTTON
 IDS_SAFEBROWSING_V3_TITLE
-IDS_SAFE_BROWSING_MALWARE_BACK_BUTTON
-IDS_SAFE_BROWSING_MALWARE_BACK_HEADLINE
-IDS_SAFE_BROWSING_MALWARE_COLLAB_HEADLINE
-IDS_SAFE_BROWSING_MALWARE_DIAGNOSTIC_PAGE
-IDS_SAFE_BROWSING_MALWARE_FEAR_HEADLINE
-IDS_SAFE_BROWSING_MALWARE_HEADLINE
-IDS_SAFE_BROWSING_MALWARE_LABEL
-IDS_SAFE_BROWSING_MALWARE_QUESTION_HEADLINE
 IDS_SAFE_BROWSING_MALWARE_REPORTING_AGREE
-IDS_SAFE_BROWSING_MALWARE_TITLE
-IDS_SAFE_BROWSING_MALWARE_V2_DESCRIPTION1
-IDS_SAFE_BROWSING_MALWARE_V2_DESCRIPTION1_SUBRESOURCE
-IDS_SAFE_BROWSING_MALWARE_V2_DESCRIPTION2
-IDS_SAFE_BROWSING_MALWARE_V2_DESCRIPTION2_SUBRESOURCE
-IDS_SAFE_BROWSING_MALWARE_V2_DESCRIPTION3
-IDS_SAFE_BROWSING_MALWARE_V2_DETAILS
-IDS_SAFE_BROWSING_MALWARE_V2_DETAILS_SUBRESOURCE
-IDS_SAFE_BROWSING_MALWARE_V2_HEADLINE
-IDS_SAFE_BROWSING_MALWARE_V2_HEADLINE_SUBRESOURCE
-IDS_SAFE_BROWSING_MALWARE_V2_LEARN_MORE
-IDS_SAFE_BROWSING_MALWARE_V2_PROCEED_LINK
-IDS_SAFE_BROWSING_MALWARE_V2_REPORTING_AGREE
-IDS_SAFE_BROWSING_MALWARE_V2_SEE_MORE
-IDS_SAFE_BROWSING_MALWARE_V2_TITLE
-IDS_SAFE_BROWSING_MULTI_MALWARE_DESCRIPTION1
-IDS_SAFE_BROWSING_MULTI_MALWARE_DESCRIPTION2
-IDS_SAFE_BROWSING_MULTI_MALWARE_DESCRIPTION3
-IDS_SAFE_BROWSING_MULTI_MALWARE_DESCRIPTION_AGREE
-IDS_SAFE_BROWSING_MULTI_MALWARE_PROCEED_BUTTON
-IDS_SAFE_BROWSING_MULTI_PHISHING_DESCRIPTION1
-IDS_SAFE_BROWSING_MULTI_THREAT_DESCRIPTION1
-IDS_SAFE_BROWSING_MULTI_THREAT_DESCRIPTION2
-IDS_SAFE_BROWSING_MULTI_THREAT_TITLE
-IDS_SAFE_BROWSING_PHISHING_BACK_HEADLINE
-IDS_SAFE_BROWSING_PHISHING_COLLAB_HEADLINE
-IDS_SAFE_BROWSING_PHISHING_FEAR_HEADLINE
-IDS_SAFE_BROWSING_PHISHING_HEADLINE
-IDS_SAFE_BROWSING_PHISHING_LABEL
-IDS_SAFE_BROWSING_PHISHING_QUESTION_HEADLINE
-IDS_SAFE_BROWSING_PHISHING_REPORT_ERROR
-IDS_SAFE_BROWSING_PHISHING_TITLE
-IDS_SAFE_BROWSING_PHISHING_V2_DESCRIPTION1
-IDS_SAFE_BROWSING_PHISHING_V2_DESCRIPTION2
-IDS_SAFE_BROWSING_PHISHING_V2_HEADLINE
-IDS_SAFE_BROWSING_PHISHING_V2_REPORT_ERROR
-IDS_SAFE_BROWSING_PHISHING_V2_TITLE
 IDS_SAFE_BROWSING_PRIVACY_POLICY_PAGE
-IDS_SAFE_BROWSING_PRIVACY_POLICY_PAGE_V2
 IDS_SAFE_BROWSING_PRIVACY_POLICY_URL
 IDS_SAVE
+IDS_SAVE_PASSWORD
+IDS_SAVE_PASSWORD_TITLE_BRAND
 IDS_SEARCH_BOX_EMPTY_HINT
 IDS_SECURE_CONNECTION_EV
 IDS_SESSION_CRASHED_VIEW_MESSAGE
 IDS_SESSION_CRASHED_VIEW_RESTORE_BUTTON
 IDS_SETTINGS_SHOW_ADVANCED_SETTINGS
 IDS_SHORT_PRODUCT_NAME
+IDS_SHOWFULLHISTORY_LINK
 IDS_SHOW_HISTORY
 IDS_SIGNED_IN_WITH_SYNC_DISABLED
 IDS_SIGNED_IN_WITH_SYNC_SUPPRESSED
 IDS_SIGNIN_ERROR_BUBBLE_VIEW_TITLE
 IDS_SINGLE_PROFILE_DISPLAY_NAME
-IDS_SSL_CLOCK_ERROR
-IDS_SSL_CLOCK_ERROR_EXPLANATION
 IDS_SSL_NONOVERRIDABLE_HSTS
 IDS_SSL_NONOVERRIDABLE_INVALID
 IDS_SSL_NONOVERRIDABLE_MORE
 IDS_SSL_NONOVERRIDABLE_MORE_INVALID_SP3
 IDS_SSL_NONOVERRIDABLE_PINNED
 IDS_SSL_NONOVERRIDABLE_REVOKED
-IDS_SSL_OVERRIDABLE_PRIMARY_PARAGRAPH
-IDS_SSL_OVERRIDABLE_PROCEED_LINK_TEXT
 IDS_SSL_OVERRIDABLE_PROCEED_PARAGRAPH
 IDS_SSL_OVERRIDABLE_SAFETY_BUTTON
-IDS_SSL_OVERRIDABLE_TITLE
 IDS_SSL_RELOAD
-IDS_SSL_V2_CLOCK_AHEAD_HEADING
-IDS_SSL_V2_CLOCK_BEHIND_HEADING
-IDS_SSL_V2_CLOCK_PRIMARY_PARAGRAPH
-IDS_SSL_V2_CLOCK_TITLE
-IDS_SSL_V2_CLOCK_UPDATE_DATE_AND_TIME
-IDS_SSL_V2_CLOSE_DETAILS_BUTTON
 IDS_SSL_V2_HEADING
-IDS_SSL_V2_OPEN_DETAILS_BUTTON
 IDS_SSL_V2_PRIMARY_PARAGRAPH
 IDS_SSL_V2_TITLE
-IDS_STARS_PROMO_LABEL_IOS
-IDS_SUPERVISED_USER_AVATAR_LABEL
-IDS_SUPERVISED_USER_NEW_AVATAR_LABEL
-IDS_SYNC_ACCOUNT_DETAILS_NOT_ENTERED
 IDS_SYNC_ACCOUNT_SYNCING_TO_USER
 IDS_SYNC_ACCOUNT_SYNCING_TO_USER_WITH_MANAGE_LINK
 IDS_SYNC_AUTHENTICATING_LABEL
@ -1066,7 +799,6 @@ IDS_SYNC_ENCRYPTION_SECTION_TITLE
 IDS_SYNC_ENTER_GOOGLE_PASSPHRASE_BODY
 IDS_SYNC_ENTER_PASSPHRASE_BODY
 IDS_SYNC_ENTER_PASSPHRASE_BODY_WITH_DATE
-IDS_SYNC_ENTER_PASSPHRASE_TITLE
 IDS_SYNC_ERROR_BUBBLE_VIEW_TITLE
 IDS_SYNC_ERROR_SIGNING_IN
 IDS_SYNC_FULL_ENCRYPTION_DATA
@ -1077,7 +809,6 @@ IDS_SYNC_MENU_PRE_SYNCED_LABEL
 IDS_SYNC_MENU_SYNCED_LABEL
 IDS_SYNC_NTP_PASSWORD_ENABLE
 IDS_SYNC_NTP_PASSWORD_PROMO
-IDS_SYNC_NTP_PASSWORD_PROMO,
 IDS_SYNC_NTP_SETUP_IN_PROGRESS
 IDS_SYNC_OPTIONS_GROUP_NAME
 IDS_SYNC_OTHER_SIGN_IN_ERROR_BUBBLE_VIEW_MESSAGE
@ -1134,28 +865,6 @@ IDS_TIME_SECS
 IDS_TOOLTIP_STAR
 IDS_TOUCH_EVENTS_DESCRIPTION
 IDS_TOUCH_EVENTS_NAME
-IDS_TRANSLATE_INFOBAR_ACCEPT
-IDS_TRANSLATE_INFOBAR_AFTER_MESSAGE
-IDS_TRANSLATE_INFOBAR_AFTER_MESSAGE_AUTODETERMINED_SOURCE_LANGUAGE
-IDS_TRANSLATE_INFOBAR_ALWAYS_TRANSLATE
-IDS_TRANSLATE_INFOBAR_BEFORE_MESSAGE
-IDS_TRANSLATE_INFOBAR_BEFORE_MESSAGE_IOS
-IDS_TRANSLATE_INFOBAR_DENY
-IDS_TRANSLATE_INFOBAR_ERROR_CANT_CONNECT
-IDS_TRANSLATE_INFOBAR_ERROR_CANT_TRANSLATE
-IDS_TRANSLATE_INFOBAR_ERROR_SAME_LANGUAGE
-IDS_TRANSLATE_INFOBAR_NEVER_MESSAGE_IOS
-IDS_TRANSLATE_INFOBAR_NEVER_TRANSLATE
-IDS_TRANSLATE_INFOBAR_OPTIONS_ABOUT
-IDS_TRANSLATE_INFOBAR_OPTIONS_ALWAYS
-IDS_TRANSLATE_INFOBAR_OPTIONS_NEVER_TRANSLATE_LANG
-IDS_TRANSLATE_INFOBAR_OPTIONS_NEVER_TRANSLATE_SITE
-IDS_TRANSLATE_INFOBAR_OPTIONS_REPORT_ERROR
-IDS_TRANSLATE_INFOBAR_RETRY
-IDS_TRANSLATE_INFOBAR_REVERT
-IDS_TRANSLATE_INFOBAR_TRANSLATING_TO
-IDS_TRANSLATE_INFOBAR_UNKNOWN_PAGE_LANGUAGE
-IDS_TRANSLATE_INFOBAR_UNSUPPORTED_PAGE_LANGUAGE
 IDS_UPGRADE_AVAILABLE
 IDS_UPGRADE_AVAILABLE_BUTTON
 IDS_WEB_FONT_FAMILY
--- a/secondary/tools/grit/grit_rule.gni
+++ b/secondary/tools/grit/grit_rule.gni
@ -188,10 +188,6 @@ if (is_ios) {
  grit_defines += [
    "-t",
    "ios",
-
-    # iOS uses a whitelist to filter resources.
-    "-w",
-    rebase_path("//build/ios/grit_whitelist.txt", root_build_dir),
  ]
 }