Convert Android WebView to store locale .pak files as res/raw resources

Convert Android WebView to store locale .pak files as res/raw resources

Motivation for this is to have webview be consistent with chrome in how
it bundles these. It does also have the side-effect of improving the
look-up time for LocaleDataPakExists.

BUG=371610
Committed: https://crrev.com/bffa19f30776f745fc5f6aef5881113781f3bd41
Cr-Commit-Position: refs/heads/master@{#336237}

[agrieve, 2015-06-17 20:20:55]

agrieve@chromium.org changed reviewers:
+ sadrul@chromium.org, torne@chromium.org, yfriedman@chromium.org

[agrieve, 2015-06-17 20:20:55]

yfriedman@chromium.org: Please review changes in */android

sadrul@chromium.org: Please review changes in ui/

torne@chromium.org: Please review changes in android_webview/

[Torne, 2015-06-18 16:20:52]

android_webview changes LGTM, but have you tested the actual system webview with
these changes?

[Torne, 2015-06-18 16:20:54]

android_webview changes LGTM, but have you tested the actual system webview with
these changes?

[agrieve, 2015-06-18 16:59:27]

On 2015/06/18 16:20:54, Torne wrote:
> android_webview changes LGTM, but have you tested the actual system webview
with
> these changes?

All I've been doing is installing SystemWebViewGoogle.apk and then opening a
gmail message. If I should test more then please advise :)

[Torne, 2015-06-18 17:01:29]

On 2015/06/18 16:59:27, agrieve wrote:
> On 2015/06/18 16:20:54, Torne wrote:
> > android_webview changes LGTM, but have you tested the actual system webview
> with
> > these changes?
> 
> All I've been doing is installing SystemWebViewGoogle.apk and then opening a
> gmail message. If I should test more then please advise :)

If that works that's probably sufficient; thanks. I just wanted to check, since
the waterfall doesn't actually test the real webview at all.

[Yaron, 2015-06-19 15:01:30]

lgtm

https://codereview.chromium.org/1193613002/diff/1/base/android/java/src/org/c...
File base/android/java/src/org/chromium/base/ResourceExtractor.java (right):

https://codereview.chromium.org/1193613002/diff/1/base/android/java/src/org/c...
base/android/java/src/org/chromium/base/ResourceExtractor.java:40: private
static ResourceEntry[] sMandatoryPaks = new ResourceEntry[0];
sResourcesToExtract

https://codereview.chromium.org/1193613002/diff/1/ui/base/resource/resource_b...
File ui/base/resource/resource_bundle.cc (right):

https://codereview.chromium.org/1193613002/diff/1/ui/base/resource/resource_b...
ui/base/resource/resource_bundle.cc:203: // TODO(mkosiba,primiano): Chrome
should mmap the .pak files too, in which
Nit: remove comment

https://codereview.chromium.org/1193613002/diff/1/ui/base/resource/resource_b...
File ui/base/resource/resource_bundle_android.h (right):

