Move strings from webkit/ content/.

This moves the strings that were previously in webkit/glue/resources/*.xtb into
 content/app/strings/translations/*.xtb and makes the necessary GYP, GN and C++ changes
 to make all this work.

BUG=338338
TEST=content_shell, content_unittests. No functional changes.
R=jochen@chromium.org,avi@chromium.org
TBR=darin@chromium.org

Review URL: https://codereview.chromium.org/423613003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288589 0039d316-1c4b-4281-b951-d872f2087c98

85 files changed, 307 insertions, 278 deletions

diff --git a/android_webview/Android.mk b/android_webview/Android.mk
index 84e1364..d0264b4 100644
--- a/android_webview/Android.mk
+++ b/android_webview/Android.mk
@@ -63,317 +63,317 @@ include $(LOCAL_PATH)/webview_pak.mk
 include $(CLEAR_VARS)
 LOCAL_MODULE := webviewchromium_webkit_strings_am.pak
 LOCAL_MODULE_STEM := am
-LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_am.pak
+LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_am.pak
 include $(LOCAL_PATH)/webview_pak.mk
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := webviewchromium_webkit_strings_ar.pak
 LOCAL_MODULE_STEM := ar
-LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_ar.pak
+LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_ar.pak
 include $(LOCAL_PATH)/webview_pak.mk
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := webviewchromium_webkit_strings_bg.pak
 LOCAL_MODULE_STEM := bg
-LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_bg.pak
+LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_bg.pak
 include $(LOCAL_PATH)/webview_pak.mk
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := webviewchromium_webkit_strings_bn.pak
 LOCAL_MODULE_STEM := bn
-LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_bn.pak
+LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_bn.pak
 include $(LOCAL_PATH)/webview_pak.mk
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := webviewchromium_webkit_strings_ca.pak
 LOCAL_MODULE_STEM := ca
-LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_ca.pak
+LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_ca.pak
 include $(LOCAL_PATH)/webview_pak.mk
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := webviewchromium_webkit_strings_cs.pak
 LOCAL_MODULE_STEM := cs
-LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_cs.pak
+LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_cs.pak
 include $(LOCAL_PATH)/webview_pak.mk
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := webviewchromium_webkit_strings_da.pak
 LOCAL_MODULE_STEM := da
-LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_da.pak
+LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_da.pak
 include $(LOCAL_PATH)/webview_pak.mk
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := webviewchromium_webkit_strings_de.pak
 LOCAL_MODULE_STEM := de
-LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_de.pak
+LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_de.pak
 include $(LOCAL_PATH)/webview_pak.mk
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := webviewchromium_webkit_strings_el.pak
 LOCAL_MODULE_STEM := el
-LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_el.pak
+LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_el.pak
 include $(LOCAL_PATH)/webview_pak.mk
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := webviewchromium_webkit_strings_en-GB.pak
 LOCAL_MODULE_STEM := en-GB
-LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_en-GB.pak
+LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_en-GB.pak
 include $(LOCAL_PATH)/webview_pak.mk
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := webviewchromium_webkit_strings_en-US.pak
 LOCAL_MODULE_STEM := en-US
-LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_en-US.pak
+LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_en-US.pak
 include $(LOCAL_PATH)/webview_pak.mk
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := webviewchromium_webkit_strings_es-419.pak
 LOCAL_MODULE_STEM := es-419
-LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_es-419.pak
+LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_es-419.pak
 include $(LOCAL_PATH)/webview_pak.mk
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := webviewchromium_webkit_strings_es.pak
 LOCAL_MODULE_STEM := es
-LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_es.pak
+LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_es.pak
 include $(LOCAL_PATH)/webview_pak.mk
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := webviewchromium_webkit_strings_et.pak
 LOCAL_MODULE_STEM := et
-LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_et.pak
+LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_et.pak
 include $(LOCAL_PATH)/webview_pak.mk
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := webviewchromium_webkit_strings_fa.pak
 LOCAL_MODULE_STEM := fa
-LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_fa.pak
+LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_fa.pak
 include $(LOCAL_PATH)/webview_pak.mk
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := webviewchromium_webkit_strings_fil.pak
 LOCAL_MODULE_STEM := fil
-LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_fil.pak
+LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_fil.pak
 include $(LOCAL_PATH)/webview_pak.mk
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := webviewchromium_webkit_strings_fi.pak
 LOCAL_MODULE_STEM := fi
-LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_fi.pak
+LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_fi.pak
 include $(LOCAL_PATH)/webview_pak.mk
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := webviewchromium_webkit_strings_fr.pak
 LOCAL_MODULE_STEM := fr
-LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_fr.pak
+LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_fr.pak
 include $(LOCAL_PATH)/webview_pak.mk
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := webviewchromium_webkit_strings_gu.pak
 LOCAL_MODULE_STEM := gu
-LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_gu.pak
+LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_gu.pak
 include $(LOCAL_PATH)/webview_pak.mk
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := webviewchromium_webkit_strings_he.pak
 LOCAL_MODULE_STEM := he
-LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_he.pak
+LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_he.pak
 include $(LOCAL_PATH)/webview_pak.mk
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := webviewchromium_webkit_strings_hi.pak
 LOCAL_MODULE_STEM := hi
-LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_hi.pak
+LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_hi.pak
 include $(LOCAL_PATH)/webview_pak.mk
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := webviewchromium_webkit_strings_hr.pak
 LOCAL_MODULE_STEM := hr
-LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_hr.pak
+LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_hr.pak
 include $(LOCAL_PATH)/webview_pak.mk
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := webviewchromium_webkit_strings_hu.pak
 LOCAL_MODULE_STEM := hu
-LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_hu.pak
+LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_hu.pak
 include $(LOCAL_PATH)/webview_pak.mk
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := webviewchromium_webkit_strings_id.pak
 LOCAL_MODULE_STEM := id
-LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_id.pak
+LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_id.pak
 include $(LOCAL_PATH)/webview_pak.mk
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := webviewchromium_webkit_strings_it.pak
 LOCAL_MODULE_STEM := it
-LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_it.pak
+LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_it.pak
 include $(LOCAL_PATH)/webview_pak.mk
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := webviewchromium_webkit_strings_ja.pak
 LOCAL_MODULE_STEM := ja
-LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_ja.pak
+LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_ja.pak
 include $(LOCAL_PATH)/webview_pak.mk
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := webviewchromium_webkit_strings_kn.pak
 LOCAL_MODULE_STEM := kn
-LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_kn.pak
+LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_kn.pak
 include $(LOCAL_PATH)/webview_pak.mk
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := webviewchromium_webkit_strings_ko.pak
 LOCAL_MODULE_STEM := ko
-LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_ko.pak
+LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_ko.pak
 include $(LOCAL_PATH)/webview_pak.mk
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := webviewchromium_webkit_strings_lt.pak
 LOCAL_MODULE_STEM := lt
-LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_lt.pak
+LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_lt.pak
 include $(LOCAL_PATH)/webview_pak.mk
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := webviewchromium_webkit_strings_lv.pak
 LOCAL_MODULE_STEM := lv
-LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_lv.pak
+LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_lv.pak
 include $(LOCAL_PATH)/webview_pak.mk
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := webviewchromium_webkit_strings_ml.pak
 LOCAL_MODULE_STEM := ml
-LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_ml.pak
+LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_ml.pak
 include $(LOCAL_PATH)/webview_pak.mk
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := webviewchromium_webkit_strings_mr.pak
 LOCAL_MODULE_STEM := mr
-LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_mr.pak
+LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_mr.pak
 include $(LOCAL_PATH)/webview_pak.mk
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := webviewchromium_webkit_strings_ms.pak
 LOCAL_MODULE_STEM := ms
-LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_ms.pak
+LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_ms.pak
 include $(LOCAL_PATH)/webview_pak.mk
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := webviewchromium_webkit_strings_nb.pak
 LOCAL_MODULE_STEM := nb
-LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_nb.pak
+LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_nb.pak
 include $(LOCAL_PATH)/webview_pak.mk
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := webviewchromium_webkit_strings_nl.pak
 LOCAL_MODULE_STEM := nl
-LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_nl.pak
+LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_nl.pak
 include $(LOCAL_PATH)/webview_pak.mk
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := webviewchromium_webkit_strings_pl.pak
 LOCAL_MODULE_STEM := pl
-LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_pl.pak
+LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_pl.pak
 include $(LOCAL_PATH)/webview_pak.mk
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := webviewchromium_webkit_strings_pt-BR.pak
 LOCAL_MODULE_STEM := pt-BR
-LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_pt-BR.pak
+LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_pt-BR.pak
 include $(LOCAL_PATH)/webview_pak.mk
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := webviewchromium_webkit_strings_pt-PT.pak
 LOCAL_MODULE_STEM := pt-PT
-LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_pt-PT.pak
+LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_pt-PT.pak
 include $(LOCAL_PATH)/webview_pak.mk
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := webviewchromium_webkit_strings_ro.pak
 LOCAL_MODULE_STEM := ro
-LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_ro.pak
+LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_ro.pak
 include $(LOCAL_PATH)/webview_pak.mk
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := webviewchromium_webkit_strings_ru.pak
 LOCAL_MODULE_STEM := ru
-LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_ru.pak
+LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_ru.pak
 include $(LOCAL_PATH)/webview_pak.mk
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := webviewchromium_webkit_strings_sk.pak
 LOCAL_MODULE_STEM := sk
-LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_sk.pak
+LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_sk.pak
 include $(LOCAL_PATH)/webview_pak.mk
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := webviewchromium_webkit_strings_sl.pak
 LOCAL_MODULE_STEM := sl
-LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_sl.pak
+LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_sl.pak
 include $(LOCAL_PATH)/webview_pak.mk
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := webviewchromium_webkit_strings_sr.pak
 LOCAL_MODULE_STEM := sr
-LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_sr.pak
+LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_sr.pak
 include $(LOCAL_PATH)/webview_pak.mk
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := webviewchromium_webkit_strings_sv.pak
 LOCAL_MODULE_STEM := sv
-LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_sv.pak
+LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_sv.pak
 include $(LOCAL_PATH)/webview_pak.mk
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := webviewchromium_webkit_strings_sw.pak
 LOCAL_MODULE_STEM := sw
-LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_sw.pak
+LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_sw.pak
 include $(LOCAL_PATH)/webview_pak.mk
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := webviewchromium_webkit_strings_ta.pak
 LOCAL_MODULE_STEM := ta
-LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_ta.pak
+LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_ta.pak
 include $(LOCAL_PATH)/webview_pak.mk
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := webviewchromium_webkit_strings_te.pak
 LOCAL_MODULE_STEM := te
-LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_te.pak
+LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_te.pak
 include $(LOCAL_PATH)/webview_pak.mk
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := webviewchromium_webkit_strings_th.pak
 LOCAL_MODULE_STEM := th
-LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_th.pak
+LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_th.pak
 include $(LOCAL_PATH)/webview_pak.mk
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := webviewchromium_webkit_strings_tr.pak
 LOCAL_MODULE_STEM := tr
-LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_tr.pak
+LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_tr.pak
 include $(LOCAL_PATH)/webview_pak.mk
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := webviewchromium_webkit_strings_uk.pak
 LOCAL_MODULE_STEM := uk
-LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_uk.pak
+LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_uk.pak
 include $(LOCAL_PATH)/webview_pak.mk
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := webviewchromium_webkit_strings_vi.pak
 LOCAL_MODULE_STEM := vi
-LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_vi.pak
+LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_vi.pak
 include $(LOCAL_PATH)/webview_pak.mk
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := webviewchromium_webkit_strings_zh-CN.pak
 LOCAL_MODULE_STEM := zh-CN
-LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_zh-CN.pak
+LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_zh-CN.pak
 include $(LOCAL_PATH)/webview_pak.mk
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := webviewchromium_webkit_strings_zh-TW.pak
 LOCAL_MODULE_STEM := zh-TW
-LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_zh-TW.pak
+LOCAL_BUILT_MODULE_STEM := content/app/strings/content_strings_zh-TW.pak
 include $(LOCAL_PATH)/webview_pak.mk
diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp
index 650f653..bd424f0 100644
--- a/android_webview/android_webview.gyp
+++ b/android_webview/android_webview.gyp
@@ -87,7 +87,7 @@
         {
           'action_name': 'add_en_US_pak_locale',
           'variables': {
-            'pak_inputs': ['<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak'],
+            'pak_inputs': ['<(SHARED_INTERMEDIATE_DIR)/content/app/strings/content_strings_en-US.pak'],
             'pak_output': '<(PRODUCT_DIR)/android_webview_apk/assets/en-US.pak',
           },
          'includes': [ '../build/repack_action.gypi' ],
diff --git a/athena/resources/athena_resources.gyp b/athena/resources/athena_resources.gyp
index 88aa5a7..d4429f00 100644
--- a/athena/resources/athena_resources.gyp
+++ b/athena/resources/athena_resources.gyp
@@ -29,11 +29,11 @@
       'type': 'none',
       'dependencies': [
         '../../ash/ash_resources.gyp:ash_resources',
+        '../../content/app/strings/content_strings.gyp:content_strings',
         '../../extensions/extensions.gyp:extensions_shell_and_test_pak',
         '../../ui/chromeos/ui_chromeos.gyp:ui_chromeos_resources',
         '../../ui/chromeos/ui_chromeos.gyp:ui_chromeos_strings',
         '../../webkit/webkit_resources.gyp:webkit_resources',
-        '../../webkit/webkit_resources.gyp:webkit_strings',
         'athena_resources',
       ],
       'actions': [{
@@ -43,10 +43,10 @@
             '<(PRODUCT_DIR)/extensions_shell_and_test.pak',
             '<(SHARED_INTERMEDIATE_DIR)/ash/resources/ash_resources_100_percent.pak',
             '<(SHARED_INTERMEDIATE_DIR)/athena/resources/athena_resources_100_percent.pak',
+            '<(SHARED_INTERMEDIATE_DIR)/content/app/strings/content_strings_en-US.pak',
             '<(SHARED_INTERMEDIATE_DIR)/ui/chromeos/resources/ui_chromeos_resources_100_percent.pak',
             '<(SHARED_INTERMEDIATE_DIR)/ui/chromeos/strings/ui_chromeos_strings_en-US.pak',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pak',
-            '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak',
           ],
           'pak_output': '<(PRODUCT_DIR)/athena_resources.pak',
         },
diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi
index 5faa9bd..2ef4b13 100644
--- a/chrome/chrome_renderer.gypi
+++ b/chrome/chrome_renderer.gypi
@@ -287,6 +287,7 @@
         '../components/components.gyp:translate_core_common',
         '../components/components.gyp:translate_core_language_detection',
         '../components/components.gyp:visitedlink_renderer',
+        '../content/app/strings/content_strings.gyp:content_strings',
         '../content/content.gyp:content_renderer',
         '../extensions/extensions.gyp:extensions_renderer',
         '../extensions/extensions_resources.gyp:extensions_resources',
diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp
index 5d715ad..2342db8 100644
--- a/chrome/chrome_resources.gyp
+++ b/chrome/chrome_resources.gyp
@@ -441,12 +441,12 @@
       'conditions': [
         ['OS != "ios"', {
           'dependencies': [
+            '<(DEPTH)/content/app/strings/content_strings.gyp:content_strings',
             '<(DEPTH)/content/content_resources.gyp:content_resources',
             '<(DEPTH)/device/bluetooth/bluetooth_strings.gyp:device_bluetooth_strings',
             '<(DEPTH)/extensions/extensions_strings.gyp:extensions_strings',
             '<(DEPTH)/third_party/WebKit/public/blink_resources.gyp:blink_resources',
             '<(DEPTH)/webkit/webkit_resources.gyp:webkit_resources',
-            '<(DEPTH)/webkit/webkit_resources.gyp:webkit_strings',
           ],
         }],
         ['use_ash==1', {
diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn
index e622f4e..64d423f 100644
--- a/chrome/renderer/BUILD.gn
+++ b/chrome/renderer/BUILD.gn
@@ -40,15 +40,16 @@ static_library("renderer") {
     "//components/translate/core/common",
     "//components/translate/core/language_detection",
     "//components/visitedlink/renderer",
+    "//content/app/strings",
     "//content/public/renderer",
     "//extensions:extensions_resources",
     "//media/cast/logging/proto",
-    "//third_party/re2",
     "//net",
     "//skia",
     "//third_party/WebKit/public:blink",
     "//third_party/icu",
     "//third_party/npapi",
+    "//third_party/re2",
     "//third_party/widevine/cdm:version_h",
     "//ui/surface",
     "//v8:v8",
diff --git a/chrome/renderer/DEPS b/chrome/renderer/DEPS
index 6ce4fb4..fe9034a 100644
--- a/chrome/renderer/DEPS
+++ b/chrome/renderer/DEPS
@@ -15,6 +15,7 @@ include_rules = [
   "+components/translate/core/common",
   "+components/translate/core/language_detection",
   "+components/visitedlink/renderer",
+  "+content/app/strings/grit",  # For generated headers
   "+content/public/child",
   "+content/public/renderer",
   "+extensions/common",
diff --git a/chrome/renderer/pepper/pepper_pdf_host.cc b/chrome/renderer/pepper/pepper_pdf_host.cc
index 1b1d3de..399ae4d 100644
--- a/chrome/renderer/pepper/pepper_pdf_host.cc
+++ b/chrome/renderer/pepper/pepper_pdf_host.cc
@@ -7,13 +7,13 @@
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/renderer/printing/print_web_view_helper.h"
+#include "content/app/strings/grit/content_strings.h"
 #include "content/public/common/referrer.h"
 #include "content/public/renderer/pepper_plugin_instance.h"
 #include "content/public/renderer/render_thread.h"
 #include "content/public/renderer/render_view.h"
 #include "content/public/renderer/renderer_ppapi_host.h"
 #include "grit/webkit_resources.h"
-#include "grit/webkit_strings.h"
 #include "ppapi/host/dispatch_host_message.h"
 #include "ppapi/host/host_message_context.h"
 #include "ppapi/host/ppapi_host.h"
diff --git a/chrome/renderer/pepper/ppb_pdf_impl.cc b/chrome/renderer/pepper/ppb_pdf_impl.cc
index aadb9d9..16317ad 100644
--- a/chrome/renderer/pepper/ppb_pdf_impl.cc
+++ b/chrome/renderer/pepper/ppb_pdf_impl.cc
@@ -11,13 +11,13 @@
 #include "build/build_config.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/renderer/printing/print_web_view_helper.h"
+#include "content/app/strings/grit/content_strings.h"
 #include "content/public/common/child_process_sandbox_support_linux.h"
 #include "content/public/common/referrer.h"
 #include "content/public/renderer/pepper_plugin_instance.h"
 #include "content/public/renderer/render_thread.h"
 #include "content/public/renderer/render_view.h"
 #include "grit/webkit_resources.h"
-#include "grit/webkit_strings.h"
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/private/ppb_pdf.h"
 #include "ppapi/c/trusted/ppb_browser_font_trusted.h"
diff --git a/chrome/renderer/plugins/chrome_plugin_placeholder.cc b/chrome/renderer/plugins/chrome_plugin_placeholder.cc
index 0d606aa..5b75b89 100644
--- a/chrome/renderer/plugins/chrome_plugin_placeholder.cc
+++ b/chrome/renderer/plugins/chrome_plugin_placeholder.cc
@@ -11,6 +11,7 @@
 #include "chrome/renderer/chrome_content_renderer_client.h"
 #include "chrome/renderer/custom_menu_commands.h"
 #include "chrome/renderer/plugins/plugin_uma.h"
+#include "content/app/strings/grit/content_strings.h"
 #include "content/public/common/context_menu_params.h"
 #include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_thread.h"
@@ -18,7 +19,6 @@
 #include "gin/object_template_builder.h"
 #include "grit/generated_resources.h"
 #include "grit/renderer_resources.h"
-#include "grit/webkit_strings.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
 #include "third_party/WebKit/public/web/WebKit.h"
diff --git a/chrome/tools/build/repack_locales.py b/chrome/tools/build/repack_locales.py
index 4637572..bd183a9 100755
--- a/chrome/tools/build/repack_locales.py
+++ b/chrome/tools/build/repack_locales.py
@@ -92,11 +92,12 @@ def calc_inputs(locale):
                   'ui_chromeos_strings_%s.pak' % locale))
 
   if OS != 'ios':
-    #e.g. '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_da.pak'
-    inputs.append(os.path.join(SHARE_INT_DIR, 'webkit',
-                  'webkit_strings_%s.pak' % locale))
+    #e.g.
+    # '<(SHARED_INTERMEDIATE_DIR)/content/app/strings/content_strings_da.pak'
+    inputs.append(os.path.join(SHARE_INT_DIR, 'content', 'app', 'strings',
+                  'content_strings_%s.pak' % locale))
 
-    #e.g. '<(SHARED_INTERMEDIATE_DIR)/ui/strings_da.pak',
+    #e.g. '<(SHARED_INTERMEDIATE_DIR)/ui/strings/ui_strings_da.pak',
     inputs.append(os.path.join(SHARE_INT_DIR, 'ui', 'strings',
                   'ui_strings_%s.pak' % locale))
 
diff --git a/chromecast/chromecast.gyp b/chromecast/chromecast.gyp
index d08cf33..989b8aa 100644
--- a/chromecast/chromecast.gyp
+++ b/chromecast/chromecast.gyp
@@ -74,6 +74,7 @@
       'type': 'none',
       'dependencies': [
         'cast_shell_resources',
+        '../content/app/strings/content_strings.gyp:content_strings',
         '../content/browser/devtools/devtools_resources.gyp:devtools_resources',
         '../content/content_resources.gyp:content_resources',
         '../net/net.gyp:net_resources',
@@ -81,7 +82,6 @@
         '../ui/resources/ui_resources.gyp:ui_resources',
         '../ui/strings/ui_strings.gyp:ui_strings',
         '../webkit/webkit_resources.gyp:webkit_resources',
-        '../webkit/webkit_resources.gyp:webkit_strings',
       ],
       'actions': [
         {
@@ -90,6 +90,7 @@
             'pak_inputs': [
               '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak',
+              '<(SHARED_INTERMEDIATE_DIR)/content/app/strings/content_strings_en-US.pak',
               '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent.pak',
               '<(SHARED_INTERMEDIATE_DIR)/ui/resources/webui_resources.pak',
@@ -97,7 +98,6 @@
               '<(SHARED_INTERMEDIATE_DIR)/ui/strings/ui_strings_en-US.pak',
               '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pak',
-              '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak',
             ],
             'pak_output': '<(PRODUCT_DIR)/cast_shell.pak',
           },
diff --git a/components/components_tests.gyp b/components/components_tests.gyp
index 8dbe4f2..6b5a7e9 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -862,10 +862,11 @@
                 # but that causes errors in other targets when
                 # resulting .res files get referenced multiple times.
                 '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources.rc',
+                '<(SHARED_INTERMEDIATE_DIR)/content/app/strings/content_strings_en-US.rc',
                 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
-                '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.rc',
               ],
               'dependencies': [
+                '<(DEPTH)/content/app/strings/content_strings.gyp:content_strings',
                 '<(DEPTH)/net/net.gyp:net_resources',
                 '<(DEPTH)/third_party/WebKit/public/blink_resources.gyp:blink_resources',
                 '<(DEPTH)/third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
diff --git a/content/DEPS b/content/DEPS
index 9d1cdbc..1fff990 100644
--- a/content/DEPS
+++ b/content/DEPS
@@ -26,10 +26,10 @@ include_rules = [
   "+crypto",
   "+grit/blink_resources.h",
   "+grit/content_resources.h",
+  "+grit/content_strings.h",
   "+grit/ui_resources.h",
   "+grit/ui_strings.h",
   "+grit/webkit_resources.h",
-  "+grit/webkit_strings.h",
   "+grit/webui_resources.h",
   "+grit/webui_resources_map.h",
 
diff --git a/content/app/strings/BUILD.gn b/content/app/strings/BUILD.gn
new file mode 100644
index 0000000..c0dafd09
--- /dev/null
+++ b/content/app/strings/BUILD.gn
@@ -0,0 +1,69 @@
+# 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")
+
+# GYP version: content/app/strings/content_strings.gyp:content_strings
+grit("strings") {
+  use_qualified_include = true
+  source = "content_strings.grd"
+  outputs = [
+    "grit/content_strings.h",
+    "content_strings_en-US.rc",
+    "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",
+  ]
+}
diff --git a/webkit/glue/webkit_strings.grd b/content/app/strings/content_strings.grd
index 02cd4b4..3118ba2 100644
--- a/webkit/glue/webkit_strings.grd
+++ b/content/app/strings/content_strings.grd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!-- This file contains definitions of resources that will be translated for
-each locale. Specifically, these are UI strings that are used by webkit that
+each locale. Specifically, these are UI strings that are used by content that
 need to be translated for each locale.-->
 
 <!-- Some of these strings and string descriptions were taken from
@@ -42,189 +42,189 @@ below:
     (http://wiki/Main/GritUsersGuide) for more details.
     Note that all output references are relative to the output directory
     which is specified at build time. -->
-    <output filename="grit/webkit_strings.h" type="rc_header">
+    <output filename="grit/content_strings.h" type="rc_header">
       <emit emit_type='prepend'></emit>
     </output>
     <!-- TODO(tony): Get rid of this .rc file. -->
-    <output filename="webkit_strings_en-US.rc" type="rc_all" lang="en" />
+    <output filename="content_strings_en-US.rc" type="rc_all" lang="en" />
 
-    <output filename="webkit_strings_am.pak" type="data_package" lang="am" />
-    <output filename="webkit_strings_ar.pak" type="data_package" lang="ar" />
+    <output filename="content_strings_am.pak" type="data_package" lang="am" />
+    <output filename="content_strings_ar.pak" type="data_package" lang="ar" />
     <if expr="use_third_party_translations">
       <output filename="webkit_strings_ast.pak" type="data_package" lang="ast" />
     </if>
-    <output filename="webkit_strings_bg.pak" type="data_package" lang="bg" />
-    <output filename="webkit_strings_bn.pak" type="data_package" lang="bn" />
+    <output filename="content_strings_bg.pak" type="data_package" lang="bg" />
+    <output filename="content_strings_bn.pak" type="data_package" lang="bn" />
     <if expr="use_third_party_translations">
       <output filename="webkit_strings_bs.pak" type="data_package" lang="bs" />
     </if>
-    <output filename="webkit_strings_ca.pak" type="data_package" lang="ca" />
+    <output filename="content_strings_ca.pak" type="data_package" lang="ca" />
     <if expr="use_third_party_translations">
       <output filename="webkit_strings_ca@valencia.pak" type="data_package" lang="ca@valencia" />
     </if>
-    <output filename="webkit_strings_cs.pak" type="data_package" lang="cs" />
-    <output filename="webkit_strings_da.pak" type="data_package" lang="da" />
-    <output filename="webkit_strings_de.pak" type="data_package" lang="de" />
-    <output filename="webkit_strings_el.pak" type="data_package" lang="el" />
+    <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" />
     <if expr="use_third_party_translations">
       <output filename="webkit_strings_en-AU.pak" type="data_package" lang="en-AU" />
     </if>
-    <output filename="webkit_strings_en-GB.pak" type="data_package" lang="en-GB" />
-    <output filename="webkit_strings_en-US.pak" type="data_package" lang="en" />
+    <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" />
     <if expr="use_third_party_translations">
       <output filename="webkit_strings_eo.pak" type="data_package" lang="eo" />
     </if>
-    <output filename="webkit_strings_es.pak" type="data_package" lang="es" />
-    <output filename="webkit_strings_es-419.pak" type="data_package" lang="es-419" />
-    <output filename="webkit_strings_et.pak" type="data_package" lang="et" />
+    <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" />
     <if expr="use_third_party_translations">
       <output filename="webkit_strings_eu.pak" type="data_package" lang="eu" />
     </if>
-    <output filename="webkit_strings_fa.pak" type="data_package" lang="fa" />
-    <output filename="webkit_strings_fake-bidi.pak" type="data_package" lang="fake-bidi" />
-    <output filename="webkit_strings_fi.pak" type="data_package" lang="fi" />
-    <output filename="webkit_strings_fil.pak" type="data_package" lang="fil" />
-    <output filename="webkit_strings_fr.pak" type="data_package" lang="fr" />
+    <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" />
     <if expr="use_third_party_translations">
       <output filename="webkit_strings_gl.pak" type="data_package" lang="gl" />
     </if>
-    <output filename="webkit_strings_gu.pak" type="data_package" lang="gu" />
-    <output filename="webkit_strings_he.pak" type="data_package" lang="he" />
-    <output filename="webkit_strings_hi.pak" type="data_package" lang="hi" />
-    <output filename="webkit_strings_hr.pak" type="data_package" lang="hr" />
-    <output filename="webkit_strings_hu.pak" type="data_package" lang="hu" />
+    <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" />
     <if expr="use_third_party_translations">
       <output filename="webkit_strings_hy.pak" type="data_package" lang="hy" />
       <output filename="webkit_strings_ia.pak" type="data_package" lang="ia" />
     </if>
-    <output filename="webkit_strings_id.pak" type="data_package" lang="id" />
-    <output filename="webkit_strings_it.pak" type="data_package" lang="it" />
-    <output filename="webkit_strings_ja.pak" type="data_package" lang="ja" />
+    <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" />
     <if expr="use_third_party_translations">
       <output filename="webkit_strings_ka.pak" type="data_package" lang="ka" />
     </if>
-    <output filename="webkit_strings_kn.pak" type="data_package" lang="kn" />
-    <output filename="webkit_strings_ko.pak" type="data_package" lang="ko" />
+    <output filename="content_strings_kn.pak" type="data_package" lang="kn" />
+    <output filename="content_strings_ko.pak" type="data_package" lang="ko" />
     <if expr="use_third_party_translations">
       <output filename="webkit_strings_ku.pak" type="data_package" lang="ku" />
       <output filename="webkit_strings_kw.pak" type="data_package" lang="kw" />
     </if>
-    <output filename="webkit_strings_lt.pak" type="data_package" lang="lt" />
-    <output filename="webkit_strings_lv.pak" type="data_package" lang="lv" />
-    <output filename="webkit_strings_ml.pak" type="data_package" lang="ml" />
-    <output filename="webkit_strings_mr.pak" type="data_package" lang="mr" />
-    <output filename="webkit_strings_ms.pak" type="data_package" lang="ms" />
-    <output filename="webkit_strings_nl.pak" type="data_package" lang="nl" />
+    <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" />
     <!-- The translation console uses 'no' for Norwegian Bokmål. It should
          be 'nb'. -->
-    <output filename="webkit_strings_nb.pak" type="data_package" lang="no" />
-    <output filename="webkit_strings_pl.pak" type="data_package" lang="pl" />
-    <output filename="webkit_strings_pt-BR.pak" type="data_package" lang="pt-BR" />
-    <output filename="webkit_strings_pt-PT.pak" type="data_package" lang="pt-PT" />
-    <output filename="webkit_strings_ro.pak" type="data_package" lang="ro" />
-    <output filename="webkit_strings_ru.pak" type="data_package" lang="ru" />
-    <output filename="webkit_strings_sk.pak" type="data_package" lang="sk" />
-    <output filename="webkit_strings_sl.pak" type="data_package" lang="sl" />
-    <output filename="webkit_strings_sr.pak" type="data_package" lang="sr" />
-    <output filename="webkit_strings_sv.pak" type="data_package" lang="sv" />
-    <output filename="webkit_strings_sw.pak" type="data_package" lang="sw" />
-    <output filename="webkit_strings_ta.pak" type="data_package" lang="ta" />
-    <output filename="webkit_strings_te.pak" type="data_package" lang="te" />
-    <output filename="webkit_strings_th.pak" type="data_package" lang="th" />
-    <output filename="webkit_strings_tr.pak" type="data_package" lang="tr" />
+    <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" />
     <if expr="use_third_party_translations">
       <output filename="webkit_strings_ug.pak" type="data_package" lang="ug" />
     </if>
-    <output filename="webkit_strings_uk.pak" type="data_package" lang="uk" />
-    <output filename="webkit_strings_vi.pak" type="data_package" lang="vi" />
-    <output filename="webkit_strings_zh-CN.pak" type="data_package" lang="zh-CN" />
-    <output filename="webkit_strings_zh-TW.pak" type="data_package" lang="zh-TW" />
+    <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" />
   </outputs>
   <translations>
-    <file path="resources/webkit_strings_am.xtb" lang="am" />
-    <file path="resources/webkit_strings_ar.xtb" lang="ar" />
+    <file path="translations/content_strings_am.xtb" lang="am" />
+    <file path="translations/content_strings_ar.xtb" lang="ar" />
     <if expr="use_third_party_translations">
       <file path="../../third_party/launchpad_translations/webkit_strings_ast.xtb" lang="ast" />
     </if>
-    <file path="resources/webkit_strings_bg.xtb" lang="bg" />
-    <file path="resources/webkit_strings_bn.xtb" lang="bn" />
+    <file path="translations/content_strings_bg.xtb" lang="bg" />
+    <file path="translations/content_strings_bn.xtb" lang="bn" />
     <if expr="use_third_party_translations">
       <file path="../../third_party/launchpad_translations/webkit_strings_bs.xtb" lang="bs" />
     </if>
-    <file path="resources/webkit_strings_ca.xtb" lang="ca" />
+    <file path="translations/content_strings_ca.xtb" lang="ca" />
     <if expr="use_third_party_translations">
       <file path="../../third_party/launchpad_translations/webkit_strings_ca-valencia.xtb" lang="ca@valencia" />
     </if>
-    <file path="resources/webkit_strings_cs.xtb" lang="cs" />
-    <file path="resources/webkit_strings_da.xtb" lang="da" />
-    <file path="resources/webkit_strings_de.xtb" lang="de" />
-    <file path="resources/webkit_strings_el.xtb" lang="el" />
+    <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" />
     <if expr="use_third_party_translations">
       <file path="../../third_party/launchpad_translations/webkit_strings_en-AU.xtb" lang="en-AU" />
     </if>
-    <file path="resources/webkit_strings_en-GB.xtb" lang="en-GB" />
-    <file path="resources/webkit_strings_es.xtb" lang="es" />
-    <file path="resources/webkit_strings_es-419.xtb" lang="es-419" />
-    <file path="resources/webkit_strings_et.xtb" lang="et" />
+    <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" />
     <if expr="use_third_party_translations">
       <file path="../../third_party/launchpad_translations/webkit_strings_eu.xtb" lang="eu" />
     </if>
-    <file path="resources/webkit_strings_fa.xtb" lang="fa" />
-    <file path="resources/webkit_strings_fi.xtb" lang="fi" />
-    <file path="resources/webkit_strings_fil.xtb" lang="fil" />
-    <file path="resources/webkit_strings_fr.xtb" lang="fr" />
+    <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" />
     <if expr="use_third_party_translations">
       <file path="../../third_party/launchpad_translations/webkit_strings_gl.xtb" lang="gl" />
     </if>
-    <file path="resources/webkit_strings_gu.xtb" lang="gu" />
-    <file path="resources/webkit_strings_hi.xtb" lang="hi" />
-    <file path="resources/webkit_strings_hr.xtb" lang="hr" />
-    <file path="resources/webkit_strings_hu.xtb" lang="hu" />
+    <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" />
     <if expr="use_third_party_translations">
       <file path="../../third_party/launchpad_translations/webkit_strings_hy.xtb" lang="hy" />
     </if>
-    <file path="resources/webkit_strings_id.xtb" lang="id" />
-    <file path="resources/webkit_strings_it.xtb" lang="it" />
+    <file path="translations/content_strings_id.xtb" lang="id" />
+    <file path="translations/content_strings_it.xtb" lang="it" />
     <!-- The translation console uses 'iw' for Hebrew, but we use 'he'. -->
-    <file path="resources/webkit_strings_iw.xtb" lang="he" />
-    <file path="resources/webkit_strings_ja.xtb" lang="ja" />
+    <file path="translations/content_strings_iw.xtb" lang="he" />
+    <file path="translations/content_strings_ja.xtb" lang="ja" />
     <if expr="use_third_party_translations">
       <file path="../../third_party/launchpad_translations/webkit_strings_ka.xtb" lang="ka" />
     </if>
-    <file path="resources/webkit_strings_kn.xtb" lang="kn" />
-    <file path="resources/webkit_strings_ko.xtb" lang="ko" />
+    <file path="translations/content_strings_kn.xtb" lang="kn" />
+    <file path="translations/content_strings_ko.xtb" lang="ko" />
     <if expr="use_third_party_translations">
       <file path="../../third_party/launchpad_translations/webkit_strings_ku.xtb" lang="ku" />
       <file path="../../third_party/launchpad_translations/webkit_strings_kw.xtb" lang="kw" />
     </if>
-    <file path="resources/webkit_strings_lt.xtb" lang="lt" />
-    <file path="resources/webkit_strings_lv.xtb" lang="lv" />
-    <file path="resources/webkit_strings_ml.xtb" lang="ml" />
-    <file path="resources/webkit_strings_mr.xtb" lang="mr" />
-    <file path="resources/webkit_strings_ms.xtb" lang="ms" />
-    <file path="resources/webkit_strings_nl.xtb" lang="nl" />
-    <file path="resources/webkit_strings_no.xtb" lang="no" />
-    <file path="resources/webkit_strings_pl.xtb" lang="pl" />
-    <file path="resources/webkit_strings_pt-BR.xtb" lang="pt-BR" />
-    <file path="resources/webkit_strings_pt-PT.xtb" lang="pt-PT" />
-    <file path="resources/webkit_strings_ro.xtb" lang="ro" />
-    <file path="resources/webkit_strings_ru.xtb" lang="ru" />
-    <file path="resources/webkit_strings_sk.xtb" lang="sk" />
-    <file path="resources/webkit_strings_sl.xtb" lang="sl" />
-    <file path="resources/webkit_strings_sr.xtb" lang="sr" />
-    <file path="resources/webkit_strings_sv.xtb" lang="sv" />
-    <file path="resources/webkit_strings_sw.xtb" lang="sw" />
-    <file path="resources/webkit_strings_ta.xtb" lang="ta" />
-    <file path="resources/webkit_strings_te.xtb" lang="te" />
-    <file path="resources/webkit_strings_th.xtb" lang="th" />
-    <file path="resources/webkit_strings_tr.xtb" lang="tr" />
+    <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" />
     <if expr="use_third_party_translations">
       <file path="../../third_party/launchpad_translations/webkit_strings_ug.xtb" lang="ug" />
     </if>
-    <file path="resources/webkit_strings_uk.xtb" lang="uk" />
-    <file path="resources/webkit_strings_vi.xtb" lang="vi" />
-    <file path="resources/webkit_strings_zh-CN.xtb" lang="zh-CN" />
-    <file path="resources/webkit_strings_zh-TW.xtb" lang="zh-TW" />
+    <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" />
   </translations>
   <release seq="1" allow_pseudo="false">
     <messages fallback_to_english="true">
diff --git a/content/app/strings/content_strings.gyp b/content/app/strings/content_strings.gyp
new file mode 100644
index 0000000..e8f4310
--- /dev/null
+++ b/content/app/strings/content_strings.gyp
@@ -0,0 +1,30 @@
+# 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.
+
+{
+  'targets': [
+    {
+      # GN version: //content/app/strings
+      'target_name': 'content_strings',
+      'type': 'none',
+      'variables': {
+        'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/content/app/strings',
+      },
+      'actions': [
+        {
+          'action_name': 'generate_content_strings',
+          'variables': {
+            'grit_grd_file': 'content_strings.grd',
+          },
+          'includes': [ '../../../build/grit_action.gypi' ],
+        },
+      ],
+      'direct_dependent_settings': {
+        'include_dirs': [
+          '<(SHARED_INTERMEDIATE_DIR)',
+        ],
+      },
+    },
+  ]
+}
diff --git a/webkit/glue/resources/webkit_strings_am.xtb b/content/app/strings/translations/content_strings_am.xtb
index 8fa754a..8fa754a 100644
--- a/webkit/glue/resources/webkit_strings_am.xtb
+++ b/content/app/strings/translations/content_strings_am.xtb
diff --git a/webkit/glue/resources/webkit_strings_ar.xtb b/content/app/strings/translations/content_strings_ar.xtb
index 0e5cb7c..0e5cb7c 100644
--- a/webkit/glue/resources/webkit_strings_ar.xtb
+++ b/content/app/strings/translations/content_strings_ar.xtb
diff --git a/webkit/glue/resources/webkit_strings_bg.xtb b/content/app/strings/translations/content_strings_bg.xtb
index 1f309af..1f309af 100644
--- a/webkit/glue/resources/webkit_strings_bg.xtb
+++ b/content/app/strings/translations/content_strings_bg.xtb
diff --git a/webkit/glue/resources/webkit_strings_bn.xtb b/content/app/strings/translations/content_strings_bn.xtb
index 51d9ded..51d9ded 100644
--- a/webkit/glue/resources/webkit_strings_bn.xtb
+++ b/content/app/strings/translations/content_strings_bn.xtb
diff --git a/webkit/glue/resources/webkit_strings_ca.xtb b/content/app/strings/translations/content_strings_ca.xtb
index 6de7545..6de7545 100644
--- a/webkit/glue/resources/webkit_strings_ca.xtb
+++ b/content/app/strings/translations/content_strings_ca.xtb
diff --git a/webkit/glue/resources/webkit_strings_cs.xtb b/content/app/strings/translations/content_strings_cs.xtb
index 276a063..276a063 100644
--- a/webkit/glue/resources/webkit_strings_cs.xtb
+++ b/content/app/strings/translations/content_strings_cs.xtb
diff --git a/webkit/glue/resources/webkit_strings_da.xtb b/content/app/strings/translations/content_strings_da.xtb
index 6a29760..6a29760 100644
--- a/webkit/glue/resources/webkit_strings_da.xtb
+++ b/content/app/strings/translations/content_strings_da.xtb
diff --git a/webkit/glue/resources/webkit_strings_de.xtb b/content/app/strings/translations/content_strings_de.xtb
index a6c1c90..a6c1c90 100644
--- a/webkit/glue/resources/webkit_strings_de.xtb
+++ b/content/app/strings/translations/content_strings_de.xtb
diff --git a/webkit/glue/resources/webkit_strings_el.xtb b/content/app/strings/translations/content_strings_el.xtb
index 294e1cf..294e1cf 100644
--- a/webkit/glue/resources/webkit_strings_el.xtb
+++ b/content/app/strings/translations/content_strings_el.xtb
diff --git a/webkit/glue/resources/webkit_strings_en-GB.xtb b/content/app/strings/translations/content_strings_en-GB.xtb
index ede2337..ede2337 100644
--- a/webkit/glue/resources/webkit_strings_en-GB.xtb
+++ b/content/app/strings/translations/content_strings_en-GB.xtb
diff --git a/webkit/glue/resources/webkit_strings_es-419.xtb b/content/app/strings/translations/content_strings_es-419.xtb
index 00880020..00880020 100644
--- a/webkit/glue/resources/webkit_strings_es-419.xtb
+++ b/content/app/strings/translations/content_strings_es-419.xtb
diff --git a/webkit/glue/resources/webkit_strings_es.xtb b/content/app/strings/translations/content_strings_es.xtb
index b34e66a..b34e66a 100644
--- a/webkit/glue/resources/webkit_strings_es.xtb
+++ b/content/app/strings/translations/content_strings_es.xtb
diff --git a/webkit/glue/resources/webkit_strings_et.xtb b/content/app/strings/translations/content_strings_et.xtb
index 04d60ae..04d60ae 100644
--- a/webkit/glue/resources/webkit_strings_et.xtb
+++ b/content/app/strings/translations/content_strings_et.xtb
diff --git a/webkit/glue/resources/webkit_strings_fa.xtb b/content/app/strings/translations/content_strings_fa.xtb
index f7c1c26..f7c1c26 100644
--- a/webkit/glue/resources/webkit_strings_fa.xtb
+++ b/content/app/strings/translations/content_strings_fa.xtb
diff --git a/webkit/glue/resources/webkit_strings_fi.xtb b/content/app/strings/translations/content_strings_fi.xtb
index 1ea919f..1ea919f 100644
--- a/webkit/glue/resources/webkit_strings_fi.xtb
+++ b/content/app/strings/translations/content_strings_fi.xtb
diff --git a/webkit/glue/resources/webkit_strings_fil.xtb b/content/app/strings/translations/content_strings_fil.xtb
index 2478047..2478047 100644
--- a/webkit/glue/resources/webkit_strings_fil.xtb
+++ b/content/app/strings/translations/content_strings_fil.xtb
diff --git a/webkit/glue/resources/webkit_strings_fr.xtb b/content/app/strings/translations/content_strings_fr.xtb
index 191e829..191e829 100644
--- a/webkit/glue/resources/webkit_strings_fr.xtb
+++ b/content/app/strings/translations/content_strings_fr.xtb
diff --git a/webkit/glue/resources/webkit_strings_gu.xtb b/content/app/strings/translations/content_strings_gu.xtb
index 0d3d9d1..0d3d9d1 100644
--- a/webkit/glue/resources/webkit_strings_gu.xtb
+++ b/content/app/strings/translations/content_strings_gu.xtb
diff --git a/webkit/glue/resources/webkit_strings_hi.xtb b/content/app/strings/translations/content_strings_hi.xtb
index 4aeaf0b..4aeaf0b 100644
--- a/webkit/glue/resources/webkit_strings_hi.xtb
+++ b/content/app/strings/translations/content_strings_hi.xtb
diff --git a/webkit/glue/resources/webkit_strings_hr.xtb b/content/app/strings/translations/content_strings_hr.xtb
index ae8026a..ae8026a 100644
--- a/webkit/glue/resources/webkit_strings_hr.xtb
+++ b/content/app/strings/translations/content_strings_hr.xtb
diff --git a/webkit/glue/resources/webkit_strings_hu.xtb b/content/app/strings/translations/content_strings_hu.xtb
index a8ab563..a8ab563 100644
--- a/webkit/glue/resources/webkit_strings_hu.xtb
+++ b/content/app/strings/translations/content_strings_hu.xtb
diff --git a/webkit/glue/resources/webkit_strings_id.xtb b/content/app/strings/translations/content_strings_id.xtb
index f6e837d..f6e837d 100644
--- a/webkit/glue/resources/webkit_strings_id.xtb
+++ b/content/app/strings/translations/content_strings_id.xtb
diff --git a/webkit/glue/resources/webkit_strings_it.xtb b/content/app/strings/translations/content_strings_it.xtb
index ef6be1a..ef6be1a 100644
--- a/webkit/glue/resources/webkit_strings_it.xtb
+++ b/content/app/strings/translations/content_strings_it.xtb
diff --git a/webkit/glue/resources/webkit_strings_iw.xtb b/content/app/strings/translations/content_strings_iw.xtb
index 8327556..8327556 100644
--- a/webkit/glue/resources/webkit_strings_iw.xtb
+++ b/content/app/strings/translations/content_strings_iw.xtb
diff --git a/webkit/glue/resources/webkit_strings_ja.xtb b/content/app/strings/translations/content_strings_ja.xtb
index 50a52fc..50a52fc 100644
--- a/webkit/glue/resources/webkit_strings_ja.xtb
+++ b/content/app/strings/translations/content_strings_ja.xtb
diff --git a/webkit/glue/resources/webkit_strings_kn.xtb b/content/app/strings/translations/content_strings_kn.xtb
index ec44917..ec44917 100644
--- a/webkit/glue/resources/webkit_strings_kn.xtb
+++ b/content/app/strings/translations/content_strings_kn.xtb
diff --git a/webkit/glue/resources/webkit_strings_ko.xtb b/content/app/strings/translations/content_strings_ko.xtb
index 2d22e6b..2d22e6b 100644
--- a/webkit/glue/resources/webkit_strings_ko.xtb
+++ b/content/app/strings/translations/content_strings_ko.xtb
diff --git a/webkit/glue/resources/webkit_strings_lt.xtb b/content/app/strings/translations/content_strings_lt.xtb
index 56505b97a..56505b97a 100644
--- a/webkit/glue/resources/webkit_strings_lt.xtb
+++ b/content/app/strings/translations/content_strings_lt.xtb
diff --git a/webkit/glue/resources/webkit_strings_lv.xtb b/content/app/strings/translations/content_strings_lv.xtb
index 479305b..479305b 100644
--- a/webkit/glue/resources/webkit_strings_lv.xtb
+++ b/content/app/strings/translations/content_strings_lv.xtb
diff --git a/webkit/glue/resources/webkit_strings_ml.xtb b/content/app/strings/translations/content_strings_ml.xtb
index cd73807..cd73807 100644
--- a/webkit/glue/resources/webkit_strings_ml.xtb
+++ b/content/app/strings/translations/content_strings_ml.xtb
diff --git a/webkit/glue/resources/webkit_strings_mr.xtb b/content/app/strings/translations/content_strings_mr.xtb
index a850492..a850492 100644
--- a/webkit/glue/resources/webkit_strings_mr.xtb
+++ b/content/app/strings/translations/content_strings_mr.xtb
diff --git a/webkit/glue/resources/webkit_strings_ms.xtb b/content/app/strings/translations/content_strings_ms.xtb
index def0378..def0378 100644
--- a/webkit/glue/resources/webkit_strings_ms.xtb
+++ b/content/app/strings/translations/content_strings_ms.xtb
diff --git a/webkit/glue/resources/webkit_strings_nl.xtb b/content/app/strings/translations/content_strings_nl.xtb
index 6b0cd97..6b0cd97 100644
--- a/webkit/glue/resources/webkit_strings_nl.xtb
+++ b/content/app/strings/translations/content_strings_nl.xtb
diff --git a/webkit/glue/resources/webkit_strings_no.xtb b/content/app/strings/translations/content_strings_no.xtb
index 394354d..394354d 100644
--- a/webkit/glue/resources/webkit_strings_no.xtb
+++ b/content/app/strings/translations/content_strings_no.xtb
diff --git a/webkit/glue/resources/webkit_strings_pl.xtb b/content/app/strings/translations/content_strings_pl.xtb
index c34757f..c34757f 100644
--- a/webkit/glue/resources/webkit_strings_pl.xtb
+++ b/content/app/strings/translations/content_strings_pl.xtb
diff --git a/webkit/glue/resources/webkit_strings_pt-BR.xtb b/content/app/strings/translations/content_strings_pt-BR.xtb
index 6b9da08..6b9da08 100644
--- a/webkit/glue/resources/webkit_strings_pt-BR.xtb
+++ b/content/app/strings/translations/content_strings_pt-BR.xtb
diff --git a/webkit/glue/resources/webkit_strings_pt-PT.xtb b/content/app/strings/translations/content_strings_pt-PT.xtb
index e5d7fac..e5d7fac 100644
--- a/webkit/glue/resources/webkit_strings_pt-PT.xtb
+++ b/content/app/strings/translations/content_strings_pt-PT.xtb
diff --git a/webkit/glue/resources/webkit_strings_ro.xtb b/content/app/strings/translations/content_strings_ro.xtb
index 99db973..99db973 100644
--- a/webkit/glue/resources/webkit_strings_ro.xtb
+++ b/content/app/strings/translations/content_strings_ro.xtb
diff --git a/webkit/glue/resources/webkit_strings_ru.xtb b/content/app/strings/translations/content_strings_ru.xtb
index d16bed1..d16bed1 100644
--- a/webkit/glue/resources/webkit_strings_ru.xtb
+++ b/content/app/strings/translations/content_strings_ru.xtb
diff --git a/webkit/glue/resources/webkit_strings_sk.xtb b/content/app/strings/translations/content_strings_sk.xtb
index 96f7e3a..96f7e3a 100644
--- a/webkit/glue/resources/webkit_strings_sk.xtb
+++ b/content/app/strings/translations/content_strings_sk.xtb
diff --git a/webkit/glue/resources/webkit_strings_sl.xtb b/content/app/strings/translations/content_strings_sl.xtb
index 2fc88e7..2fc88e7 100644
--- a/webkit/glue/resources/webkit_strings_sl.xtb
+++ b/content/app/strings/translations/content_strings_sl.xtb
diff --git a/webkit/glue/resources/webkit_strings_sr.xtb b/content/app/strings/translations/content_strings_sr.xtb
index 0938474..0938474 100644
--- a/webkit/glue/resources/webkit_strings_sr.xtb
+++ b/content/app/strings/translations/content_strings_sr.xtb
diff --git a/webkit/glue/resources/webkit_strings_sv.xtb b/content/app/strings/translations/content_strings_sv.xtb
index 1b2461a..1b2461a 100644
--- a/webkit/glue/resources/webkit_strings_sv.xtb
+++ b/content/app/strings/translations/content_strings_sv.xtb
diff --git a/webkit/glue/resources/webkit_strings_sw.xtb b/content/app/strings/translations/content_strings_sw.xtb
index 4e3c640..4e3c640 100644
--- a/webkit/glue/resources/webkit_strings_sw.xtb
+++ b/content/app/strings/translations/content_strings_sw.xtb
diff --git a/webkit/glue/resources/webkit_strings_ta.xtb b/content/app/strings/translations/content_strings_ta.xtb
index ed7e5db..ed7e5db 100644
--- a/webkit/glue/resources/webkit_strings_ta.xtb
+++ b/content/app/strings/translations/content_strings_ta.xtb
diff --git a/webkit/glue/resources/webkit_strings_te.xtb b/content/app/strings/translations/content_strings_te.xtb
index fe9a8bf..fe9a8bf 100644
--- a/webkit/glue/resources/webkit_strings_te.xtb
+++ b/content/app/strings/translations/content_strings_te.xtb
diff --git a/webkit/glue/resources/webkit_strings_th.xtb b/content/app/strings/translations/content_strings_th.xtb
index 02ee0de..02ee0de 100644
--- a/webkit/glue/resources/webkit_strings_th.xtb
+++ b/content/app/strings/translations/content_strings_th.xtb
diff --git a/webkit/glue/resources/webkit_strings_tr.xtb b/content/app/strings/translations/content_strings_tr.xtb
index 88e8631..88e8631 100644
--- a/webkit/glue/resources/webkit_strings_tr.xtb
+++ b/content/app/strings/translations/content_strings_tr.xtb
diff --git a/webkit/glue/resources/webkit_strings_uk.xtb b/content/app/strings/translations/content_strings_uk.xtb
index dc914e3..dc914e3 100644
--- a/webkit/glue/resources/webkit_strings_uk.xtb
+++ b/content/app/strings/translations/content_strings_uk.xtb
diff --git a/webkit/glue/resources/webkit_strings_vi.xtb b/content/app/strings/translations/content_strings_vi.xtb
index d0906e2..d0906e2 100644
--- a/webkit/glue/resources/webkit_strings_vi.xtb
+++ b/content/app/strings/translations/content_strings_vi.xtb
diff --git a/webkit/glue/resources/webkit_strings_zh-CN.xtb b/content/app/strings/translations/content_strings_zh-CN.xtb
index 8cf54d0..8cf54d0 100644
--- a/webkit/glue/resources/webkit_strings_zh-CN.xtb
+++ b/content/app/strings/translations/content_strings_zh-CN.xtb
diff --git a/webkit/glue/resources/webkit_strings_zh-TW.xtb b/content/app/strings/translations/content_strings_zh-TW.xtb
index 24395f3..24395f3 100644
--- a/webkit/glue/resources/webkit_strings_zh-TW.xtb
+++ b/content/app/strings/translations/content_strings_zh-TW.xtb
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
index cb200d3..87abb7f 100644
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -87,25 +87,25 @@ source_set("browser") {
 
     # Non-iOS deps.
     deps += [
-      "//content/browser/devtools:resources",
-      "//content/common:mojo_bindings",
       "//cc",
       "//cc/surfaces",
+      "//content/app/strings",
+      "//content/browser/devtools:resources",
+      "//content/common:mojo_bindings",
       "//mojo/public/cpp/bindings",
       "//mojo/public/interfaces/application",
       "//mojo/public/js/bindings",
       "//net:http_server",
+      "//third_party/angle:commit_id",
       "//third_party/icu",
       "//third_party/leveldatabase",
       "//third_party/libyuv",
       "//ui/resources",
       "//ui/surface",
       "//webkit:resources",
-      "//webkit:strings",
       "//webkit/browser:storage",
       "//webkit/common",
       "//webkit/common:storage",
-      "//third_party/angle:commit_id",
     ]
   }
 
diff --git a/content/browser/DEPS b/content/browser/DEPS
index 23e91ce..c158963 100644
--- a/content/browser/DEPS
+++ b/content/browser/DEPS
@@ -1,4 +1,5 @@
 include_rules = [
+  "+content/app/strings/grit",  # For generated headers
   "+content/public/browser",
   "+media/audio",  # For audio input for speech input feature.
   "+media/base",  # For Android JNI registration.
diff --git a/content/browser/accessibility/browser_accessibility_cocoa.mm b/content/browser/accessibility/browser_accessibility_cocoa.mm
index c016a03..5086982 100644
--- a/content/browser/accessibility/browser_accessibility_cocoa.mm
+++ b/content/browser/accessibility/browser_accessibility_cocoa.mm
@@ -12,10 +12,10 @@
 #include "base/strings/string16.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_manager.h"
 #include "content/browser/accessibility/browser_accessibility_manager_mac.h"
 #include "content/public/common/content_client.h"
-#include "grit/webkit_strings.h"
 #import "ui/accessibility/platform/ax_platform_node_mac.h"
 
 // See http://openradar.appspot.com/9896491. This SPI has been tested on 10.5,
diff --git a/content/child/BUILD.gn b/content/child/BUILD.gn
index e77fcd8..c6ec390 100644
--- a/content/child/BUILD.gn
+++ b/content/child/BUILD.gn
@@ -87,11 +87,11 @@ source_set("child") {
     sources = []
   } else {
     deps += [
+      "//content/app/strings",
       "//crypto:platform",
       "//third_party/WebKit/public:blink",
       "//third_party/npapi",
       "//webkit:resources",
-      "//webkit:strings",
       "//webkit/child",
       "//webkit/common",
     ]
diff --git a/content/child/DEPS b/content/child/DEPS
index 3adcf04..be1e09f 100644
--- a/content/child/DEPS
+++ b/content/child/DEPS
@@ -1,5 +1,6 @@
 include_rules = [
   "+components/tracing",
+  "+content/app/strings/grit",  # For generated headers
   "+content/public/child",
   "+media/base/android",
 ]
diff --git a/content/child/blink_platform_impl.cc b/content/child/blink_platform_impl.cc
index d2b7745..1050276 100644
--- a/content/child/blink_platform_impl.cc
+++ b/content/child/blink_platform_impl.cc
@@ -27,6 +27,7 @@
 #include "base/sys_info.h"
 #include "base/time/time.h"
 #include "blink/public/resources/grit/blink_resources.h"
+#include "content/app/strings/grit/content_strings.h"
 #include "content/child/child_thread.h"
 #include "content/child/content_child_helpers.h"
 #include "content/child/fling_curve_configuration.h"
@@ -38,7 +39,6 @@
 #include "content/child/worker_task_runner.h"
 #include "content/public/common/content_client.h"
 #include "grit/webkit_resources.h"
-#include "grit/webkit_strings.h"
 #include "net/base/data_url.h"
 #include "net/base/mime_util.h"
 #include "net/base/net_errors.h"
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index 96f6146..2796054 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -1583,6 +1583,7 @@
       ],
     }, {  # OS!="ios"
       'dependencies': [
+        'app/strings/content_strings.gyp:content_strings',
         'browser/devtools/devtools_resources.gyp:devtools_resources',
         'content_common_mojo_bindings',
         '../cc/cc.gyp:cc',
@@ -1598,7 +1599,6 @@
         '../webkit/storage_browser.gyp:webkit_storage_browser',
         '../webkit/storage_common.gyp:webkit_storage_common',
         '../webkit/webkit_resources.gyp:webkit_resources',
-        '../webkit/webkit_resources.gyp:webkit_strings',
       ],
     }],
     ['enable_printing!=0', {
diff --git a/content/content_child.gypi b/content/content_child.gypi
index c2ac413..7150c17 100644
--- a/content/content_child.gypi
+++ b/content/content_child.gypi
@@ -319,6 +319,7 @@
       ],
     }, {  # OS!="ios"
       'dependencies': [
+        'app/strings/content_strings.gyp:content_strings',
         '../third_party/WebKit/public/blink.gyp:blink',
         '../third_party/WebKit/public/blink_resources.gyp:blink_resources',
         '../third_party/npapi/npapi.gyp:npapi',
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index b7f25a7..be5dcd8 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -27,6 +27,7 @@
         'chromium_code': 1,
       },
       'dependencies': [
+        'app/strings/content_strings.gyp:content_strings',
         'content.gyp:content_app_both',
         'content.gyp:content_browser',
         'content.gyp:content_common',
@@ -256,10 +257,10 @@
         }],
         ['OS=="win"', {
           'resource_include_dirs': [
-            '<(SHARED_INTERMEDIATE_DIR)/webkit',
+            '<(SHARED_INTERMEDIATE_DIR)/content/app/strings',
           ],
           'dependencies': [
-            '<(DEPTH)/webkit/webkit_resources.gyp:webkit_strings',
+            '<(DEPTH)/content/app/strings/content_strings.gyp:content_strings',
           ],
           'configurations': {
             'Debug_Base': {
@@ -430,6 +431,7 @@
       'target_name': 'content_shell_pak',
       'type': 'none',
       'dependencies': [
+        'app/strings/content_strings.gyp:content_strings',
         'browser/tracing/tracing_resources.gyp:tracing_resources',
         'content_resources.gyp:content_resources',
         'content_shell_resources',
@@ -438,7 +440,6 @@
         '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources',
         '<(DEPTH)/ui/strings/ui_strings.gyp:ui_strings',
         '<(DEPTH)/webkit/webkit_resources.gyp:webkit_resources',
-        '<(DEPTH)/webkit/webkit_resources.gyp:webkit_strings',
       ],
       'conditions': [
         ['OS!="android"', {
@@ -453,6 +454,7 @@
           'variables': {
             'pak_inputs': [
               '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources.pak',
+              '<(SHARED_INTERMEDIATE_DIR)/content/app/strings/content_strings_en-US.pak',
               '<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/content/shell_resources.pak',
@@ -462,7 +464,6 @@
               '<(SHARED_INTERMEDIATE_DIR)/ui/strings/app_locale_settings_en-US.pak',
               '<(SHARED_INTERMEDIATE_DIR)/ui/strings/ui_strings_en-US.pak',
               '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pak',
-              '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak',
             ],
             'conditions': [
               ['OS!="android"', {
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 9950d4e..0fc4360 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -1225,15 +1225,15 @@
                 # but that causes errors in other targets when
                 # resulting .res files get referenced multiple times.
                 '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources.rc',
+                '<(SHARED_INTERMEDIATE_DIR)/content/app/strings/content_strings_en-US.rc',
                 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
-                '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.rc',
               ],
               'dependencies': [
+                '<(DEPTH)/content/app/strings/content_strings.gyp:content_strings',
                 '<(DEPTH)/net/net.gyp:net_resources',
                 '<(DEPTH)/third_party/WebKit/public/blink_resources.gyp:blink_resources',
                 '<(DEPTH)/third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
                 '<(DEPTH)/third_party/isimpledom/isimpledom.gyp:isimpledom',
-                '<(DEPTH)/webkit/webkit_resources.gyp:webkit_strings',
               ],
               'configurations': {
                 'Debug_Base': {
diff --git a/content/shell/BUILD.gn b/content/shell/BUILD.gn
index 591e395..7e18991 100644
--- a/content/shell/BUILD.gn
+++ b/content/shell/BUILD.gn
@@ -206,6 +206,7 @@ static_library("content_shell_lib") {
     "//components/breakpad/app",
     "//content:resources",
     "//content/app:both",
+    "//content/app/strings",
     "//content/gpu",
     "//content/ppapi_plugin",
     "//content/public/browser",
@@ -387,8 +388,9 @@ group("resources") {
 
 repack("pak") {
   sources = [
-    "$root_gen_dir/content/content_resources.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",
     "$root_gen_dir/net/net_resources.pak",
     "$root_gen_dir/ui/resources/ui_resources_100_percent.pak",
@@ -397,18 +399,17 @@ repack("pak") {
     "$root_gen_dir/ui/strings/ui_strings_en-US.pak",
     "$root_gen_dir/webkit/blink_resources.pak",
     "$root_gen_dir/webkit/webkit_resources_100_percent.pak",
-    "$root_gen_dir/webkit/webkit_strings_en-US.pak",
   ]
 
   deps = [
     ":resources",
     "//content:resources",
+    "//content/app/strings",
     "//content/browser/tracing:resources",
     "//net:net_resources",
     "//ui/resources",
     "//ui/strings",
     "//webkit:resources",
-    "//webkit:strings",
   ]
 
   if (is_android) {
diff --git a/content/shell/DEPS b/content/shell/DEPS
index 386f7d0..a75220e 100644
--- a/content/shell/DEPS
+++ b/content/shell/DEPS
@@ -6,6 +6,7 @@ include_rules = [
 
   # The content_shell is the canonical sample embedder, so it only uses
   # content's public API.
+  "+content/app/strings/grit",  # For generated headers
   "+content/public",
 
   # The content_shell is an embedder so it must work with resource bundles.
diff --git a/content/shell/common/shell_content_client.cc b/content/shell/common/shell_content_client.cc
index 3d1891d..6afa6b9 100644
--- a/content/shell/common/shell_content_client.cc
+++ b/content/shell/common/shell_content_client.cc
@@ -7,12 +7,12 @@
 #include "base/command_line.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/utf_string_conversions.h"
+#include "content/app/strings/grit/content_strings.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/user_agent.h"
 #include "content/shell/common/shell_switches.h"
 #include "grit/shell_resources.h"
 #include "grit/webkit_resources.h"
-#include "grit/webkit_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
diff --git a/tools/gritsettings/resource_ids b/tools/gritsettings/resource_ids
index b15d4eb..6cf6292 100644
--- a/tools/gritsettings/resource_ids
+++ b/tools/gritsettings/resource_ids
@@ -105,7 +105,7 @@
     "structures": [12000],
     "messages": [12500],
   },
-  "webkit/glue/webkit_strings.grd": {
+  "content/app/strings/content_strings.grd": {
     "messages": [18500],
   },
   "components/policy/resources/policy_templates.grd": {
diff --git a/webkit/BUILD.gn b/webkit/BUILD.gn
index fbabc2e..c6aef8e 100644
--- a/webkit/BUILD.gn
+++ b/webkit/BUILD.gn
@@ -30,66 +30,3 @@ grit("blink_common_resources") {
     "blink_resources.pak",
   ]
 }
-
-# webkit_strings in webkit_resources.gyp
-grit("strings") {
-  source = "glue/webkit_strings.grd"
-  outputs = [
-    "grit/webkit_strings.h",
-    "webkit_strings_en-US.rc",
-    "webkit_strings_am.pak",
-    "webkit_strings_ar.pak",
-    "webkit_strings_bg.pak",
-    "webkit_strings_bn.pak",
-    "webkit_strings_ca.pak",
-    "webkit_strings_cs.pak",
-    "webkit_strings_da.pak",
-    "webkit_strings_de.pak",
-    "webkit_strings_el.pak",
-    "webkit_strings_en-GB.pak",
-    "webkit_strings_en-US.pak",
-    "webkit_strings_es.pak",
-    "webkit_strings_es-419.pak",
-    "webkit_strings_et.pak",
-    "webkit_strings_fa.pak",
-    "webkit_strings_fake-bidi.pak",
-    "webkit_strings_fi.pak",
-    "webkit_strings_fil.pak",
-    "webkit_strings_fr.pak",
-    "webkit_strings_gu.pak",
-    "webkit_strings_he.pak",
-    "webkit_strings_hi.pak",
-    "webkit_strings_hr.pak",
-    "webkit_strings_hu.pak",
-    "webkit_strings_id.pak",
-    "webkit_strings_it.pak",
-    "webkit_strings_ja.pak",
-    "webkit_strings_kn.pak",
-    "webkit_strings_ko.pak",
-    "webkit_strings_lt.pak",
-    "webkit_strings_lv.pak",
-    "webkit_strings_ml.pak",
-    "webkit_strings_mr.pak",
-    "webkit_strings_ms.pak",
-    "webkit_strings_nl.pak",
-    "webkit_strings_nb.pak",
-    "webkit_strings_pl.pak",
-    "webkit_strings_pt-BR.pak",
-    "webkit_strings_pt-PT.pak",
-    "webkit_strings_ro.pak",
-    "webkit_strings_ru.pak",
-    "webkit_strings_sk.pak",
-    "webkit_strings_sl.pak",
-    "webkit_strings_sr.pak",
-    "webkit_strings_sv.pak",
-    "webkit_strings_sw.pak",
-    "webkit_strings_ta.pak",
-    "webkit_strings_te.pak",
-    "webkit_strings_th.pak",
-    "webkit_strings_tr.pak",
-    "webkit_strings_uk.pak",
-    "webkit_strings_vi.pak",
-    "webkit_strings_zh-CN.pak",
-    "webkit_strings_zh-TW.pak",
-  ]
-}
diff --git a/webkit/webkit_resources.gyp b/webkit/webkit_resources.gyp
index 2c5f62a..f0eb6be 100644
--- a/webkit/webkit_resources.gyp
+++ b/webkit/webkit_resources.gyp
@@ -22,24 +22,6 @@
       ],
       'includes': [ '../build/grit_target.gypi' ],
     },
-    {
-      # GN version: //webkit:strings
-      'target_name': 'webkit_strings',
-      'type': 'none',
-      'variables': {
-        'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit',
-      },
-      'actions': [
-        {
-          'action_name': 'webkit_strings',
-          'variables': {
-            'grit_grd_file': 'glue/webkit_strings.grd',
-          },
-          'includes': [ '../build/grit_action.gypi' ],
-        },
-      ],
-      'includes': [ '../build/grit_target.gypi' ],
-    },
   ]
 }