Add pak file support for content shell and android apks.

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

 // Copyright (c) 2012 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.
 
 package org.chromium.content.browser;
 
 import android.app.ActivityManager;
 import android.content.Context;
 import android.content.res.Resources;
 import android.util.Log;
 
 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.
 public class AndroidBrowserProcess {
 
     private static final String TAG = "BrowserProcessMain";
 
     // Prevents initializing the process more than once.
     private static boolean sInitialized = false;
 
@@ skipping 52 matching lines @@
      * @param maxRendererProcesses See ContentView.enableMultiProcess()
      * @param hostIsChrome pass true if running as the system browser process.
      */
     private static void genericChromiumProcessInit(Context context, int maxRendererProcesses,
             boolean hostIsChrome) {
         if (sInitialized) {
             return;
         }
         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();
 
         Context appContext = context.getApplicationContext();
 
         // This block is inside genericChromiumProcessInit() instead
         // of initChromiumBrowserProcess() to make sure we do it once.
         // In here it is protected with the sInitialized.
         if (hostIsChrome) {
             if (nativeIsOfficialBuild() ||
                     CommandLine.getInstance().hasSwitch(CommandLine.ADD_OFFICIAL_COMMAND_LINE)) {
                 Resources res = context.getResources();
                 try {
                     String[] switches = res.getStringArray(AppResource.ARRAY_OFFICIAL_COMMAND_LINE);
                     CommandLine.getInstance().appendSwitchesAndArguments(switches);
                 } catch (Resources.NotFoundException e) {
                     // Do nothing.  It is fine to have no command line
                     // additions for an official build.
                 }
             }
         }
 
         int maxRenderers = normalizeMaxRendererProcesses(appContext, maxRendererProcesses);
         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();
     }
 
     private static String getPlugins(final Context context) {
         return "";
     }
 
     private static native void nativeSetCommandLineFlags(
         int maxRenderProcesses, String plugin_descriptor);
 
     // Is this an official build of Chrome?  Only native code knows
     // for sure.  Official build knowledge is needed very early in
     // process startup.
     private static native boolean nativeIsOfficialBuild();
 }