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 6c97f4c8b35293bc1849bafbbf995d702b82d87e..eec84d07a9729e3e0b45579f3dfbd50ad8416713 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 |
@@ -110,6 +110,7 @@ public class BrowserStartupController { |
mContext = context.getApplicationContext(); |
mAsyncStartupCallbacks = new ArrayList<StartupCallback>(); |
mLibraryProcessType = libraryProcessType; |
+ ContextUtils.initApplicationContext(mContext); |
} |
/** |
@@ -292,7 +293,6 @@ public class BrowserStartupController { |
// TODO(yfriedman): Remove dependency on a command line flag for this. |
DeviceUtils.addDeviceSpecificUserAgentSwitch(mContext); |
- ContextUtils.initApplicationContext(mContext); |
nativeSetCommandLineFlags( |
singleProcess, nativeIsPluginEnabled() ? getPlugins() : null); |
mPostResourceExtractionTasksCompleted = true; |
@@ -319,8 +319,6 @@ public class BrowserStartupController { |
ResourceExtractor resourceExtractor = ResourceExtractor.get(mContext); |
resourceExtractor.startExtractingResources(); |
resourceExtractor.waitForCompletion(); |
- |
- ContextUtils.initApplicationContext(mContext.getApplicationContext()); |
nativeSetCommandLineFlags(false, null); |
} |