https://codereview.chromium.org/1193613002/diff/1/ui/base/resource/resource_b...
ui/base/resource/resource_bundle_android.h:31: UI_BASE_EXPORT std::string
GetPathForAndroidLocalePakWithinApk(
that's a mouthful

[agrieve, 2015-06-23 15:33:22]

https://codereview.chromium.org/1193613002/diff/1/base/android/java/src/org/c...
File base/android/java/src/org/chromium/base/ResourceExtractor.java (right):

https://codereview.chromium.org/1193613002/diff/1/base/android/java/src/org/c...
base/android/java/src/org/chromium/base/ResourceExtractor.java:40: private
static ResourceEntry[] sMandatoryPaks = new ResourceEntry[0];
On 2015/06/19 15:01:30, Yaron wrote:
> sResourcesToExtract

Done.

https://codereview.chromium.org/1193613002/diff/1/ui/base/resource/resource_b...
File ui/base/resource/resource_bundle.cc (right):

https://codereview.chromium.org/1193613002/diff/1/ui/base/resource/resource_b...
ui/base/resource/resource_bundle.cc:203: // TODO(mkosiba,primiano): Chrome
should mmap the .pak files too, in which
On 2015/06/19 15:01:30, Yaron wrote:
> Nit: remove comment

Done.

https://codereview.chromium.org/1193613002/diff/1/ui/base/resource/resource_b...
File ui/base/resource/resource_bundle_android.h (right):

https://codereview.chromium.org/1193613002/diff/1/ui/base/resource/resource_b...
ui/base/resource/resource_bundle_android.h:31: UI_BASE_EXPORT std::string
GetPathForAndroidLocalePakWithinApk(
On 2015/06/19 15:01:30, Yaron wrote:
> that's a mouthful

Yeah, I think it's worth it though:
- Need to say "Android" since it's not within an android namespace.
- Need to say "WithinApk" to be clear it's not a path on disk
- Need to say "LocalePak" since that's the only kind of file it looks for.

[sadrul, 2015-06-24 18:20:46]

lgtm

[agrieve, 2015-06-24 23:03:43]

The CQ bit was checked by agrieve@chromium.org

[agrieve, 2015-06-24 23:03:44]

The patchset sent to the CQ was uploaded after l-g-t-m from
yfriedman@chromium.org, torne@chromium.org, sadrul@chromium.org
Link to the patchset: https://codereview.chromium.org/1193613002/#ps40001
(title: "rebase")

[commit-bot: I haz the power, 2015-06-24 23:05:35]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1193613002/40001

[commit-bot: I haz the power, 2015-06-24 23:10:16]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-06-24 23:10:17]

Exceeded global retry quota

[agrieve, 2015-06-24 23:49:59]

The CQ bit was checked by agrieve@chromium.org

[commit-bot: I haz the power, 2015-06-24 23:51:54]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1193613002/40001

[commit-bot: I haz the power, 2015-06-24 23:55:24]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-06-24 23:55:27]

Exceeded global retry quota

[agrieve, 2015-06-25 00:09:21]

The CQ bit was checked by agrieve@chromium.org

[agrieve, 2015-06-25 00:09:21]

The patchset sent to the CQ was uploaded after l-g-t-m from
yfriedman@chromium.org, sadrul@chromium.org, torne@chromium.org
Link to the patchset: https://codereview.chromium.org/1193613002/#ps60001
(title: "rebase")

[commit-bot: I haz the power, 2015-06-25 00:10:43]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1193613002/60001

[commit-bot: I haz the power, 2015-06-25 01:10:34]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-06-25 01:10:35]

Try jobs failed on following builders:
  android_clang_dbg_recipe on tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/android_clang_d...)

[agrieve, 2015-06-25 02:38:28]

The CQ bit was checked by agrieve@chromium.org

[commit-bot: I haz the power, 2015-06-25 02:39:10]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1193613002/60001

[commit-bot: I haz the power, 2015-06-25 03:31:13]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-06-25 03:31:15]

Try jobs failed on following builders:
  android_clang_dbg_recipe on tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/android_clang_d...)

[agrieve, 2015-06-25 12:29:59]

The CQ bit was checked by agrieve@chromium.org

[commit-bot: I haz the power, 2015-06-25 12:30:20]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1193613002/60001

[commit-bot: I haz the power, 2015-06-25 13:20:48]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-06-25 13:20:50]

Try jobs failed on following builders:
  android_clang_dbg_recipe on tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/android_clang_d...)

[agrieve, 2015-06-25 15:22:14]

The CQ bit was checked by agrieve@chromium.org

[agrieve, 2015-06-25 15:22:14]

The patchset sent to the CQ was uploaded after l-g-t-m from
yfriedman@chromium.org, sadrul@chromium.org, torne@chromium.org
Link to the patchset: https://codereview.chromium.org/1193613002/#ps80001
(title: "fix findbugs warnings")

[commit-bot: I haz the power, 2015-06-25 15:22:43]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1193613002/80001

[agrieve, 2015-06-25 15:23:18]

