Index: content/public/android/java/src/org/chromium/content/browser/BrowserStartupController.java |
diff --git a/content/public/android/java/src/org/chromium/content/browser/BrowserStartupController.java b/content/public/android/java/src/org/chromium/content/browser/BrowserStartupController.java |
index ee4b1087d7c1c278e673d0cd4e9938de79fdba76..77ffca39b8fb495d194b9e99e19ca5859f5c23a7 100644 |
--- a/content/public/android/java/src/org/chromium/content/browser/BrowserStartupController.java |
+++ b/content/public/android/java/src/org/chromium/content/browser/BrowserStartupController.java |
@@ -283,8 +283,8 @@ public class BrowserStartupController { |
// Now we really need to have the resources ready. |
resourceExtractor.waitForCompletion(); |
- nativeSetCommandLineFlags(singleProcess, nativeIsPluginEnabled() ? getPlugins() : null); |
ContentMain.initApplicationContext(appContext); |
+ nativeSetCommandLineFlags(singleProcess, nativeIsPluginEnabled() ? getPlugins() : null); |
} |
/** |
@@ -294,6 +294,8 @@ public class BrowserStartupController { |
ResourceExtractor resourceExtractor = ResourceExtractor.get(mContext); |
resourceExtractor.startExtractingResources(); |
resourceExtractor.waitForCompletion(); |
+ |
+ ContentMain.initApplicationContext(mContext.getApplicationContext()); |
nativeSetCommandLineFlags(false, null); |
} |