BASELINE: Update Chromium to 85.0.4183.14085-based

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

3 files changed, 357 insertions, 258 deletions

diff --git a/chromium/tools/gritsettings/resource_ids.spec b/chromium/tools/gritsettings/resource_ids.spec
index 535829b4eed..fa2306ead7d 100644
--- a/chromium/tools/gritsettings/resource_ids.spec
+++ b/chromium/tools/gritsettings/resource_ids.spec
@@ -113,13 +113,6 @@
   "chrome/browser/resources/bookmarks/bookmarks_resources_vulcanized.grd": {
     "includes": [1300],
   },
-  "chrome/browser/resources/chromeos/camera/camera_resources.grd": {
-    "includes": [1320],
-    "structures": [1340],
-  },
-  "chrome/browser/resources/chromeos/camera/src/strings/camera_strings.grd": {
-    "messages": [1360],
-  },
   "chrome/browser/resources/chromeos/cellular_setup/cellular_setup_resources.grd": {
     "structures": [1380],
   },
@@ -153,106 +146,140 @@
   "chrome/browser/resources/local_ntp/local_ntp_resources.grd": {
     "includes": [1620],
   },
+  "chrome/browser/resources/nearby_internals/nearby_internals_resources.grd": {
+    "includes": [1630],
+  },
+  "chrome/browser/resources/nearby_share/nearby_share_dialog_resources.grd": {
+    "includes": [1650],
+  },
   "chrome/browser/resources/new_tab_page/new_tab_page_resources_vulcanized.grd": {
-    "includes": [1640],
+    "includes": [1660],
   },
   "chrome/browser/resources/new_tab_page/new_tab_page_resources.grd": {
-    "includes": [1660],
+    "includes": [1680],
   },
   "chrome/browser/resources/print_preview/print_preview_resources_vulcanized.grd": {
-    "includes": [1680],
+    "includes": [1700],
   },
   "chrome/browser/resources/print_preview/print_preview_resources.grd": {
-    "includes": [1700],
-    "structures": [1720],
+    "includes": [1720],
+    "structures": [1740],
+  },
+  "chrome/browser/resources/print_preview/print_preview_pdf_resources.grd": {
+    "includes": [1750],
   },
   "chrome/browser/resources/settings/os_settings_resources_vulcanized.grd": {
-    "includes": [1740],
+    "includes": [1760],
   },
   "chrome/browser/resources/settings/os_settings_resources.grd": {
-    "includes": [1760],
-    "structures": [1780],
+    "includes": [1780],
+    "structures": [1800],
   },
   "chrome/browser/resources/settings/settings_resources_vulcanized.grd": {
-    "includes": [1800],
+    "includes": [1820],
   },
   "chrome/browser/resources/settings/settings_resources.grd": {
-    "includes": [1810],
-    "structures": [1820],
+    "includes": [1830],
+    "structures": [1840],
   },
   "chrome/browser/resources/signin/profile_picker/profile_picker_resources.grd": {
-    "structures": [1840],
+    "includes": [1860],
+    "structures": [1870],
   },
   "chrome/browser/resources/tab_strip/tab_strip_resources.grd": {
-    "structures": [1860],
-    "includes": [1880],
+    "structures": [1880],
+    "includes": [1900],
   },
   "chrome/browser/resources/welcome/welcome_resources.grd": {
-    "includes": [1900],
-    "structures": [1920],
+    "includes": [1920],
+    "structures": [1940],
   },
   "chrome/browser/supervised_user/supervised_user_unscaled_resources.grd": {
-    "includes": [1930],
+    "includes": [1950],
   },
   "chrome/browser/test_dummy/internal/android/resources/resources.grd": {
-    "includes": [1940],
+    "includes": [1960],
   },
   "chrome/browser/vr/testapp/vr_testapp_resources.grd": {
-    "includes": [1950],
+    "includes": [1970],
   },
   # END chrome/browser section.
 
   # START chrome/ WebUI resources section
