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

Unified Diff: content/public/android/java/src/org/chromium/content/app/ChildProcessService.java

Issue 1879013002: 🍈 Unify application context usage. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix content tests. :( Created 4 years, 8 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/app/ChildProcessService.java
diff --git a/content/public/android/java/src/org/chromium/content/app/ChildProcessService.java b/content/public/android/java/src/org/chromium/content/app/ChildProcessService.java
index 54dc6e62faf02591c0c0245b12c138c0acbe55cb..77f70e9ffcb0849355ff60e1611baf03cce24f78 100644
--- a/content/public/android/java/src/org/chromium/content/app/ChildProcessService.java
+++ b/content/public/android/java/src/org/chromium/content/app/ChildProcessService.java
@@ -116,6 +116,8 @@ public class ChildProcessService extends Service {
sContext.set(this);
super.onCreate();
+ ContextUtils.initApplicationContext(getApplicationContext());
+
mMainThread = new Thread(new Runnable() {
@Override
@SuppressFBWarnings("DM_EXIT")
@@ -187,7 +189,6 @@ public class ChildProcessService extends Service {
mMainThread.wait();
}
}
- ContextUtils.initApplicationContext(sContext.get().getApplicationContext());
for (FileDescriptorInfo fdInfo : mFdInfos) {
nativeRegisterGlobalFileDescriptor(
fdInfo.mId, fdInfo.mFd.detachFd(), fdInfo.mOffset, fdInfo.mSize);

Powered by Google App Engine
This is Rietveld 408576698