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

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

Issue 1967733002: Break base/ dependency on WebAPKs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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 77f70e9ffcb0849355ff60e1611baf03cce24f78..19e7a35c63ca24708a099088350703ace5f36f41 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
@@ -23,6 +23,7 @@ import org.chromium.base.annotations.CalledByNative;
import org.chromium.base.annotations.JNINamespace;
import org.chromium.base.annotations.SuppressFBWarnings;
import org.chromium.base.library_loader.LibraryLoader;
+import org.chromium.base.library_loader.LibraryProcessType;
import org.chromium.base.library_loader.Linker;
import org.chromium.base.library_loader.ProcessInitException;
import org.chromium.content.browser.ChildProcessConstants;
@@ -32,6 +33,7 @@ import org.chromium.content.common.ContentSwitches;
import org.chromium.content.common.IChildProcessCallback;
import org.chromium.content.common.IChildProcessService;
import org.chromium.content.common.SurfaceWrapper;
+import org.chromium.webapk.lib.common.WebApkUtils;
import java.util.concurrent.Semaphore;
import java.util.concurrent.atomic.AtomicReference;
@@ -155,7 +157,11 @@ public class ChildProcessService extends Service {
boolean loadAtFixedAddressFailed = false;
try {
- LibraryLoader.get(mLibraryProcessType).loadNow(getApplicationContext());
+ Context context =
+ (mLibraryProcessType == LibraryProcessType.PROCESS_WEBAPK_CHILD)
+ ? WebApkUtils.getHostBrowserContext(getApplicationContext())
+ : getApplicationContext();
+ LibraryLoader.get(mLibraryProcessType).loadNow(context);
isLoaded = true;
} catch (ProcessInitException e) {
if (requestedSharedRelro) {

Powered by Google App Engine
This is Rietveld 408576698