Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(401)

Unified Diff: content/public/android/java/src/org/chromium/content/browser/BrowserStartupController.java

Issue 2247143004: Remove app context init from LibraryLoader. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add missing setUp calls. Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 0bdca83e1868f3b299c2b0134784413c4e284256..7426eab962498397c404c62e0529b37f4d8e8f84 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
@@ -8,6 +8,7 @@ import android.content.Context;
import android.os.Handler;
import android.os.StrictMode;
+import org.chromium.base.ContextUtils;
import org.chromium.base.Log;
import org.chromium.base.ResourceExtractor;
import org.chromium.base.ThreadUtils;
@@ -118,7 +119,7 @@ public class BrowserStartupController {
BrowserStartupController(Context context, int libraryProcessType) {
mContext = context.getApplicationContext();
- mAsyncStartupCallbacks = new ArrayList<StartupCallback>();
+ mAsyncStartupCallbacks = new ArrayList<>();
mLibraryProcessType = libraryProcessType;
}
@@ -293,6 +294,8 @@ public class BrowserStartupController {
ResourceExtractor resourceExtractor = ResourceExtractor.get(mContext);
resourceExtractor.startExtractingResources();
+ ContextUtils.initApplicationContext(mContext.getApplicationContext());
+
// This strictmode exception is to cover the case where the browser process is being started
// asynchronously but not in the main browser flow. The main browser flow will trigger
// library loading earlier and this will be a no-op, but in the other cases this will need

Powered by Google App Engine
This is Rietveld 408576698