Move content_string.grd to Blink

Making to use IDS_FOO_BAR instead of WebLocalizedString::kFooBar
directly, callers of WebLocalizedString::kFooBar need to include
content_strings.h from //content. But, it can cause a layer
violation issue. So, we need to move conteont_string.grd to blink
in order to make the callers include IDS_FOO_BAR from Blink.

Major changes are as below,

 - Move content_string.grd to third_party/blink/public/strings/
 - Renames blink_strings.grd
 - Change content_ prefix with blink_ prefix.

TBR=jamesr@chromium.org, pfeldman@chromium.org

Bug: 995644
Change-Id: I8587cb4efd0d6a8d95ff7ad95cd416c3b55f7af2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1788968
Commit-Queue: Gyuyoung Kim <gyuyoung@igalia.com>
Reviewed-by: Robert Flack <flackr@chromium.org>
Reviewed-by: Ben Wells <benwells@chromium.org>
Reviewed-by: Bo <boliu@chromium.org>
Reviewed-by: Evan Stade <estade@chromium.org>
Reviewed-by: Colin Blundell <blundell@chromium.org>
Reviewed-by: Martin Robinson <mrobinson@igalia.com>
Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Reviewed-by: Sergey Ulanov <sergeyu@chromium.org>
Reviewed-by: Kent Tamura <tkent@chromium.org>
Cr-Commit-Position: refs/heads/master@{#697631}

android_webview/webview_repack_locales.gni

@@ -20,12 +20,12 @@ template("webview_repack_locales") {
 
     source_patterns = [
       "${root_gen_dir}/android_webview/components_strings_",
-      "${root_gen_dir}/content/app/strings/content_strings_",
+      "${root_gen_dir}/third_party/blink/public/strings/blink_strings_",
       "${root_gen_dir}/ui/strings/app_locale_settings_",
     ]
     deps += [
       "//android_webview:generate_components_strings",
-      "//content/app/strings",
+      "//third_party/blink/public/strings",
       "//ui/strings:app_locale_settings",
     ]
     source_patterns += webview_repack_locales_source_patterns

ash/resources/BUILD.gn

@@ -76,13 +76,13 @@ ash_test_resources("200_percent") {
 ash_test_resources("with_content_100_percent") {
   percent = "100"
   sources = [
-    "$root_gen_dir/content/app/strings/content_strings_en-US.pak",
     "$root_gen_dir/content/content_resources.pak",
     "$root_gen_dir/third_party/blink/public/resources/blink_scaled_resources_100_percent.pak",
+    "$root_gen_dir/third_party/blink/public/strings/blink_strings_en-US.pak",
   ]
   deps = [
     "//content:resources",
-    "//content/app/strings",
     "//third_party/blink/public:scaled_resources_100_percent",
+    "//third_party/blink/public/strings",
   ]
 }

chrome/chrome_repack_locales.gni

@@ -28,7 +28,7 @@ template("chrome_repack_locales") {
       "${root_gen_dir}/chrome/platform_locale_settings_",
       "${root_gen_dir}/components/strings/components_locale_settings_",
       "${root_gen_dir}/components/strings/components_strings_",
-      "${root_gen_dir}/content/app/strings/content_strings_",
+      "${root_gen_dir}/third_party/blink/public/strings/blink_strings_",
       "${root_gen_dir}/device/bluetooth/strings/bluetooth_strings_",
       "${root_gen_dir}/device/fido/strings/fido_strings_",
       "${root_gen_dir}/services/strings/services_strings_",
@@ -45,10 +45,10 @@ template("chrome_repack_locales") {
       "//chrome/app/resources:platform_locale_settings",
       "//components/strings:components_locale_settings",
       "//components/strings:components_strings",
-      "//content/app/strings",
       "//device/bluetooth/strings",
       "//device/fido/strings",
       "//services/strings",
+      "//third_party/blink/public/strings",
       "//third_party/libaddressinput:strings",
       "//ui/strings:app_locale_settings",
       "//ui/strings:ui_strings",

chrome/renderer/BUILD.gn

@@ -153,7 +153,6 @@ jumbo_static_library("renderer") {
     "//components/visitedlink/renderer",
     "//components/web_cache/renderer",
     "//content/app/resources",
-    "//content/app/strings",
     "//content/public/common",
     "//content/public/renderer",
     "//extensions/buildflags",
@@ -172,6 +171,7 @@ jumbo_static_library("renderer") {
     "//third_party/blink/public:blink",
     "//third_party/blink/public:resources",
     "//third_party/blink/public:scaled_resources",
+    "//third_party/blink/public/strings",
     "//third_party/icu",
     "//third_party/re2",
     "//third_party/widevine/cdm:buildflags",

chrome/renderer/DEPS

@@ -51,7 +51,6 @@ include_rules = [
   "+components/version_info",
   "+components/visitedlink/renderer",
   "+components/web_cache/renderer",
-  "+content/app/strings/grit",
   "+content/public/child",
   "+content/public/renderer",
   "+extensions/common",
@@ -64,6 +63,7 @@ include_rules = [
   "+skia",
   "+storage/common",
   "+third_party/blink/public/mojom",
+  "+third_party/blink/public/strings/grit/blink_strings.h",
   "+third_party/metrics_proto",
   "+third_party/widevine/cdm/buildflags.h",
   "+third_party/widevine/cdm/widevine_cdm_common.h",

chrome/renderer/plugins/non_loadable_plugin_placeholder.cc

@@ -10,9 +10,9 @@
 #include "chrome/grit/renderer_resources.h"
 #include "components/plugins/renderer/plugin_placeholder.h"
 #include "components/strings/grit/components_strings.h"
-#include "content/app/strings/grit/content_strings.h"
 #include "content/public/renderer/render_frame.h"
 #include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
+#include "third_party/blink/public/strings/grit/blink_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/webui/jstemplate_builder.h"

chromecast/BUILD.gn

@@ -500,12 +500,12 @@ repack("cast_shell_pak") {
     "$root_gen_dir/chromecast/app/shell_resources.pak",
     "$root_gen_dir/chromecast/bindings/bindings_resources.pak",
     "$root_gen_dir/content/app/resources/content_resources_100_percent.pak",
-    "$root_gen_dir/content/app/strings/content_strings_en-US.pak",
     "$root_gen_dir/content/content_resources.pak",
     "$root_gen_dir/mojo/public/js/mojo_bindings_resources.pak",
     "$root_gen_dir/net/net_resources.pak",
     "$root_gen_dir/third_party/blink/public/resources/blink_resources.pak",
     "$root_gen_dir/third_party/blink/public/resources/blink_scaled_resources_100_percent.pak",
+    "$root_gen_dir/third_party/blink/public/strings/blink_strings_en-US.pak",
     "$root_gen_dir/ui/resources/ui_resources_100_percent.pak",
     "$root_gen_dir/ui/resources/webui_resources.pak",
     "$root_gen_dir/ui/strings/app_locale_settings_en-US.pak",
@@ -519,11 +519,11 @@ repack("cast_shell_pak") {
     "//chromecast/bindings:bindings_resources_grit",
     "//content:resources",
     "//content/app/resources",
-    "//content/app/strings",
     "//mojo/public/js:resources",
     "//net:net_resources",
     "//third_party/blink/public:resources",
     "//third_party/blink/public:scaled_resources_100_percent",
+    "//third_party/blink/public/strings",
     "//ui/resources",
     "//ui/strings",
   ]

content/DEPS

@@ -29,7 +29,6 @@ include_rules = [
 
   "+crypto",
   "+grit/blink_resources.h",
-  "+grit/content_strings.h",
 
   "+dbus",
   "+gpu",

content/app/strings/BUILD.gn

@@ -1,66 +0,0 @@
-# Copyright 2014 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//tools/grit/grit_rule.gni")
-
-grit("strings") {
-  source = "content_strings.grd"
-  outputs = [
-    "grit/content_strings.h",
-    "content_strings_am.pak",
-    "content_strings_ar.pak",
-    "content_strings_bg.pak",
-    "content_strings_bn.pak",
-    "content_strings_ca.pak",
-    "content_strings_cs.pak",
-    "content_strings_da.pak",
-    "content_strings_de.pak",
-    "content_strings_el.pak",
-    "content_strings_en-GB.pak",
-    "content_strings_en-US.pak",
-    "content_strings_es.pak",
-    "content_strings_es-419.pak",
-    "content_strings_et.pak",
-    "content_strings_fa.pak",
-    "content_strings_fake-bidi.pak",
-    "content_strings_fi.pak",
-    "content_strings_fil.pak",
-    "content_strings_fr.pak",
-    "content_strings_gu.pak",
-    "content_strings_he.pak",
-    "content_strings_hi.pak",
-    "content_strings_hr.pak",
-    "content_strings_hu.pak",
-    "content_strings_id.pak",
-    "content_strings_it.pak",
-    "content_strings_ja.pak",
-    "content_strings_kn.pak",
-    "content_strings_ko.pak",
-    "content_strings_lt.pak",
-    "content_strings_lv.pak",
-    "content_strings_ml.pak",
-    "content_strings_mr.pak",
-    "content_strings_ms.pak",
-    "content_strings_nl.pak",
-    "content_strings_nb.pak",
-    "content_strings_pl.pak",
-    "content_strings_pt-BR.pak",
-    "content_strings_pt-PT.pak",
-    "content_strings_ro.pak",
-    "content_strings_ru.pak",
-    "content_strings_sk.pak",
-    "content_strings_sl.pak",
-    "content_strings_sr.pak",
-    "content_strings_sv.pak",
-    "content_strings_sw.pak",
-    "content_strings_ta.pak",
-    "content_strings_te.pak",
-    "content_strings_th.pak",
-    "content_strings_tr.pak",
-    "content_strings_uk.pak",
-    "content_strings_vi.pak",
-    "content_strings_zh-CN.pak",
-    "content_strings_zh-TW.pak",
-  ]
-}

content/browser/BUILD.gn

@@ -81,7 +81,6 @@ jumbo_source_set("browser") {
     "//components/viz/service/main",
     "//content:resources",
     "//content/app/resources",
-    "//content/app/strings",
     "//content/browser/background_fetch:background_fetch_proto",
     "//content/browser/background_sync:background_sync_proto",
     "//content/browser/cache_storage:cache_storage_proto",
@@ -200,6 +199,7 @@ jumbo_source_set("browser") {
     "//third_party/blink/public:scaled_resources",
     "//third_party/blink/public/common",
     "//third_party/blink/public/mojom:mojom_broadcastchannel_bindings",
+    "//third_party/blink/public/strings",
     "//third_party/boringssl",
     "//third_party/brotli:dec",
     "//third_party/icu",

content/browser/DEPS

@@ -121,6 +121,7 @@ include_rules = [
   "+third_party/blink/public/platform/modules/service_worker/web_service_worker_error.h",
   "+third_party/blink/public/platform/modules/sms/sms_receiver.mojom.h",
   "+third_party/blink/public/public_buildflags.h",
+  "+third_party/blink/public/strings/grit/blink_strings.h",
   "+third_party/blink/public/web/web_ax_enums.h",
   "+third_party/blink/public/web/web_console_message.h",
   "+third_party/blink/public/web/web_context_menu_data.h",

content/browser/accessibility/browser_accessibility.cc

@@ -13,11 +13,11 @@
 #include "base/no_destructor.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
-#include "content/app/strings/grit/content_strings.h"
 #include "content/browser/accessibility/browser_accessibility_manager.h"
 #include "content/browser/accessibility/browser_accessibility_state_impl.h"
 #include "content/common/accessibility_messages.h"
 #include "content/public/common/content_client.h"
+#include "third_party/blink/public/strings/grit/blink_strings.h"
 #include "ui/accessibility/ax_enums.mojom.h"
 #include "ui/accessibility/ax_node_position.h"
 #include "ui/accessibility/ax_role_properties.h"

content/browser/accessibility/browser_accessibility_android.cc

@@ -11,10 +11,10 @@
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
-#include "content/app/strings/grit/content_strings.h"
 #include "content/browser/accessibility/browser_accessibility_manager_android.h"
 #include "content/common/accessibility_messages.h"
 #include "content/public/common/content_client.h"
+#include "third_party/blink/public/strings/grit/blink_strings.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/accessibility/ax_assistant_structure.h"
 #include "ui/accessibility/ax_role_properties.h"

content/browser/accessibility/browser_accessibility_cocoa.mm

@@ -21,13 +21,13 @@
 #include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
-#include "content/app/strings/grit/content_strings.h"
 #include "content/browser/accessibility/browser_accessibility_mac.h"
 #include "content/browser/accessibility/browser_accessibility_manager.h"
 #include "content/browser/accessibility/browser_accessibility_manager_mac.h"
 #include "content/browser/accessibility/browser_accessibility_position.h"
 #include "content/browser/accessibility/one_shot_accessibility_tree_search.h"
 #include "content/public/common/content_client.h"
+#include "third_party/blink/public/strings/grit/blink_strings.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/accessibility/ax_range.h"
 #include "ui/accessibility/ax_role_properties.h"

content/browser/media/session/media_session_impl.cc

@@ -14,7 +14,6 @@
 #include "base/timer/timer.h"
 #include "build/build_config.h"
 #include "components/url_formatter/elide_url.h"
-#include "content/app/strings/grit/content_strings.h"
 #include "content/browser/media/session/audio_focus_delegate.h"
 #include "content/browser/media/session/media_session_controller.h"
 #include "content/browser/media/session/media_session_player_observer.h"
@@ -30,6 +29,7 @@
 #include "media/base/media_content_type.h"
 #include "services/media_session/public/cpp/media_image_manager.h"
 #include "services/media_session/public/mojom/audio_focus.mojom.h"
+#include "third_party/blink/public/strings/grit/blink_strings.h"
 #include "ui/gfx/favicon_size.h"
 
 #if defined(OS_ANDROID)

content/browser/service_manager/service_manager_context.cc

@@ -26,7 +26,6 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/task/post_task.h"
 #include "build/build_config.h"
-#include "content/app/strings/grit/content_strings.h"
 #include "content/browser/browser_main_loop.h"
 #include "content/browser/builtin_service_manifests.h"
 #include "content/browser/child_process_launcher.h"
@@ -85,6 +84,7 @@
 #include "services/tracing/public/cpp/tracing_features.h"
 #include "services/tracing/public/mojom/constants.mojom.h"
 #include "services/tracing/tracing_service.h"
+#include "third_party/blink/public/strings/grit/blink_strings.h"
 #include "ui/base/buildflags.h"
 #include "ui/base/ui_base_features.h"
 

content/child/BUILD.gn

@@ -96,7 +96,6 @@ target(link_target_type, "child") {
     "//components/variations",
     "//components/webcrypto",
     "//content/app/resources",
-    "//content/app/strings",
     "//content/common",
     "//content/public/common:common_sources",
     "//crypto:platform",
@@ -119,6 +118,7 @@ target(link_target_type, "child") {
     "//third_party/blink/public:resources",
     "//third_party/blink/public:scaled_resources",
     "//third_party/blink/public/common",
+    "//third_party/blink/public/strings",
     "//third_party/ced",
     "//third_party/zlib/google:compression_utils",
     "//ui/base",

content/child/blink_platform_impl.cc

@@ -31,7 +31,6 @@
 #include "base/trace_event/trace_event.h"
 #include "build/build_config.h"
 #include "content/app/resources/grit/content_resources.h"
-#include "content/app/strings/grit/content_strings.h"
 #include "content/child/child_thread_impl.h"
 #include "content/common/appcache_interfaces.h"
 #include "content/common/child_process.mojom.h"
@@ -50,6 +49,7 @@
 #include "third_party/blink/public/platform/web_url.h"
 #include "third_party/blink/public/resources/grit/blink_image_resources.h"
 #include "third_party/blink/public/resources/grit/blink_resources.h"
+#include "third_party/blink/public/strings/grit/blink_strings.h"
 #include "third_party/zlib/google/compression_utils.h"
 #include "ui/base/layout.h"
 #include "ui/base/ui_base_features.h"

content/renderer/BUILD.gn

@@ -376,7 +376,6 @@ target(link_target_type, "renderer") {
     "//components/viz/common",
     "//components/viz/service",
     "//content:resources",
-    "//content/app/strings:strings_grit",
     "//content/child",
     "//content/common",
     "//content/common:buildflags",
@@ -430,6 +429,7 @@ target(link_target_type, "renderer") {
     "//third_party/blink/public:blink",
     "//third_party/blink/public:buildflags",
     "//third_party/blink/public/common",
+    "//third_party/blink/public/strings:strings_grit",
     "//third_party/boringssl",
     "//third_party/icu",
     "//third_party/libyuv",

content/renderer/accessibility/ax_image_annotator.cc

@@ -12,10 +12,10 @@
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
-#include "content/app/strings/grit/content_strings.h"
 #include "content/public/common/content_client.h"
 #include "content/renderer/render_frame_impl.h"
 #include "crypto/sha2.h"
+#include "third_party/blink/public/strings/grit/blink_strings.h"
 #include "third_party/blink/public/web/web_ax_object.h"
 #include "third_party/blink/public/web/web_document.h"
 #include "third_party/blink/public/web/web_element.h"

content/shell/BUILD.gn

@@ -293,7 +293,6 @@ jumbo_static_library("content_shell_lib") {
     "//components/web_cache/renderer",
     "//content:resources",
     "//content/app/resources",
-    "//content/app/strings",
     "//content/gpu",
     "//content/public/common",
     "//content/public/common:service_names",
@@ -334,6 +333,7 @@ jumbo_static_library("content_shell_lib") {
     "//third_party/blink/public:image_resources",
     "//third_party/blink/public:resources",
     "//third_party/blink/public:test_support",
+    "//third_party/blink/public/strings",
     "//third_party/icu",
     "//ui/base",
     "//ui/base/clipboard",
@@ -516,7 +516,6 @@ repack("pak") {
 
   sources = [
     "$root_gen_dir/content/app/resources/content_resources_100_percent.pak",
-    "$root_gen_dir/content/app/strings/content_strings_en-US.pak",
     "$root_gen_dir/content/browser/tracing/tracing_resources.pak",
     "$root_gen_dir/content/content_resources.pak",
     "$root_gen_dir/content/shell/shell_resources.pak",
@@ -524,6 +523,7 @@ repack("pak") {
     "$root_gen_dir/net/net_resources.pak",
     "$root_gen_dir/third_party/blink/public/resources/blink_resources.pak",
     "$root_gen_dir/third_party/blink/public/resources/blink_scaled_resources_100_percent.pak",
+    "$root_gen_dir/third_party/blink/public/strings/blink_strings_en-US.pak",
     "$root_gen_dir/ui/resources/ui_resources_100_percent.pak",
     "$root_gen_dir/ui/resources/webui_resources.pak",
     "$root_gen_dir/ui/strings/app_locale_settings_en-US.pak",
@@ -534,12 +534,12 @@ repack("pak") {
     ":resources",
     "//content:resources",
     "//content/app/resources",
-    "//content/app/strings",
     "//content/browser/tracing:resources",
     "//mojo/public/js:resources",
     "//net:net_resources",
     "//third_party/blink/public:resources",
     "//third_party/blink/public:scaled_resources_100_percent",
+    "//third_party/blink/public/strings",
     "//ui/resources",
     "//ui/strings",
   ]

content/shell/common/shell_content_client.cc

@@ -10,10 +10,10 @@
 #include "base/values.h"
 #include "build/build_config.h"
 #include "content/app/resources/grit/content_resources.h"
-#include "content/app/strings/grit/content_strings.h"
 #include "content/public/common/content_switches.h"
 #include "content/shell/common/shell_switches.h"
 #include "content/shell/grit/shell_resources.h"
+#include "third_party/blink/public/strings/grit/blink_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 

content/test/BUILD.gn

@@ -1287,9 +1287,9 @@ test("content_browsertests") {
     ]
 
     deps += [
-      "//content/app/strings",
       "//net:net_resources",
       "//third_party/blink/public:resources",
+      "//third_party/blink/public/strings",
       "//third_party/iaccessible2",
       "//third_party/isimpledom",
     ]

extensions/BUILD.gn

@@ -168,7 +168,6 @@ repack("shell_and_test_pak") {
   testonly = true
 
   sources = [
-    "$root_gen_dir/content/app/strings/content_strings_en-US.pak",
     "$root_gen_dir/content/browser/devtools/devtools_resources.pak",
     "$root_gen_dir/content/content_resources.pak",
     "$root_gen_dir/content/shell/shell_resources.pak",
@@ -180,6 +179,7 @@ repack("shell_and_test_pak") {
     "$root_gen_dir/mojo/public/js/mojo_bindings_resources.pak",
     "$root_gen_dir/third_party/blink/public/resources/blink_resources.pak",
     "$root_gen_dir/third_party/blink/public/resources/blink_scaled_resources_100_percent.pak",
+    "$root_gen_dir/third_party/blink/public/strings/blink_strings_en-US.pak",
     "$root_gen_dir/ui/resources/ui_resources_100_percent.pak",
     "$root_gen_dir/ui/strings/app_locale_settings_en-US.pak",
     "$root_gen_dir/ui/strings/ui_strings_en-US.pak",
@@ -190,7 +190,6 @@ repack("shell_and_test_pak") {
   deps = [
     ":extensions_resources",
     "//content:resources",
-    "//content/app/strings",
     "//content/browser/devtools:devtools_resources",
     "//content/shell:resources",
     "//extensions/shell:resources",
@@ -198,6 +197,7 @@ repack("shell_and_test_pak") {
     "//mojo/public/js:resources",
     "//third_party/blink/public:resources",
     "//third_party/blink/public:scaled_resources_100_percent",
+    "//third_party/blink/public/strings",
     "//ui/resources",
     "//ui/strings",
   ]

extensions/renderer/BUILD.gn

@@ -258,7 +258,6 @@ jumbo_source_set("renderer") {
     "//components/guest_view/renderer",
     "//components/version_info",
     "//content:resources",
-    "//content/app/strings:strings",
     "//content/public/renderer",
     "//extensions:extensions_resources",
     "//extensions/common",
@@ -268,6 +267,7 @@ jumbo_source_set("renderer") {
     "//skia",
     "//storage/common",
     "//third_party/blink/public:blink",
+    "//third_party/blink/public/strings:strings",
     "//third_party/cld_3/src/src:cld_3",
     "//third_party/zlib/google:compression_utils",
   ]

extensions/renderer/DEPS

@@ -1,6 +1,5 @@
 include_rules = [
   "+components/translate/core/language_detection",
-  "+content/app/strings/grit",
   "+content/public/renderer",
 
   "+gin",
@@ -17,6 +16,7 @@ include_rules = [
   "+third_party/blink/public/mojom/frame/document_interface_broker.mojom.h",
   "+third_party/blink/public/mojom/service_worker/service_worker_registration.mojom.h",
   "+third_party/blink/public/platform",
+  "+third_party/blink/public/strings/grit/blink_strings.h",
   "+third_party/blink/public/web",
   "+third_party/zlib/google/compression_utils.h",
 

extensions/renderer/api/automation/automation_internal_custom_bindings.cc

@@ -20,7 +20,6 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/values.h"
-#include "content/app/strings/grit/content_strings.h"
 #include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_thread.h"
 #include "content/public/renderer/render_view.h"
@@ -34,6 +33,7 @@
 #include "gin/converter.h"
 #include "gin/data_object_builder.h"
 #include "ipc/message_filter.h"
+#include "third_party/blink/public/strings/grit/blink_strings.h"
 #include "third_party/blink/public/web/web_local_frame.h"
 #include "ui/accessibility/ax_enum_util.h"
 #include "ui/accessibility/ax_enums.mojom.h"

fuchsia/engine/BUILD.gn

@@ -31,13 +31,13 @@ repack("web_engine_pak") {
     "$root_gen_dir/components/components_resources.pak",
     "$root_gen_dir/components/strings/components_strings_en-US.pak",
     "$root_gen_dir/content/app/resources/content_resources_100_percent.pak",
-    "$root_gen_dir/content/app/strings/content_strings_en-US.pak",
     "$root_gen_dir/content/browser/tracing/tracing_resources.pak",
     "$root_gen_dir/content/content_resources.pak",
     "$root_gen_dir/mojo/public/js/mojo_bindings_resources.pak",
     "$root_gen_dir/net/net_resources.pak",
     "$root_gen_dir/third_party/blink/public/resources/blink_resources.pak",
     "$root_gen_dir/third_party/blink/public/resources/blink_scaled_resources_100_percent.pak",
+    "$root_gen_dir/third_party/blink/public/strings/blink_strings_en-US.pak",
     "$root_gen_dir/ui/resources/ui_resources_100_percent.pak",
     "$root_gen_dir/ui/strings/app_locale_settings_en-US.pak",
     "$root_gen_dir/ui/strings/ui_strings_en-US.pak",
@@ -48,13 +48,13 @@ repack("web_engine_pak") {
     "//components/strings",
     "//content:resources",
     "//content/app/resources",
-    "//content/app/strings",
     "//content/browser/tracing:resources",
     "//gpu/command_buffer/service",
     "//mojo/public/js:resources",
     "//net:net_resources",
     "//third_party/blink/public:resources",
     "//third_party/blink/public:scaled_resources_100_percent",
+    "//third_party/blink/public/strings",
     "//ui/resources",
     "//ui/strings",
   ]

headless/BUILD.gn

@@ -33,7 +33,6 @@ repack("pak") {
     "$root_gen_dir/components/components_resources.pak",
     "$root_gen_dir/components/strings/components_strings_en-US.pak",
     "$root_gen_dir/content/app/resources/content_resources_100_percent.pak",
-    "$root_gen_dir/content/app/strings/content_strings_en-US.pak",
     "$root_gen_dir/content/browser/devtools/devtools_resources.pak",
     "$root_gen_dir/content/browser/tracing/tracing_resources.pak",
     "$root_gen_dir/content/content_resources.pak",
@@ -42,6 +41,7 @@ repack("pak") {
     "$root_gen_dir/net/net_resources.pak",
     "$root_gen_dir/third_party/blink/public/resources/blink_resources.pak",
     "$root_gen_dir/third_party/blink/public/resources/blink_scaled_resources_100_percent.pak",
+    "$root_gen_dir/third_party/blink/public/strings/blink_strings_en-US.pak",
     "$root_gen_dir/ui/resources/ui_resources_100_percent.pak",
     "$root_gen_dir/ui/resources/webui_resources.pak",
     "$root_gen_dir/ui/strings/app_locale_settings_en-US.pak",
@@ -60,13 +60,13 @@ repack("pak") {
     "//components/strings",
     "//content:resources",
     "//content/app/resources",
-    "//content/app/strings",
     "//content/browser/devtools:resources",
     "//content/browser/tracing:resources",
     "//mojo/public/js:resources",
     "//net:net_resources",
     "//third_party/blink/public:resources",
     "//third_party/blink/public:scaled_resources_100_percent",
+    "//third_party/blink/public/strings",
     "//ui/resources",
     "//ui/strings",
   ]

third_party/blink/public/strings/BUILD.gn

@@ -0,0 +1,66 @@
+# Copyright 2014 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//tools/grit/grit_rule.gni")
+
+grit("strings") {
+  source = "blink_strings.grd"
+  outputs = [
+    "grit/blink_strings.h",
+    "blink_strings_am.pak",
+    "blink_strings_ar.pak",
+    "blink_strings_bg.pak",
+    "blink_strings_bn.pak",
+    "blink_strings_ca.pak",
+    "blink_strings_cs.pak",
+    "blink_strings_da.pak",
+    "blink_strings_de.pak",
+    "blink_strings_el.pak",
+    "blink_strings_en-GB.pak",
+    "blink_strings_en-US.pak",
+    "blink_strings_es.pak",
+    "blink_strings_es-419.pak",
+    "blink_strings_et.pak",
+    "blink_strings_fa.pak",
+    "blink_strings_fake-bidi.pak",
+    "blink_strings_fi.pak",
+    "blink_strings_fil.pak",
+    "blink_strings_fr.pak",
+    "blink_strings_gu.pak",
+    "blink_strings_he.pak",
+    "blink_strings_hi.pak",
+    "blink_strings_hr.pak",
+    "blink_strings_hu.pak",
+    "blink_strings_id.pak",
+    "blink_strings_it.pak",
+    "blink_strings_ja.pak",
+    "blink_strings_kn.pak",
+    "blink_strings_ko.pak",
+    "blink_strings_lt.pak",
+    "blink_strings_lv.pak",
+    "blink_strings_ml.pak",
+    "blink_strings_mr.pak",
+    "blink_strings_ms.pak",
+    "blink_strings_nl.pak",
+    "blink_strings_nb.pak",
+    "blink_strings_pl.pak",
+    "blink_strings_pt-BR.pak",
+    "blink_strings_pt-PT.pak",
+    "blink_strings_ro.pak",
+    "blink_strings_ru.pak",
+    "blink_strings_sk.pak",
+    "blink_strings_sl.pak",
+    "blink_strings_sr.pak",
+    "blink_strings_sv.pak",
+    "blink_strings_sw.pak",
+    "blink_strings_ta.pak",
+    "blink_strings_te.pak",
+    "blink_strings_th.pak",
+    "blink_strings_tr.pak",
+    "blink_strings_uk.pak",
+    "blink_strings_vi.pak",
+    "blink_strings_zh-CN.pak",
+    "blink_strings_zh-TW.pak",
+  ]
+}

third_party/blink/public/strings/blink_strings.grd

@@ -43,120 +43,120 @@ below:
     for more details.
     Note that all output references are relative to the output directory
     which is specified at build time. -->
-    <output filename="grit/content_strings.h" type="rc_header">
+    <output filename="grit/blink_strings.h" type="rc_header">
       <emit emit_type='prepend'></emit>
     </output>
-    <output filename="content_strings_am.pak" type="data_package" lang="am" />
-    <output filename="content_strings_ar.pak" type="data_package" lang="ar" />
-    <output filename="content_strings_bg.pak" type="data_package" lang="bg" />
-    <output filename="content_strings_bn.pak" type="data_package" lang="bn" />
-    <output filename="content_strings_ca.pak" type="data_package" lang="ca" />
-    <output filename="content_strings_cs.pak" type="data_package" lang="cs" />
-    <output filename="content_strings_da.pak" type="data_package" lang="da" />
-    <output filename="content_strings_de.pak" type="data_package" lang="de" />
-    <output filename="content_strings_el.pak" type="data_package" lang="el" />
-    <output filename="content_strings_en-GB.pak" type="data_package" lang="en-GB" />
-    <output filename="content_strings_en-US.pak" type="data_package" lang="en" />
-    <output filename="content_strings_es.pak" type="data_package" lang="es" />
-    <output filename="content_strings_es-419.pak" type="data_package" lang="es-419" />
-    <output filename="content_strings_et.pak" type="data_package" lang="et" />
-    <output filename="content_strings_fa.pak" type="data_package" lang="fa" />
-    <output filename="content_strings_fake-bidi.pak" type="data_package" lang="fake-bidi" />
-    <output filename="content_strings_fi.pak" type="data_package" lang="fi" />
-    <output filename="content_strings_fil.pak" type="data_package" lang="fil" />
-    <output filename="content_strings_fr.pak" type="data_package" lang="fr" />
-    <output filename="content_strings_gu.pak" type="data_package" lang="gu" />
-    <output filename="content_strings_he.pak" type="data_package" lang="he" />
-    <output filename="content_strings_hi.pak" type="data_package" lang="hi" />
-    <output filename="content_strings_hr.pak" type="data_package" lang="hr" />
-    <output filename="content_strings_hu.pak" type="data_package" lang="hu" />
-    <output filename="content_strings_id.pak" type="data_package" lang="id" />
-    <output filename="content_strings_it.pak" type="data_package" lang="it" />
-    <output filename="content_strings_ja.pak" type="data_package" lang="ja" />
-    <output filename="content_strings_kn.pak" type="data_package" lang="kn" />
-    <output filename="content_strings_ko.pak" type="data_package" lang="ko" />
-    <output filename="content_strings_lt.pak" type="data_package" lang="lt" />
-    <output filename="content_strings_lv.pak" type="data_package" lang="lv" />
-    <output filename="content_strings_ml.pak" type="data_package" lang="ml" />
-    <output filename="content_strings_mr.pak" type="data_package" lang="mr" />
-    <output filename="content_strings_ms.pak" type="data_package" lang="ms" />
-    <output filename="content_strings_nl.pak" type="data_package" lang="nl" />
+    <output filename="blink_strings_am.pak" type="data_package" lang="am" />
+    <output filename="blink_strings_ar.pak" type="data_package" lang="ar" />
+    <output filename="blink_strings_bg.pak" type="data_package" lang="bg" />
+    <output filename="blink_strings_bn.pak" type="data_package" lang="bn" />
+    <output filename="blink_strings_ca.pak" type="data_package" lang="ca" />
+    <output filename="blink_strings_cs.pak" type="data_package" lang="cs" />
+    <output filename="blink_strings_da.pak" type="data_package" lang="da" />
+    <output filename="blink_strings_de.pak" type="data_package" lang="de" />
+    <output filename="blink_strings_el.pak" type="data_package" lang="el" />
+    <output filename="blink_strings_en-GB.pak" type="data_package" lang="en-GB" />
+    <output filename="blink_strings_en-US.pak" type="data_package" lang="en" />
+    <output filename="blink_strings_es.pak" type="data_package" lang="es" />
+    <output filename="blink_strings_es-419.pak" type="data_package" lang="es-419" />
+    <output filename="blink_strings_et.pak" type="data_package" lang="et" />
+    <output filename="blink_strings_fa.pak" type="data_package" lang="fa" />
+    <output filename="blink_strings_fake-bidi.pak" type="data_package" lang="fake-bidi" />
+    <output filename="blink_strings_fi.pak" type="data_package" lang="fi" />
+    <output filename="blink_strings_fil.pak" type="data_package" lang="fil" />
+    <output filename="blink_strings_fr.pak" type="data_package" lang="fr" />
+    <output filename="blink_strings_gu.pak" type="data_package" lang="gu" />
+    <output filename="blink_strings_he.pak" type="data_package" lang="he" />
+    <output filename="blink_strings_hi.pak" type="data_package" lang="hi" />
+    <output filename="blink_strings_hr.pak" type="data_package" lang="hr" />
+    <output filename="blink_strings_hu.pak" type="data_package" lang="hu" />
+    <output filename="blink_strings_id.pak" type="data_package" lang="id" />
+    <output filename="blink_strings_it.pak" type="data_package" lang="it" />
+    <output filename="blink_strings_ja.pak" type="data_package" lang="ja" />
+    <output filename="blink_strings_kn.pak" type="data_package" lang="kn" />
+    <output filename="blink_strings_ko.pak" type="data_package" lang="ko" />
+    <output filename="blink_strings_lt.pak" type="data_package" lang="lt" />
+    <output filename="blink_strings_lv.pak" type="data_package" lang="lv" />
+    <output filename="blink_strings_ml.pak" type="data_package" lang="ml" />
+    <output filename="blink_strings_mr.pak" type="data_package" lang="mr" />
+    <output filename="blink_strings_ms.pak" type="data_package" lang="ms" />
+    <output filename="blink_strings_nl.pak" type="data_package" lang="nl" />
     <!-- The translation console uses 'no' for Norwegian Bokmål. It should
          be 'nb'. -->
-    <output filename="content_strings_nb.pak" type="data_package" lang="no" />
-    <output filename="content_strings_pl.pak" type="data_package" lang="pl" />
-    <output filename="content_strings_pt-BR.pak" type="data_package" lang="pt-BR" />
-    <output filename="content_strings_pt-PT.pak" type="data_package" lang="pt-PT" />
-    <output filename="content_strings_ro.pak" type="data_package" lang="ro" />
-    <output filename="content_strings_ru.pak" type="data_package" lang="ru" />
-    <output filename="content_strings_sk.pak" type="data_package" lang="sk" />
-    <output filename="content_strings_sl.pak" type="data_package" lang="sl" />
-    <output filename="content_strings_sr.pak" type="data_package" lang="sr" />
-    <output filename="content_strings_sv.pak" type="data_package" lang="sv" />
-    <output filename="content_strings_sw.pak" type="data_package" lang="sw" />
-    <output filename="content_strings_ta.pak" type="data_package" lang="ta" />
-    <output filename="content_strings_te.pak" type="data_package" lang="te" />
-    <output filename="content_strings_th.pak" type="data_package" lang="th" />
-    <output filename="content_strings_tr.pak" type="data_package" lang="tr" />
-    <output filename="content_strings_uk.pak" type="data_package" lang="uk" />
-    <output filename="content_strings_vi.pak" type="data_package" lang="vi" />
-    <output filename="content_strings_zh-CN.pak" type="data_package" lang="zh-CN" />
-    <output filename="content_strings_zh-TW.pak" type="data_package" lang="zh-TW" />
+    <output filename="blink_strings_nb.pak" type="data_package" lang="no" />
+    <output filename="blink_strings_pl.pak" type="data_package" lang="pl" />
+    <output filename="blink_strings_pt-BR.pak" type="data_package" lang="pt-BR" />
+    <output filename="blink_strings_pt-PT.pak" type="data_package" lang="pt-PT" />
+    <output filename="blink_strings_ro.pak" type="data_package" lang="ro" />
+    <output filename="blink_strings_ru.pak" type="data_package" lang="ru" />
+    <output filename="blink_strings_sk.pak" type="data_package" lang="sk" />
+    <output filename="blink_strings_sl.pak" type="data_package" lang="sl" />
+    <output filename="blink_strings_sr.pak" type="data_package" lang="sr" />
+    <output filename="blink_strings_sv.pak" type="data_package" lang="sv" />
+    <output filename="blink_strings_sw.pak" type="data_package" lang="sw" />
+    <output filename="blink_strings_ta.pak" type="data_package" lang="ta" />
+    <output filename="blink_strings_te.pak" type="data_package" lang="te" />
+    <output filename="blink_strings_th.pak" type="data_package" lang="th" />
+    <output filename="blink_strings_tr.pak" type="data_package" lang="tr" />
+    <output filename="blink_strings_uk.pak" type="data_package" lang="uk" />
+    <output filename="blink_strings_vi.pak" type="data_package" lang="vi" />
+    <output filename="blink_strings_zh-CN.pak" type="data_package" lang="zh-CN" />
+    <output filename="blink_strings_zh-TW.pak" type="data_package" lang="zh-TW" />
   </outputs>
   <translations>
-    <file path="translations/content_strings_am.xtb" lang="am" />
-    <file path="translations/content_strings_ar.xtb" lang="ar" />
-    <file path="translations/content_strings_bg.xtb" lang="bg" />
-    <file path="translations/content_strings_bn.xtb" lang="bn" />
-    <file path="translations/content_strings_ca.xtb" lang="ca" />
-    <file path="translations/content_strings_cs.xtb" lang="cs" />
-    <file path="translations/content_strings_da.xtb" lang="da" />
-    <file path="translations/content_strings_de.xtb" lang="de" />
-    <file path="translations/content_strings_el.xtb" lang="el" />
-    <file path="translations/content_strings_en-GB.xtb" lang="en-GB" />
-    <file path="translations/content_strings_es.xtb" lang="es" />
-    <file path="translations/content_strings_es-419.xtb" lang="es-419" />
-    <file path="translations/content_strings_et.xtb" lang="et" />
-    <file path="translations/content_strings_fa.xtb" lang="fa" />
-    <file path="translations/content_strings_fi.xtb" lang="fi" />
-    <file path="translations/content_strings_fil.xtb" lang="fil" />
-    <file path="translations/content_strings_fr.xtb" lang="fr" />
-    <file path="translations/content_strings_gu.xtb" lang="gu" />
-    <file path="translations/content_strings_hi.xtb" lang="hi" />
-    <file path="translations/content_strings_hr.xtb" lang="hr" />
-    <file path="translations/content_strings_hu.xtb" lang="hu" />
-    <file path="translations/content_strings_id.xtb" lang="id" />
-    <file path="translations/content_strings_it.xtb" lang="it" />
+    <file path="translations/blink_strings_am.xtb" lang="am" />
+    <file path="translations/blink_strings_ar.xtb" lang="ar" />
+    <file path="translations/blink_strings_bg.xtb" lang="bg" />
+    <file path="translations/blink_strings_bn.xtb" lang="bn" />
+    <file path="translations/blink_strings_ca.xtb" lang="ca" />
+    <file path="translations/blink_strings_cs.xtb" lang="cs" />
+    <file path="translations/blink_strings_da.xtb" lang="da" />
+    <file path="translations/blink_strings_de.xtb" lang="de" />
+    <file path="translations/blink_strings_el.xtb" lang="el" />
+    <file path="translations/blink_strings_en-GB.xtb" lang="en-GB" />
+    <file path="translations/blink_strings_es.xtb" lang="es" />
+    <file path="translations/blink_strings_es-419.xtb" lang="es-419" />
+    <file path="translations/blink_strings_et.xtb" lang="et" />
+    <file path="translations/blink_strings_fa.xtb" lang="fa" />
+    <file path="translations/blink_strings_fi.xtb" lang="fi" />
+    <file path="translations/blink_strings_fil.xtb" lang="fil" />
+    <file path="translations/blink_strings_fr.xtb" lang="fr" />
+    <file path="translations/blink_strings_gu.xtb" lang="gu" />
+    <file path="translations/blink_strings_hi.xtb" lang="hi" />
+    <file path="translations/blink_strings_hr.xtb" lang="hr" />
+    <file path="translations/blink_strings_hu.xtb" lang="hu" />
+    <file path="translations/blink_strings_id.xtb" lang="id" />
+    <file path="translations/blink_strings_it.xtb" lang="it" />
     <!-- The translation console uses 'iw' for Hebrew, but we use 'he'. -->
-    <file path="translations/content_strings_iw.xtb" lang="he" />
-    <file path="translations/content_strings_ja.xtb" lang="ja" />
-    <file path="translations/content_strings_kn.xtb" lang="kn" />
-    <file path="translations/content_strings_ko.xtb" lang="ko" />
-    <file path="translations/content_strings_lt.xtb" lang="lt" />
-    <file path="translations/content_strings_lv.xtb" lang="lv" />
-    <file path="translations/content_strings_ml.xtb" lang="ml" />
-    <file path="translations/content_strings_mr.xtb" lang="mr" />
-    <file path="translations/content_strings_ms.xtb" lang="ms" />
-    <file path="translations/content_strings_nl.xtb" lang="nl" />
-    <file path="translations/content_strings_no.xtb" lang="no" />
-    <file path="translations/content_strings_pl.xtb" lang="pl" />
-    <file path="translations/content_strings_pt-BR.xtb" lang="pt-BR" />
-    <file path="translations/content_strings_pt-PT.xtb" lang="pt-PT" />
-    <file path="translations/content_strings_ro.xtb" lang="ro" />
-    <file path="translations/content_strings_ru.xtb" lang="ru" />
-    <file path="translations/content_strings_sk.xtb" lang="sk" />
-    <file path="translations/content_strings_sl.xtb" lang="sl" />
-    <file path="translations/content_strings_sr.xtb" lang="sr" />
-    <file path="translations/content_strings_sv.xtb" lang="sv" />
-    <file path="translations/content_strings_sw.xtb" lang="sw" />
-    <file path="translations/content_strings_ta.xtb" lang="ta" />
-    <file path="translations/content_strings_te.xtb" lang="te" />
-    <file path="translations/content_strings_th.xtb" lang="th" />
-    <file path="translations/content_strings_tr.xtb" lang="tr" />
-    <file path="translations/content_strings_uk.xtb" lang="uk" />
-    <file path="translations/content_strings_vi.xtb" lang="vi" />
-    <file path="translations/content_strings_zh-CN.xtb" lang="zh-CN" />
-    <file path="translations/content_strings_zh-TW.xtb" lang="zh-TW" />
+    <file path="translations/blink_strings_iw.xtb" lang="he" />
+    <file path="translations/blink_strings_ja.xtb" lang="ja" />
+    <file path="translations/blink_strings_kn.xtb" lang="kn" />
+    <file path="translations/blink_strings_ko.xtb" lang="ko" />
+    <file path="translations/blink_strings_lt.xtb" lang="lt" />
+    <file path="translations/blink_strings_lv.xtb" lang="lv" />
+    <file path="translations/blink_strings_ml.xtb" lang="ml" />
+    <file path="translations/blink_strings_mr.xtb" lang="mr" />
+    <file path="translations/blink_strings_ms.xtb" lang="ms" />
+    <file path="translations/blink_strings_nl.xtb" lang="nl" />
+    <file path="translations/blink_strings_no.xtb" lang="no" />
+    <file path="translations/blink_strings_pl.xtb" lang="pl" />
+    <file path="translations/blink_strings_pt-BR.xtb" lang="pt-BR" />
+    <file path="translations/blink_strings_pt-PT.xtb" lang="pt-PT" />
+    <file path="translations/blink_strings_ro.xtb" lang="ro" />
+    <file path="translations/blink_strings_ru.xtb" lang="ru" />
+    <file path="translations/blink_strings_sk.xtb" lang="sk" />
+    <file path="translations/blink_strings_sl.xtb" lang="sl" />
+    <file path="translations/blink_strings_sr.xtb" lang="sr" />
+    <file path="translations/blink_strings_sv.xtb" lang="sv" />
+    <file path="translations/blink_strings_sw.xtb" lang="sw" />
+    <file path="translations/blink_strings_ta.xtb" lang="ta" />
+    <file path="translations/blink_strings_te.xtb" lang="te" />
+    <file path="translations/blink_strings_th.xtb" lang="th" />
+    <file path="translations/blink_strings_tr.xtb" lang="tr" />
+    <file path="translations/blink_strings_uk.xtb" lang="uk" />
+    <file path="translations/blink_strings_vi.xtb" lang="vi" />
+    <file path="translations/blink_strings_zh-CN.xtb" lang="zh-CN" />
+    <file path="translations/blink_strings_zh-TW.xtb" lang="zh-TW" />
   </translations>
   <release seq="1" allow_pseudo="false">
     <messages fallback_to_english="true">

tools/gritsettings/resource_ids

@@ -241,9 +241,6 @@
   "content/app/resources/content_resources.grd": {
     "structures": [20000],
   },
-  "content/app/strings/content_strings.grd": {
-    "messages": [20100],
-  },
   "content/content_resources.grd": {
     "includes": [20400],
   },
@@ -317,106 +314,109 @@
   # START "everything else" section.
   # Everything but chrome/, components/, content/, and ios/
   "android_webview/ui/aw_resources.grd": {
-    "includes": [23500],
+    "includes": [23100],
   },
   "android_webview/ui/aw_strings.grd": {
-    "messages": [23510],
+    "messages": [23110],
   },
 
   "ash/app_list/resources/app_list_resources.grd": {
-    "structures": [23520],
+    "structures": [23120],
   },
   "ash/ash_strings.grd": {
-    "messages": [23525],
+    "messages": [23125],
   },
   "ash/components/ash_components_strings.grd": {
-    "messages": [24130],
+    "messages": [23730],
   },
   "ash/components/resources/ash_components_resources.grd": {
-    "structures": [24350],
+    "structures": [23950],
   },
   "ash/keyboard/ui/keyboard_resources.grd": {
-    "includes": [26800],
+    "includes": [23960],
   },
   "ash/login/resources/login_resources.grd": {
-    "structures": [24360],
+    "structures": [24060],
   },
   "ash/public/cpp/resources/ash_public_unscaled_resources.grd": {
-    "includes": [24370],
+    "includes": [24070],
   },
   "ash/shell/ash_shell_resources.grd": {
-    "includes": [24380],
+    "includes": [24080],
   },
 
   "chromecast/browser/cast_browser_resources.grd": {
-    "includes": [24400],
+    "includes": [24100],
   },
   "chromecast/renderer/resources/extensions_renderer_resources.grd": {
-    "includes": [24410],
+    "includes": [24110],
   },
 
   "cloud_print/virtual_driver/win/install/virtual_driver_setup_resources.grd": {
-    "includes": [24450],
-    "messages": [24460],
+    "includes": [24150],
+    "messages": [24160],
   },
 
   "device/bluetooth/bluetooth_strings.grd": {
-    "messages": [24500],
+    "messages": [24200],
   },
 
   "device/fido/fido_strings.grd": {
-    "messages": [24540],
+    "messages": [24240],
   },
 
   "extensions/browser/resources/extensions_browser_resources.grd": {
-    "structures": [24550],
+    "structures": [24250],
   },
   "extensions/extensions_resources.grd": {
-    "includes": [24560],
+    "includes": [24260],
   },
   "extensions/renderer/resources/extensions_renderer_resources.grd": {
-    "includes": [24570],
-    "structures": [24700],
+    "includes": [24270],
+    "structures": [24400],
   },
   "extensions/shell/app_shell_resources.grd": {
-    "includes": [24710],
+    "includes": [24410],
   },
   "extensions/strings/extensions_strings.grd": {
-    "messages": [24720],
+    "messages": [24420],
   },
 
   "headless/lib/resources/headless_lib_resources.grd": {
-    "includes": [24800],
+    "includes": [24500],
   },
 
   "mojo/public/js/mojo_bindings_resources.grd": {
-    "includes": [24850],
+    "includes": [24550],
   },
 
   "net/base/net_resources.grd": {
-    "includes": [24890],
+    "includes": [24590],
   },
 
   "remoting/resources/remoting_strings.grd": {
-    "messages": [24900],
+    "messages": [24600],
   },
 
   "services/services_strings.grd": {
-    "messages": [25300],
+    "messages": [25000],
   },
 
   "third_party/blink/public/blink_image_resources.grd": {
-    "structures": [25400],
+    "structures": [25100],
   },
   "third_party/blink/public/blink_resources.grd": {
-    "includes": [25500],
+    "includes": [25200],
   },
   "third_party/blink/renderer/modules/media_controls/touchless/resources/media_controls_touchless_resources.grd": {
-    "structures": [25590],
+    "structures": [25290],
   },
   "third_party/blink/renderer/modules/media_controls/resources/media_controls_resources.grd": {
-    "includes": [25600],
-    "structures": [25700],
+    "includes": [25300],
+    "structures": [25400],
+  },
+  "third_party/blink/public/strings/blink_strings.grd": {
+    "messages": [25600],
   },
   "third_party/ink/ink_resources.grd": {
     "includes": [25900],

tools/gritsettings/translation_expectations.pyl

@@ -48,7 +48,6 @@
       "components/components_google_chrome_strings.grd",
       "components/components_strings.grd",
       "components/embedder_support/android/java/strings/web_contents_delegate_android_strings.grd",
-      "content/app/strings/content_strings.grd",
       "content/public/android/java/strings/android_content_strings.grd",
       "device/bluetooth/bluetooth_strings.grd",
       "device/fido/fido_strings.grd",
@@ -65,6 +64,7 @@
       "remoting/resources/remoting_strings.grd",
       "services/services_strings.grd",
       "third_party/libaddressinput/chromium/address_input_strings.grd",
+      "third_party/blink/public/strings/blink_strings.grd",
       "ui/accessibility/extensions/strings/accessibility_extensions_strings.grd",
       "ui/android/java/strings/android_ui_strings.grd",
       "ui/chromeos/ui_chromeos_strings.grd",

weblayer/BUILD.gn

@@ -78,7 +78,6 @@ jumbo_static_library("weblayer_lib") {
     "//cc",
     "//content:resources",
     "//content/app/resources",
-    "//content/app/strings",
     "//content/public/app:both",
     "//content/public/browser",
     "//content/public/child",
@@ -89,6 +88,7 @@ jumbo_static_library("weblayer_lib") {
     "//sandbox",
     "//services/service_manager/embedder:embedder_result_codes",
     "//skia",
+    "//third_party/blink/public/strings",
     "//third_party/icu",
     "//ui/base",
     "//ui/base/clipboard",

weblayer/common/DEPS

@@ -1,6 +1,6 @@
 include_rules = [
   "+content/app/resources",
-  "+content/app/strings",
   "+content/public/common",
+  "+third_party/blink/public/strings/grit/blink_strings.h",
   "+ui/base",
 ]

weblayer/common/content_client_impl.cc

@@ -6,7 +6,7 @@
 
 #include "build/build_config.h"
 #include "content/app/resources/grit/content_resources.h"
-#include "content/app/strings/grit/content_strings.h"
+#include "third_party/blink/public/strings/grit/blink_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 

weblayer/shell/BUILD.gn

@@ -171,13 +171,13 @@ repack("support_pak") {
 
   sources = [
     "$root_gen_dir/content/app/resources/content_resources_100_percent.pak",
-    "$root_gen_dir/content/app/strings/content_strings_en-US.pak",
     "$root_gen_dir/content/browser/tracing/tracing_resources.pak",
     "$root_gen_dir/content/content_resources.pak",
     "$root_gen_dir/mojo/public/js/mojo_bindings_resources.pak",
     "$root_gen_dir/net/net_resources.pak",
     "$root_gen_dir/third_party/blink/public/resources/blink_resources.pak",
     "$root_gen_dir/third_party/blink/public/resources/blink_scaled_resources_100_percent.pak",
+    "$root_gen_dir/third_party/blink/public/strings/blink_strings_en-US.pak",
     "$root_gen_dir/ui/resources/ui_resources_100_percent.pak",
     "$root_gen_dir/ui/resources/webui_resources.pak",
     "$root_gen_dir/ui/strings/app_locale_settings_en-US.pak",
@@ -187,12 +187,12 @@ repack("support_pak") {
   deps = [
     "//content:resources",
     "//content/app/resources",
-    "//content/app/strings",
     "//content/browser/tracing:resources",
     "//mojo/public/js:resources",
     "//net:net_resources",
     "//third_party/blink/public:resources",
     "//third_party/blink/public:scaled_resources_100_percent",
+    "//third_party/blink/public/strings",
     "//ui/resources",
     "//ui/strings",
   ]