Add pak file support for content shell and android apks.

content/public/android/java/src/org/chromium/content/browser/AndroidBrowserProcess.java

Index: content/public/android/java/src/org/chromium/content/browser/AndroidBrowserProcess.java
diff --git a/content/public/android/java/src/org/chromium/content/browser/AndroidBrowserProcess.java b/content/public/android/java/src/org/chromium/content/browser/AndroidBrowserProcess.java
index b3ddb81ce728e1b274aa761f17b1c122f7231c27..38d1a58ea67ccbf4212005e64edac8fd33019983 100644
--- a/content/public/android/java/src/org/chromium/content/browser/AndroidBrowserProcess.java
+++ b/content/public/android/java/src/org/chromium/content/browser/AndroidBrowserProcess.java
@@ -13,6 +13,7 @@ import org.chromium.content.app.AppResource;
 import org.chromium.content.app.ContentMain;
 import org.chromium.content.app.LibraryLoader;
 import org.chromium.content.browser.ContentView;
+import org.chromium.content.browser.ResourceExtractor;
 import org.chromium.content.common.CommandLine;
 
 // NOTE: This file hasn't been fully upstreamed, please don't merge to downstream.
@@ -85,6 +86,13 @@ public class AndroidBrowserProcess {
         }
         sInitialized = true;
 
+        // Normally Main.java will have kicked this off asynchronously for Chrome. But
+        // other ContentView apps like tests also need them so we make sure we've
+        // extracted resources here. We can still make it a little async (wait until
+        // the library is loaded).
+        ResourceExtractor resourceExtractor = ResourceExtractor.get(context);
+        resourceExtractor.startExtractingResources();
+
         // Normally Main.java will have already loaded the library asynchronously, we only
         // need to load it here if we arrived via another flow, e.g. bookmark access & sync setup.
         LibraryLoader.loadAndInitSync();
@@ -112,6 +120,9 @@ public class AndroidBrowserProcess {
         Log.i(TAG, "Initializing chromium process, renderers=" + maxRenderers +
                 " hostIsChrome=" + hostIsChrome);
 
+        // Now we really need to have the resources ready.
+        resourceExtractor.waitForCompletion();
+
         nativeSetCommandLineFlags(maxRenderers, getPlugins(context));
         ContentMain.initApplicationContext(appContext);
         ContentMain.start();