-  "chrome/browser/media/kaleidoscope/internal/kaleidoscope_resources.grd": {
+  # Both the kaleidoscope_resources.grd and kaleidoscope_internal_resources.grd
+  # start with the same id because only one of them is built based on whether
+  # src-internal is available.
+  "chrome/browser/media/kaleidoscope/kaleidoscope_resources.grd": {
+    # Big alignment at start of section.
+    "META": {"align": 100},
+    "includes": [2000],
+  },
+  "chrome/browser/media/kaleidoscope/kaleidoscope_internal_resources.grd": {
     # Big alignment at start of section.
     "META": {"align": 100},
     "includes": [2000],
-    "messages": [2010],
+  },
+  # The internal version of kaleidoscope_resources.grd will be removed in a
+  # follow up. It is only here to avoid build breakages.
+  "chrome/browser/media/kaleidoscope/internal/kaleidoscope_resources.grd": {
+    "META": {"sizes": {"includes": [50],}},  # Relies on src-internal.
+    "includes": [2010],
+  },
+  "chrome/browser/media/kaleidoscope/internal/kaleidoscope_strings.grd": {
+    "META": {"sizes": {"messages": [50]}, "join": 2},  # Relies on src-internal.
+    "messages": [2015],
   },
   "chrome/browser/resources/bluetooth_internals/resources.grd": {
     "includes": [2020],
   },
-  "chrome/browser/resources/gaia_auth_host/gaia_auth_host_resources.grd": {
+    "chrome/browser/resources/chromeos/bluetooth_pairing_dialog/bluetooth_pairing_dialog_resources.grd": {
     "includes": [2030],
+    "structures": [2050],
+  },
+  "chrome/browser/resources/chromeos/bluetooth_pairing_dialog/bluetooth_pairing_dialog_resources_vulcanized.grd": {
+    "includes": [2070],
+  },
+  "chrome/browser/resources/gaia_auth_host/gaia_auth_host_resources.grd": {
+    "includes": [2080],
   },
   "chrome/browser/resources/invalidations/invalidations_resources.grd": {
-    "includes": [2040],
+    "includes": [2090],
   },
   "chrome/browser/resources/media/webrtc_logs_resources.grd": {
-    "includes": [2060],
+    "includes": [2100],
   },
   "chrome/browser/resources/net_internals/net_internals_resources.grd": {
-    "includes": [2080],
+    "includes": [2120],
   },
   "chrome/browser/resources/omnibox/resources.grd": {
-    "includes": [2100],
+    "includes": [2140],
   },
   "chrome/browser/resources/quota_internals/quota_internals_resources.grd": {
-    "includes": [2120],
+    "includes": [2160],
   },
   "chrome/browser/resources/sync_file_system_internals/sync_file_system_internals_resources.grd": {
-    "includes": [2140],
+    "includes": [2180],
   },
   "chrome/browser/resources/usb_internals/resources.grd": {
-    "includes": [2160],
+    "includes": [2200],
   },
   "chrome/browser/resources/webapks/webapks_ui_resources.grd": {
-    "includes": [2180],
+    "includes": [2220],
   },
   "components/sync/driver/resources.grd": {
-    "includes": [2200],
+    "includes": [2240],
   },
   "components/resources/dev_ui_components_resources.grd": {
-    "includes": [2210],
+    "includes": [2260],
   },
   "content/browser/resources/media/media_internals_resources.grd": {
-    "includes": [2220],
+    "includes": [2270],
   },
   "content/browser/webrtc/resources/resources.grd": {
-    "includes": [2240],
+    "includes": [2280],
   },
   "content/dev_ui_content_resources.grd": {
-    "includes": [2250],
+    "includes": [2300],
   },
   # END chrome/ WebUI resources section
 
@@ -281,6 +308,13 @@
     "META": {"align": 100},
     "messages": [2500],
   },
+  "chromeos/components/camera_app_ui/resources/camera_app_resources.grd": {
+    "includes": [2505],
+    "structures": [2510],
+  },
+  "chromeos/components/camera_app_ui/resources/src/strings/camera_strings.grd": {
+    "messages": [2515],
+  },
   "chromeos/components/help_app_ui/resources/help_app_resources.grd": {
     "includes": [2520],
   },
@@ -304,7 +338,7 @@
   # start with the same id because only one of them is built depending on if
   # src_internal is available. Lower bound for number of resource ids is number
   # of languages (74).
-  "chromeos/components/media_app_ui/resources/pkg/media_app_bundle_resources.grd": {
+  "chromeos/components/media_app_ui/resources/prod/media_app_bundle_resources.grd": {
     "META": {"sizes": {"includes": [120],}},  # Relies on src-internal.
     "includes": [2580],
   },
@@ -319,6 +353,9 @@
   "chromeos/components/sample_system_web_app_ui/resources/sample_system_web_app_resources.grd": {
     "includes": [2640],
   },
+  "chromeos/components/telemetry_extension_ui/resources/telemetry_extension_resources.grd": {
+    "includes": [2650],
+  },
   "chromeos/resources/chromeos_resources.grd": {
     "includes": [2660],
   },
@@ -474,7 +511,7 @@
   "ash/ash_strings.grd": {
     "messages": [3060],
   },
-  "ash/shortcut_viewer/ash_components_strings.grd": {
+  "ash/shortcut_viewer/shortcut_viewer_strings.grd": {
     "messages": [3080],
   },
   "ash/keyboard/ui/keyboard_resources.grd": {
@@ -539,7 +576,9 @@
   "services/services_strings.grd": {
     "messages": [3460],
   },
-
+  "skia/skia_resources.grd": {
+    "includes": [3470],
+  },
   "third_party/blink/public/blink_image_resources.grd": {
     "structures": [3480],
   },
@@ -600,10 +639,16 @@
 
   # This file is generated during the build.
   "<(SHARED_INTERMEDIATE_DIR)/devtools/devtools_resources.grd": {
-    "META": {"sizes": {"includes": [500],}},
+    "META": {"sizes": {"includes": [1000],}},
     "includes": [3860],
   },
 
+  # This file is generated during the build.
+  "<(SHARED_INTERMEDIATE_DIR)/resources/inspector_overlay/inspector_overlay_resources.grd": {
+    "META": {"sizes": {"includes": [50],}},
+    "includes": [3880],
+  },
+
   # END "everything else" section.
   # Everything but chrome/, components/, content/, and ios/
 
diff --git a/chromium/tools/gritsettings/startup_resources_win.txt b/chromium/tools/gritsettings/startup_resources_win.txt
index 5588a0c3252..f1dfce7431c 100644
--- a/chromium/tools/gritsettings/startup_resources_win.txt
+++ b/chromium/tools/gritsettings/startup_resources_win.txt
@@ -1,210 +1,264 @@
-IDS_DEFAULT_PROFILE_NAME 101
-IDS_LEGACY_DEFAULT_PROFILE_NAME 102
-IDR_MOJO_CONTENT_BROWSER_MANIFEST 103
-IDR_CHROME_CONTENT_BROWSER_MANIFEST_OVERLAY 104
-IDR_MOJO_CONTENT_GPU_MANIFEST 105
-IDR_CHROME_CONTENT_GPU_MANIFEST_OVERLAY 106
-IDR_MOJO_CONTENT_PACKAGED_SERVICES_MANIFEST 107
-IDR_CHROME_CONTENT_PACKAGED_SERVICES_MANIFEST_OVERLAY 108
-IDR_MOJO_CONTENT_PLUGIN_MANIFEST 109
-IDR_CHROME_CONTENT_PLUGIN_MANIFEST_OVERLAY 110
-IDR_MOJO_CONTENT_RENDERER_MANIFEST 111
-IDR_CHROME_CONTENT_RENDERER_MANIFEST_OVERLAY 112
-IDR_MOJO_CONTENT_UTILITY_MANIFEST 113
-IDR_CHROME_CONTENT_UTILITY_MANIFEST_OVERLAY 114
-IDR_MOJO_CATALOG_MANIFEST 115
-IDR_NACL_LOADER_MANIFEST 116
-IDR_NACL_BROKER_MANIFEST 117
-IDR_PRINT_COMPOSITOR_MANIFEST 118
-IDR_CHROME_RENDERER_SERVICE_MANIFEST 119
-IDR_DOWNLOAD_FILE_TYPES_PB 120
-IDR_PLUGIN_DB_JSON 121
-IDS_ACCEPT_LANGUAGES 122
-IDS_DEFAULT_ENCODING 123
-IDS_STANDARD_FONT_FAMILY 124
-IDS_FIXED_FONT_FAMILY 125
-IDS_FIXED_FONT_FAMILY_ALT_WIN 126
-IDS_SERIF_FONT_FAMILY 127
-IDS_SANS_SERIF_FONT_FAMILY 128
-IDS_CURSIVE_FONT_FAMILY 129
-IDS_FANTASY_FONT_FAMILY 130
-IDS_PICTOGRAPH_FONT_FAMILY 131
-IDS_STANDARD_FONT_FAMILY_JAPANESE 132
-IDS_FIXED_FONT_FAMILY_JAPANESE 133
-IDS_SERIF_FONT_FAMILY_JAPANESE 134
-IDS_SANS_SERIF_FONT_FAMILY_JAPANESE 135
-IDS_STANDARD_FONT_FAMILY_KOREAN 136
-IDS_SERIF_FONT_FAMILY_KOREAN 137
-IDS_SANS_SERIF_FONT_FAMILY_KOREAN 138
-IDS_STANDARD_FONT_FAMILY_SIMPLIFIED_HAN 139
-IDS_SERIF_FONT_FAMILY_SIMPLIFIED_HAN 140
-IDS_SANS_SERIF_FONT_FAMILY_SIMPLIFIED_HAN 141
-IDS_STANDARD_FONT_FAMILY_TRADITIONAL_HAN 142
-IDS_SERIF_FONT_FAMILY_TRADITIONAL_HAN 143
-IDS_SANS_SERIF_FONT_FAMILY_TRADITIONAL_HAN 144
-IDS_CURSIVE_FONT_FAMILY_SIMPLIFIED_HAN 145
-IDS_CURSIVE_FONT_FAMILY_TRADITIONAL_HAN 146
-IDS_FIXED_FONT_FAMILY_ARABIC 147
-IDS_SANS_SERIF_FONT_FAMILY_ARABIC 148
-IDS_STANDARD_FONT_FAMILY_CYRILLIC 149
-IDS_FIXED_FONT_FAMILY_CYRILLIC 150
-IDS_SERIF_FONT_FAMILY_CYRILLIC 151
-IDS_SANS_SERIF_FONT_FAMILY_CYRILLIC 152
-IDS_STANDARD_FONT_FAMILY_GREEK 153
-IDS_FIXED_FONT_FAMILY_GREEK 154
-IDS_SERIF_FONT_FAMILY_GREEK 155
-IDS_SANS_SERIF_FONT_FAMILY_GREEK 156
-IDS_FIXED_FONT_FAMILY_KOREAN 157
-IDS_CURSIVE_FONT_FAMILY_KOREAN 158
-IDS_FIXED_FONT_FAMILY_SIMPLIFIED_HAN 159
-IDS_FIXED_FONT_FAMILY_TRADITIONAL_HAN 160
-IDS_DEFAULT_FONT_SIZE 161
-IDS_DEFAULT_FIXED_FONT_SIZE 162
-IDS_MINIMUM_FONT_SIZE 163
-IDS_MINIMUM_LOGICAL_FONT_SIZE 164
-IDS_SPELLCHECK_DICTIONARY 165
-IDS_BOOKMARK_BAR_FOLDER_NAME 166
-IDS_BOOKMARK_BAR_OTHER_FOLDER_NAME 167
-IDS_BOOKMARK_BAR_MOBILE_FOLDER_NAME 168
-IDS_PRODUCT_NAME 169
-IDS_PROFILES_DEFAULT_NAME 170
-IDR_CLOUDPRINT_MANIFEST 171
-IDS_WEBSTORE_APP_DESCRIPTION 172
-IDS_WEBSTORE_NAME_STORE 173
-IDR_WEBSTORE_MANIFEST 174
-IDR_CRYPTOTOKEN_MANIFEST 175
-IDR_PDF_MANIFEST 176
-IDS_VERSION_UI_UNOFFICIAL 177
-IDS_CRASH_RECOVERY_TITLE 178
-IDS_CRASH_RECOVERY_CONTENT 179
-IDS_BOOKMARK_BAR_MANAGED_FOLDER_DEFAULT_NAME 180
-IDS_APP_ACCNAME_MINIMIZE 181
-IDS_APP_ACCNAME_MAXIMIZE 182
-IDS_APP_ACCNAME_RESTORE 183
-IDS_APP_ACCNAME_CLOSE 184
-IDS_TOOLTIP_NEW_TAB 185
-IDS_ACCNAME_NEWTAB 186
-IDR_TAB_DROP_DOWN 187
-IDS_UI_FONT_FAMILY 188
-IDS_UI_FONT_SIZE_SCALER 189
-IDS_MINIMUM_UI_FONT_SIZE 190
-IDS_APP_COPY 191
-IDS_APP_SELECT_ALL 192
-IDS_TOOLTIP_BACK 193
-IDS_ACCNAME_BACK 194
-IDS_ACCDESCRIPTION_BACK 195
-IDS_TOOLTIP_FORWARD 196
-IDS_ACCNAME_FORWARD 197
-IDS_ACCDESCRIPTION_FORWARD 198
-IDS_RELOAD_MENU_NORMAL_RELOAD_ITEM 199
-IDS_RELOAD_MENU_HARD_RELOAD_ITEM 200
-IDS_RELOAD_MENU_EMPTY_AND_HARD_RELOAD_ITEM 201
-IDS_ACCNAME_RELOAD 202
-IDS_TOOLTIP_HOME 203
-IDS_ACCNAME_HOME 204
-IDS_MEDIA_ROUTER_ABOUT 205
-IDS_LEARN_MORE 206
-IDS_MEDIA_ROUTER_HELP 207
-IDS_MEDIA_ROUTER_ALWAYS_SHOW_TOOLBAR_ACTION 208
-IDS_MEDIA_ROUTER_TOGGLE_MEDIA_REMOTING 209
-IDS_MEDIA_ROUTER_CLOUD_SERVICES_TOGGLE 210
-IDS_MEDIA_ROUTER_REPORT_ISSUE 211
-IDS_MEDIA_ROUTER_ICON_TOOLTIP_TEXT 212
-IDS_GENERIC_USER_AVATAR_LABEL 213
-IDS_ACCNAME_APP 214
-IDS_APPMENU_TOOLTIP 215
-IDS_OMNIBOX_PLACEHOLDER_TEXT 216
-IDS_AUTOCOMPLETE_MATCH_DESCRIPTION_SEPARATOR 217
-IDS_REGISTER_PROTOCOL_HANDLER_TOOLTIP 218
-IDS_OMNIBOX_CLEAR_ALL 219
-IDS_EMPTY_KEYWORD_VALUE 220
-IDS_DEFAULT_TAB_TITLE 221
-IDS_BROWSER_WINDOW_TITLE_FORMAT 222
-IDS_EXTENSION_WEB_STORE_TITLE_SHORT 223
-IDS_WEBSTORE_URL 224
-IDS_NTP_CONFIRM_MSG_SHORTCUT_REMOVED 225
-IDS_NEW_TAB_REMOVE_THUMBNAIL_TOOLTIP 226
-IDS_NEW_TAB_UNDO_THUMBNAIL_REMOVE 227
-IDS_NEW_TAB_RESTORE_THUMBNAILS_SHORT_LINK 228
-IDS_NEW_TAB_ATTRIBUTION_INTRO 229
-IDS_NEW_TAB_TITLE 230
-IDS_NEW_TAB_MOST_VISITED 231
-IDS_GOOGLE_SEARCH_BOX_EMPTY_HINT_MD 232
-IDS_NTP_CUSTOM_BG_CUSTOMIZE_BACKGROUND 233
-IDS_NTP_CUSTOM_BG_GOOGLE_PHOTOS 234
-IDS_NTP_CUSTOM_BG_CHROME_WALLPAPERS 235
-IDS_NTP_CUSTOM_BG_UPLOAD_AN_IMAGE 236
-IDS_NTP_CUSTOM_BG_RESTORE_DEFAULT 237
-IDS_NTP_CUSTOM_BG_SELECT_A_COLLECTION 238
-IDS_NTP_CUSTOM_BG_DAILY_REFRESH 239
-IDS_NTP_CUSTOM_LINKS_DONE 240
-IDS_NTP_CUSTOM_BG_CANCEL 241
-IDS_NTP_CUSTOM_BG_SELECT_GOOGLE_ALBUM 242
-IDS_NTP_CONNECTION_ERROR_NO_PERIOD 243
-IDS_NTP_CONNECTION_ERROR 244
-IDS_NTP_ERROR_MORE_INFO 245
-IDS_NTP_CUSTOM_BG_BACKGROUNDS_UNAVAILABLE 246
-IDS_NTP_CUSTOM_BG_CUSTOMIZE_NTP_LABEL 247
-IDS_NTP_CUSTOM_BG_BACK_LABEL 248
-IDS_NTP_CUSTOM_BG_GOOGLE_PHOTO_LABEL 249
-IDS_NTP_CUSTOM_BG_PHOTO_SELECTED 250
-IDS_NTP_CUSTOM_LINKS_ADD_SHORTCUT_TITLE 251
-IDS_NTP_CUSTOM_LINKS_ADD_SHORTCUT_TOOLTIP 252
-IDS_NTP_CUSTOM_LINKS_EDIT_SHORTCUT 253
-IDS_NTP_CUSTOM_LINKS_EDIT_SHORTCUT_TOOLTIP 254
-IDS_NTP_CUSTOM_LINKS_NAME 255
-IDS_NTP_CUSTOM_LINKS_URL 256
-IDS_NTP_CUSTOM_LINKS_REMOVE 257
-IDS_NTP_CUSTOM_LINKS_CANCEL 258
-IDS_NTP_CUSTOM_LINKS_INVALID_URL 259
-IDS_NTP_CONFIRM_MSG_SHORTCUT_EDITED 260
-IDS_NTP_CONFIRM_MSG_SHORTCUT_ADDED 261
-IDS_NTP_CONFIRM_MSG_RESTORE_DEFAULTS 262
-IDS_NTP_CUSTOM_LINKS_CANT_CREATE 263
-IDS_NTP_CUSTOM_LINKS_CANT_EDIT 264
-IDS_NTP_CUSTOM_LINKS_CANT_REMOVE 265
-IDS_NEW_TAB_VOICE_AUDIO_ERROR 266
-IDS_NEW_TAB_VOICE_DETAILS 267
-IDS_CLICK_TO_VIEW_DOODLE 268
-IDS_TOOLTIP_MIC_SEARCH 269
-IDS_NEW_TAB_VOICE_LANGUAGE_ERROR 270
-IDS_NEW_TAB_VOICE_LISTENING 271
-IDS_NEW_TAB_VOICE_NETWORK_ERROR 272
-IDS_NEW_TAB_VOICE_NO_TRANSLATION 273
-IDS_NEW_TAB_VOICE_NO_VOICE 274
-IDS_NEW_TAB_VOICE_PERMISSION_ERROR 275
-IDS_NEW_TAB_VOICE_READY 276
-IDS_NEW_TAB_VOICE_TRY_AGAIN 277
-IDS_NEW_TAB_VOICE_WAITING 278
-IDS_NEW_TAB_VOICE_OTHER_ERROR 279
-IDR_DEFAULT_FAVICON 280
-IDS_ACCNAME_CLOSE 281
-IDS_BOOKMARK_BAR_APPS_SHORTCUT_NAME 282
-IDS_BOOKMARK_BAR_APPS_SHORTCUT_TOOLTIP 283
-IDR_BOOKMARK_BAR_APPS_SHORTCUT 284
-IDS_ACCNAME_BOOKMARKS_CHEVRON 285
-IDR_BOOKMARK_BAR_FOLDER 286
-IDR_BOOKMARK_BAR_FOLDER_MANAGED 287
-IDR_SSL_ERROR_ASSISTANT_PB 288
-IDS_WEB_FONT_SIZE 289
-IDS_WEB_FONT_FAMILY 290
-IDR_LOCAL_NTP_HTML 291
-IDS_LOAD_STATE_WAITING_FOR_DELEGATE_GENERIC 292
-IDS_UTILITY_PROCESS_PROXY_RESOLVER_NAME 293
-IDR_LOCAL_NTP_CSS 294
-IDR_LOCAL_NTP_VOICE_CSS 295
-IDR_LOCAL_NTP_CUSTOM_BACKGROUNDS_CSS 296
-IDR_LOCAL_NTP_CUSTOM_BACKGROUNDS_JS 297
-IDR_LOCAL_NTP_JS 298
-IDR_LOCAL_NTP_VOICE_JS 299
-IDR_MOST_VISITED_SINGLE_HTML 300
-IDR_CUSTOM_LINKS_EDIT_HTML 301
-IDR_MOST_VISITED_SINGLE_CSS 302
-IDR_MOST_VISITED_SINGLE_JS 303
-IDR_CUSTOM_LINKS_EDIT_CSS 304
-IDR_CUSTOM_LINKS_EDIT_JS 305
-IDR_WEBSTORE_ICON_32 306
-IDS_NTP_FONT_FAMILY 307
-IDR_CUSTOM_LINKS_EDIT_MENU_SVG 308
-IDR_CUSTOM_LINKS_ADD_SVG 309
-IDS_TOOLTIP_STARRED 310
\ No newline at end of file
+IDS_PRODUCT_NAME 101
+IDR_DOWNLOAD_FILE_TYPES_PB 102
+IDR_PLUGIN_DB_JSON 103
+IDS_ACCEPT_LANGUAGES 104
+IDS_DEFAULT_ENCODING 105
+IDS_STANDARD_FONT_FAMILY 106
+IDS_FIXED_FONT_FAMILY 107
+IDS_FIXED_FONT_FAMILY_ALT_WIN 108
+IDS_SERIF_FONT_FAMILY 109
+IDS_SANS_SERIF_FONT_FAMILY 110
+IDS_CURSIVE_FONT_FAMILY 111
+IDS_FANTASY_FONT_FAMILY 112
+IDS_PICTOGRAPH_FONT_FAMILY 113
+IDS_STANDARD_FONT_FAMILY_JAPANESE 114
+IDS_FIXED_FONT_FAMILY_JAPANESE 115
+IDS_SERIF_FONT_FAMILY_JAPANESE 116
+IDS_SANS_SERIF_FONT_FAMILY_JAPANESE 117
+IDS_STANDARD_FONT_FAMILY_KOREAN 118
+IDS_SERIF_FONT_FAMILY_KOREAN 119
+IDS_SANS_SERIF_FONT_FAMILY_KOREAN 120
+IDS_STANDARD_FONT_FAMILY_SIMPLIFIED_HAN 121
+IDS_SERIF_FONT_FAMILY_SIMPLIFIED_HAN 122
+IDS_SANS_SERIF_FONT_FAMILY_SIMPLIFIED_HAN 123
+IDS_STANDARD_FONT_FAMILY_TRADITIONAL_HAN 124
+IDS_SERIF_FONT_FAMILY_TRADITIONAL_HAN 125
+IDS_SANS_SERIF_FONT_FAMILY_TRADITIONAL_HAN 126
+IDS_CURSIVE_FONT_FAMILY_SIMPLIFIED_HAN 127
+IDS_CURSIVE_FONT_FAMILY_TRADITIONAL_HAN 128
+IDS_FIXED_FONT_FAMILY_ARABIC 129
+IDS_SANS_SERIF_FONT_FAMILY_ARABIC 130
+IDS_STANDARD_FONT_FAMILY_CYRILLIC 131
+IDS_FIXED_FONT_FAMILY_CYRILLIC 132
+IDS_SERIF_FONT_FAMILY_CYRILLIC 133
+IDS_SANS_SERIF_FONT_FAMILY_CYRILLIC 134
+IDS_STANDARD_FONT_FAMILY_GREEK 135
+IDS_FIXED_FONT_FAMILY_GREEK 136
+IDS_SERIF_FONT_FAMILY_GREEK 137
+IDS_SANS_SERIF_FONT_FAMILY_GREEK 138
+IDS_FIXED_FONT_FAMILY_KOREAN 139
+IDS_CURSIVE_FONT_FAMILY_KOREAN 140
+IDS_FIXED_FONT_FAMILY_SIMPLIFIED_HAN 141
+IDS_FIXED_FONT_FAMILY_TRADITIONAL_HAN 142
+IDS_MINIMUM_FONT_SIZE 143
+IDS_MINIMUM_LOGICAL_FONT_SIZE 144
+IDS_SPELLCHECK_DICTIONARY 145
+IDR_PREF_HASH_SEED_BIN 146
+IDS_POLICY_OVERRIDDEN 147
+IDS_BOOKMARK_BAR_FOLDER_NAME 148
+IDS_BOOKMARK_BAR_OTHER_FOLDER_NAME 149
+IDS_BOOKMARK_BAR_MOBILE_FOLDER_NAME 150
+IDS_PROFILES_DEFAULT_NAME 151
+IDR_CLOUDPRINT_MANIFEST 152
+IDS_WEBSTORE_APP_DESCRIPTION 153
+IDS_WEBSTORE_NAME_STORE 154
+IDR_WEBSTORE_MANIFEST 155
+IDR_PDF_MANIFEST 156
+IDR_HANGOUT_SERVICES_MANIFEST 157
+IDS_FEEDBACK_REPORT_PAGE_TITLE 158
+IDS_FEEDBACK_REPORT_APP_TITLE 159
+IDR_FEEDBACK_MANIFEST 160
+IDR_NETWORK_SPEECH_SYNTHESIS_MANIFEST 161
+IDR_CRYPTOTOKEN_MANIFEST 162
+IDR_EXTENSIONS_FAVICON 163
+IDS_EXTENSION_USB_DEVICE_PRODUCT_NAME_AND_VENDOR 164
+IDS_EXTENSIONS_LOAD_ERROR_MESSAGE 165
+IDS_CRASH_RECOVERY_TITLE 166
+IDS_CRASH_RECOVERY_CONTENT 167
+IDS_BOOKMARK_BAR_MANAGED_FOLDER_DEFAULT_NAME 168
+IDS_AUTOFILL_ADDRESS_SUMMARY_SEPARATOR 169
+IDS_AUTOFILL_CC_VISA 170
+IDR_DEFAULT_FAVICON 171
+IDS_EXTENSION_WEB_STORE_TITLE_SHORT 172
+IDS_WEBSTORE_URL 173
+IDS_NTP_CONFIRM_MSG_SHORTCUT_REMOVED 174
+IDS_NEW_TAB_REMOVE_THUMBNAIL_TOOLTIP 175
+IDS_NEW_TAB_UNDO_THUMBNAIL_REMOVE 176
+IDS_NEW_TAB_RESTORE_THUMBNAILS_SHORT_LINK 177
+IDS_NEW_TAB_ATTRIBUTION_INTRO 178
+IDS_NEW_TAB_TITLE 179
+IDS_NEW_TAB_MOST_VISITED 180
+IDS_GOOGLE_SEARCH_BOX_EMPTY_HINT_MD 181
+IDS_NTP_CUSTOM_BG_CHROME_WALLPAPERS 182
+IDS_NTP_CUSTOM_BG_UPLOAD_AN_IMAGE 183
+IDS_NTP_CUSTOM_BG_RESTORE_DEFAULT 184
+IDS_NTP_CUSTOM_BG_SELECT_A_COLLECTION 185
+IDS_NTP_CUSTOM_LINKS_DONE 186
+IDS_NTP_CUSTOM_BG_CANCEL 187
+IDS_NTP_CONNECTION_ERROR_NO_PERIOD 188
+IDS_NTP_CONNECTION_ERROR 189
+IDS_NTP_ERROR_MORE_INFO 190
+IDS_NTP_CUSTOM_BG_BACKGROUNDS_UNAVAILABLE 191
+IDS_NTP_CUSTOM_BG_CUSTOMIZE_NTP_LABEL 192
+IDS_NTP_CUSTOM_BG_BACK_LABEL 193
+IDS_NTP_CUSTOM_BG_IMAGE_SELECTED 194
+IDS_NTP_CUSTOM_LINKS_ADD_SHORTCUT_TITLE 195
+IDS_NTP_CUSTOM_LINKS_ADD_SHORTCUT_TOOLTIP 196
+IDS_NTP_CUSTOM_LINKS_EDIT_SHORTCUT 197
+IDS_NTP_CUSTOM_LINKS_EDIT_SHORTCUT_TOOLTIP 198
+IDS_NTP_CUSTOM_LINKS_NAME 199
+IDS_NTP_CUSTOM_LINKS_URL 200
+IDS_NTP_CUSTOM_LINKS_REMOVE 201
+IDS_NTP_CUSTOM_LINKS_CANCEL 202
+IDS_NTP_CUSTOM_LINKS_INVALID_URL 203
+IDS_NTP_CONFIRM_MSG_SHORTCUT_EDITED 204
+IDS_NTP_CONFIRM_MSG_SHORTCUT_ADDED 205
+IDS_NTP_CONFIRM_MSG_RESTORE_DEFAULTS 206
+IDS_NTP_CUSTOM_LINKS_CANT_CREATE 207
+IDS_NTP_CUSTOM_LINKS_CANT_EDIT 208
+IDS_NTP_CUSTOM_LINKS_CANT_REMOVE 209
+IDS_NTP_DOODLE_SHARE_LABEL 210
+IDS_NTP_DOODLE_SHARE_DIALOG_CLOSE_LABEL 211
+IDS_NTP_DOODLE_SHARE_DIALOG_FACEBOOK_LABEL 212
+IDS_NTP_DOODLE_SHARE_DIALOG_TWITTER_LABEL 213
+IDS_NTP_DOODLE_SHARE_DIALOG_MAIL_LABEL 214
+IDS_NTP_DOODLE_SHARE_DIALOG_COPY_LABEL 215
+IDS_NTP_DOODLE_SHARE_DIALOG_LINK_LABEL 216
+IDS_NEW_TAB_VOICE_AUDIO_ERROR 217
+IDS_NEW_TAB_VOICE_DETAILS 218
+IDS_TOOLTIP_MIC_SEARCH 219
+IDS_NEW_TAB_VOICE_LANGUAGE_ERROR 220
+IDS_LEARN_MORE 221
+IDS_NEW_TAB_VOICE_LISTENING 222
+IDS_NEW_TAB_VOICE_NETWORK_ERROR 223
+IDS_NEW_TAB_VOICE_NO_TRANSLATION 224
+IDS_NEW_TAB_VOICE_NO_VOICE 225
+IDS_NEW_TAB_VOICE_PERMISSION_ERROR 226
+IDS_NEW_TAB_VOICE_READY 227
+IDS_NEW_TAB_VOICE_TRY_AGAIN 228
+IDS_NEW_TAB_VOICE_WAITING 229
+IDS_NEW_TAB_VOICE_OTHER_ERROR 230
+IDS_NEW_TAB_VOICE_CLOSE_TOOLTIP 231
+IDS_NEW_TAB_VOICE_SEARCH_CLOSED 232
+IDS_AUTOCOMPLETE_MATCH_DESCRIPTION_SEPARATOR 233
+IDS_OMNIBOX_REMOVE_SUGGESTION 234
+IDS_TOOLTIP_HEADER_HIDE_SUGGESTIONS_BUTTON 235
+IDS_TOOLTIP_HEADER_SHOW_SUGGESTIONS_BUTTON 236
+IDS_ACC_HEADER_HIDE_SUGGESTIONS_BUTTON 237
+IDS_ACC_HEADER_SHOW_SUGGESTIONS_BUTTON 238
+IDS_NTP_DISMISS_PROMO 239
+IDS_UI_FONT_FAMILY 240
+IDS_UI_FONT_SIZE_SCALER 241
+IDS_MINIMUM_UI_FONT_SIZE 242
+IDS_TOOLTIP_NEW_TAB 243
+IDS_ACCNAME_NEWTAB 244
+IDR_TAB_DROP_DOWN 245
+IDS_APP_ACCNAME_MINIMIZE 246
+IDS_APP_ACCNAME_MAXIMIZE 247
+IDS_APP_ACCNAME_RESTORE 248
+IDS_APP_ACCNAME_CLOSE 249
+IDS_APP_COPY 250
+IDS_APP_SELECT_ALL 251
+IDS_TOOLTIP_BACK 252
+IDS_ACCNAME_BACK 253
+IDS_ACCDESCRIPTION_BACK 254
+IDS_TOOLTIP_FORWARD 255
+IDS_ACCNAME_FORWARD 256
+IDS_ACCDESCRIPTION_FORWARD 257
+IDS_RELOAD_MENU_NORMAL_RELOAD_ITEM 258
+IDS_RELOAD_MENU_HARD_RELOAD_ITEM 259
+IDS_RELOAD_MENU_EMPTY_AND_HARD_RELOAD_ITEM 260
+IDS_ACCNAME_RELOAD 261
+IDS_TOOLTIP_HOME 262
+IDS_ACCNAME_HOME 263
+IDS_TOOLTIP_EXTENSIONS_BUTTON 264
+IDS_MEDIA_ROUTER_ABOUT 265
+IDS_MEDIA_ROUTER_HELP 266
+IDS_MEDIA_ROUTER_ALWAYS_SHOW_TOOLBAR_ACTION 267
+IDS_MEDIA_ROUTER_TOGGLE_MEDIA_REMOTING 268
+IDS_MEDIA_ROUTER_CLOUD_SERVICES_TOGGLE 269
+IDS_MEDIA_ROUTER_REPORT_ISSUE 270
+IDS_MEDIA_ROUTER_ICON_TOOLTIP_TEXT 271
+IDS_GLOBAL_MEDIA_CONTROLS_ICON_TOOLTIP_TEXT 272
+IDS_ACCNAME_APP 273
+IDS_APPMENU_TOOLTIP 274
+IDR_PROFILE_AVATAR_0 275
+IDS_TOOLTIP_LOCATION_ICON 276
+IDS_OMNIBOX_PLACEHOLDER_TEXT 277
+IDS_REGISTER_PROTOCOL_HANDLER_TOOLTIP 278
+IDS_NOTIFICATIONS_OFF_EXPLANATORY_TEXT 279
+IDS_OMNIBOX_ICON_SEND_TAB_TO_SELF 280
+IDS_OMNIBOX_PWA_INSTALL_ICON_LABEL 281
+IDS_OMNIBOX_CLEAR_ALL 282
+IDS_EMPTY_KEYWORD_VALUE 283
+IDS_DEFAULT_TAB_TITLE 284
+IDS_BROWSER_WINDOW_TITLE_FORMAT 285
+IDS_ACCNAME_CLOSE 286
+IDS_BOOKMARK_BAR_APPS_SHORTCUT_NAME 287
+IDS_BOOKMARK_BAR_APPS_SHORTCUT_TOOLTIP 288
+IDR_BOOKMARK_BAR_APPS_SHORTCUT 289
+IDS_ACCNAME_BOOKMARKS_CHEVRON 290
+IDR_FOLDER_CLOSED 291
+IDR_BOOKMARK_BAR_FOLDER_MANAGED 292
+IDS_EXTENSIONS_HAS_ACCESS_TO_SITE 293
+IDR_EXTENSION_ACTION_PLAIN_BACKGROUND 294
+IDS_ACCESSIBLE_BROWSER_WINDOW_TITLE_FORMAT 295
+IDS_EXTENSIONS_WANTS_ACCESS_TO_SITE 296
+IDR_BOOKMARKS_FAVICON 297
+IDS_WEB_FONT_SIZE 298
+IDS_WEB_FONT_FAMILY 299
+IDS_PROXY_RESOLVER_DISPLAY_NAME 300
+IDS_DEFAULT_BROWSER_INFOBAR_TEXT 301
+IDS_DEFAULT_BROWSER_INFOBAR_OK_BUTTON_LABEL 302
+IDS_SAD_TAB_TITLE 303
+IDS_SAD_TAB_MESSAGE 304
+IDS_SAD_TAB_ERROR_CODE 305
+IDS_SAD_TAB_RELOAD_LABEL 306
+IDS_SAD_TAB_RELOAD_TITLE 307
+IDS_SAD_TAB_RELOAD_TRY 308
+IDS_SAD_TAB_RELOAD_INCOGNITO 309
+IDS_SAD_TAB_RELOAD_RESTART_BROWSER 310
+IDS_SAD_TAB_RELOAD_RESTART_DEVICE 311
+IDS_CRASHED_TAB_FEEDBACK_LINK 312
+IDS_LOAD_STATE_WAITING_FOR_RESPONSE 313
+IDR_CRASH_SAD_FAVICON 314
+IDS_NEW_TAB 315
+IDS_NEW_WINDOW 316
+IDS_NEW_INCOGNITO_WINDOW 317
+IDS_HISTORY_SHOW_HISTORY 318
+IDS_RECENTLY_CLOSED 319
+IDS_RECENTLY_CLOSED_WINDOW 320
+IDS_RECENT_TABS_NO_DEVICE_TABS 321
+IDS_HISTORY_MENU 322
+IDS_SHOW_DOWNLOADS 323
+IDS_BOOKMARK_THIS_TAB 324
+IDS_BOOKMARK_ALL_TABS 325
+IDS_PIN_TO_START_SCREEN 326
+IDS_SHOW_BOOKMARK_BAR 327
+IDS_BOOKMARK_MANAGER 328
+IDS_IMPORT_SETTINGS_MENU_LABEL 329
+IDS_BOOKMARKS_MENU 330
+IDS_ZOOM_MENU 331
+IDS_ZOOM_MINUS2 332
+IDS_ZOOM_PLUS2 333
+IDS_PRINT 334
+IDS_MEDIA_ROUTER_MENU_ITEM_TITLE 335
+IDS_FIND 336
+IDS_SAVE_PAGE 337
+IDS_ADD_TO_OS_LAUNCH_SURFACE 338
+IDS_CLEAR_BROWSING_DATA 339
+IDS_SHOW_EXTENSIONS 340
+IDS_TASK_MANAGER 341
+IDS_DEV_TOOLS 342
+IDS_MORE_TOOLS_MENU 343
+IDS_EDIT 344
+IDS_CUT 345
+IDS_COPY 346
+IDS_PASTE 347
+IDS_SETTINGS 348
+IDS_ABOUT 349
+IDS_HELP_PAGE 350
+IDS_FEEDBACK 351
+IDS_HELP_MENU 352
+IDS_EXIT 353
+IDS_MANAGED_BY 354
+IDS_ZOOM_MENU2 355
+IDS_ACCNAME_ZOOM_MINUS2 356
+IDS_ACCNAME_ZOOM_PLUS2 357
+IDS_ACCNAME_FULLSCREEN 358
+IDS_APP_F11_KEY 359
+IDS_EDIT2 360
+IDS_APP_CTRL_KEY 361
+IDS_APP_ACCELERATOR_WITH_MODIFIER 362
+IDS_APP_MENU_EMPTY_SUBMENU 363
+IDS_APP_SHIFT_KEY 364
diff --git a/chromium/tools/gritsettings/translation_expectations.pyl b/chromium/tools/gritsettings/translation_expectations.pyl
index 1ab8ed19290..b2598b2b057 100644
--- a/chromium/tools/gritsettings/translation_expectations.pyl
+++ b/chromium/tools/gritsettings/translation_expectations.pyl
@@ -25,7 +25,7 @@
       "android_webview/java/strings/android_webview_strings.grd",
       "android_webview/ui/aw_strings.grd",
       "ash/ash_strings.grd",
-      "ash/shortcut_viewer/ash_components_strings.grd",
+      "ash/shortcut_viewer/shortcut_viewer_strings.grd",
       "chrome/android/features/vr/java/strings/android_chrome_vr_strings.grd",
       "chrome/android/features/media_router/java/strings/android_chrome_media_router_strings.grd",
       "chrome/android/features/keyboard_accessory/internal/java/strings/android_keyboard_accessory_strings.grd",
@@ -36,12 +36,12 @@
       "chrome/app/chromium_strings.grd",
       "chrome/app/generated_resources.grd",
       "chrome/app/google_chrome_strings.grd",
-      "chrome/browser/resources/chromeos/camera/src/strings/camera_strings.grd",
       "chrome/browser/resources/chromeos/accessibility/strings/accessibility_strings.grd",
       "chrome/browser/touch_to_fill/android/internal/java/strings/android_touch_to_fill_strings.grd",
       "chrome/browser/ui/android/strings/android_chrome_strings.grd",
       "chrome/credential_provider/gaiacp/gaia_resources.grd",
       "chromeos/chromeos_strings.grd",
+      "chromeos/components/camera_app_ui/resources/src/strings/camera_strings.grd",
       "components/autofill/android/java/strings/autofill_strings.grd",
       "components/browser_ui/strings/android/browser_ui_strings.grd",
       "components/components_chromium_strings.grd",