[Android WebView] Remove obsolete webviewchromium_strings.pak references.

We are now using the locale paks instead.


Review URL: https://chromiumcodereview.appspot.com/12230058

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

4 files changed, 3 insertions, 45 deletions

diff --git a/android_webview/Android.mk b/android_webview/Android.mk
index cc5043b..bf8912e 100644
--- a/android_webview/Android.mk
+++ b/android_webview/Android.mk
@@ -68,13 +68,6 @@ LOCAL_MODULE_STEM := webviewchromium
 LOCAL_BUILT_MODULE_STEM := android_webview/assets/webviewchromium.pak
 include $(LOCAL_PATH)/webview_pak.mk
 
-# TODO(benm): remove when downstream depends on localised paks.
-include $(CLEAR_VARS)
-LOCAL_MODULE := webviewchromium_strings_pak
-LOCAL_MODULE_STEM := webviewchromium_strings
-LOCAL_BUILT_MODULE_STEM := android_webview/assets/webviewchromium_strings.pak
-include $(LOCAL_PATH)/webview_pak.mk
-
 include $(CLEAR_VARS)
 LOCAL_MODULE := webviewchromium_webkit_strings_am.pak
 LOCAL_MODULE_STEM := am
diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp
index 8010ba8..f58bc8d 100644
--- a/android_webview/android_webview.gyp
+++ b/android_webview/android_webview.gyp
@@ -69,31 +69,7 @@
           'action': ['python', '<(repack_path)', '<@(_outputs)',
                      '<@(pak_inputs)'],
       },
-      {
-          # TODO(benm): remove this when we can get our strings from the
-          # java framework.
-          'action_name': 'repack_android_webview__strings_pack',
-          'dependencies': [
-            '<(DEPTH)/ui/base/strings/ui_strings.gyp:ui_strings',
-            '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_strings',
-          ],
-          'variables': {
-            'pak_inputs': [
-              '<(SHARED_INTERMEDIATE_DIR)/ui/app_locale_settings/app_locale_settings_en-US.pak',
-              '<(SHARED_INTERMEDIATE_DIR)/ui/ui_strings/ui_strings_en-US.pak',
-              '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak',
-            ],
-          },
-          'inputs': [
-            '<(repack_path)',
-            '<@(pak_inputs)',
-          ],
-          'outputs': [
-            '<(PRODUCT_DIR)/android_webview/assets/webviewchromium_strings.pak',
-          ],
-          'action': ['python', '<(repack_path)', '<@(_outputs)',
-                     '<@(pak_inputs)'],
-      }],
+      ],
     },
     {
       'target_name': 'android_webview_common',
diff --git a/android_webview/browser/aw_browser_main_parts.cc b/android_webview/browser/aw_browser_main_parts.cc
index 71c35e9..11aaf5c 100644
--- a/android_webview/browser/aw_browser_main_parts.cc
+++ b/android_webview/browser/aw_browser_main_parts.cc
@@ -49,23 +49,12 @@ void AwBrowserMainParts::PreEarlyInitialization() {
 int AwBrowserMainParts::PreCreateThreads() {
   browser_context_->InitializeBeforeThreadCreation();
 
-  // Although we don't load a locale pak for Android WebView, we still
-  // need to initialise the resource bundle with a locale.
   ui::ResourceBundle::InitSharedInstanceLocaleOnly(
       content::GetContentClient()->browser()->GetApplicationLocale(), NULL);
 
-  // TODO(benm): It would be nice to be able to take string resources from
-  // the Android framework for WebView, and rely on resource paks only
-  // for non-string assets. e.g. graphics (and might be nice in the
-  // long term to move them into the Android framwork too). Toward
-  // that, seed the ResourceBundle instance with a non-string, locale
-  // independant pak. Until we no longer rely on paks for strings,
-  // load an extra data pack separately that has the strings in it.
   base::FilePath pak_path;
   PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &pak_path);
-  ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath(
-      pak_path.AppendASCII("webviewchromium_strings.pak"),
-      ui::SCALE_FACTOR_NONE);
+
   ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath(
       pak_path.AppendASCII("webviewchromium.pak"),
       ui::SCALE_FACTOR_NONE);
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestRunnerApplication.java b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestRunnerApplication.java
index 22984c8..55ca4cc 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestRunnerApplication.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestRunnerApplication.java
@@ -14,7 +14,7 @@ public class AndroidWebViewTestRunnerApplication extends Application {
 
     /** The minimum set of .pak files the test runner needs. */
     private static final String[] MANDATORY_PAKS = {
-        "webviewchromium.pak", "webviewchromium_strings.pak"
+        "webviewchromium.pak", "en-US.pak"
     };
 
     @Override