The CQ bit was unchecked by agrieve@chromium.org

[agrieve, 2015-06-25 15:27:39]

The CQ bit was checked by agrieve@chromium.org

[agrieve, 2015-06-25 15:27:40]

The patchset sent to the CQ was uploaded after l-g-t-m from
yfriedman@chromium.org, sadrul@chromium.org, torne@chromium.org
Link to the patchset: https://codereview.chromium.org/1193613002/#ps100001
(title: "actually fix findbugs")

[commit-bot: I haz the power, 2015-06-25 15:27:56]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1193613002/100001

[commit-bot: I haz the power, 2015-06-25 17:44:58]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-06-25 17:45:00]

Failed to apply patch for
chrome/android/java/src/org/chromium/chrome/browser/ChromeMobileApplication.java:
While running git apply --index -3 -p1;
  error: patch failed:
chrome/android/java/src/org/chromium/chrome/browser/ChromeMobileApplication.java:70
  Falling back to three-way merge...
  Applied patch to
'chrome/android/java/src/org/chromium/chrome/browser/ChromeMobileApplication.java'
with conflicts.
  U
chrome/android/java/src/org/chromium/chrome/browser/ChromeMobileApplication.java

Patch:      
chrome/android/java/src/org/chromium/chrome/browser/ChromeMobileApplication.java
Index:
chrome/android/java/src/org/chromium/chrome/browser/ChromeMobileApplication.java
diff --git
a/chrome/android/java/src/org/chromium/chrome/browser/ChromeMobileApplication.java
b/chrome/android/java/src/org/chromium/chrome/browser/ChromeMobileApplication.java
index
b1dea61066142725927a4e3d151862b7c8f0015e..8962daaf863556e8de16317a0bd67bfe731f45e7
100644
---
a/chrome/android/java/src/org/chromium/chrome/browser/ChromeMobileApplication.java
+++
b/chrome/android/java/src/org/chromium/chrome/browser/ChromeMobileApplication.java
@@ -70,6 +70,7 @@ import org.chromium.content.browser.ContentViewStatics;
 import org.chromium.content.browser.DownloadController;
 import org.chromium.printing.PrintingController;
 import org.chromium.ui.UiUtils;
+import org.chromium.ui.base.ResourceBundle;
 
 import java.lang.ref.WeakReference;
 import java.util.Locale;
@@ -195,7 +196,8 @@ public class ChromeMobileApplication extends
ChromiumApplication {
     protected void initializeLibraryDependencies() {
         // The ResourceExtractor is only needed by the browser process, but
this will have no
         // impact on the renderer process construction.
-        ResourceExtractor.setMandatoryPaksToExtract(R.array.locale_paks);
+        ResourceBundle.initializeLocalePaks(this, R.array.locale_paks);
+       
ResourceExtractor.setResourcesToExtract(ResourceBundle.getActiveLocaleResources());
         PathUtils.setPrivateDataDirectorySuffix(PRIVATE_DATA_DIRECTORY_SUFFIX,
this);
     }

[commit-bot: I haz the power, 2015-06-25 17:46:27]

The CQ bit was unchecked by commit-bot@chromium.org

[agrieve, 2015-06-25 17:55:14]

The CQ bit was checked by agrieve@chromium.org

[agrieve, 2015-06-25 17:55:14]

The patchset sent to the CQ was uploaded after l-g-t-m from
yfriedman@chromium.org, sadrul@chromium.org, torne@chromium.org
Link to the patchset: https://codereview.chromium.org/1193613002/#ps120001
(title: "rebase again")

[commit-bot: I haz the power, 2015-06-25 17:56:56]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1193613002/120001

[commit-bot: I haz the power, 2015-06-25 19:55:46]

Committed patchset #7 (id:120001)

[commit-bot: I haz the power, 2015-06-25 19:56:35]

Patchset 7 (id:??) landed as
https://crrev.com/bffa19f30776f745fc5f6aef5881113781f3bd41
Cr-Commit-Position: refs/heads/master@{#336237}