android: Allow registering multiple CreationParams

chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkActivity.java

Index: chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkActivity.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkActivity.java
index 360b52624cac92b4f4021ac8f1d2fbdeca45270c..e57c64ad1b0866bef7ca97c4d6ab2fc86b569206 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkActivity.java
@@ -8,7 +8,6 @@ import android.content.Intent;
 
 import org.chromium.base.ContextUtils;
 import org.chromium.base.library_loader.LibraryProcessType;
-import org.chromium.chrome.browser.ChromeApplication;
 import org.chromium.chrome.browser.ShortcutHelper;
 import org.chromium.chrome.browser.externalnav.ExternalNavigationParams;
 import org.chromium.chrome.browser.metrics.WebApkUma;
@@ -31,6 +30,9 @@ public class WebApkActivity extends WebappActivity {
     /** Manages whether to check update for the WebAPK, and starts update check if needed. */
     private WebApkUpdateManager mUpdateManager;
 
+    private final ChildProcessCreationParams mDefaultParams =
+            ChildProcessCreationParams.getDefault();
+
     @Override
     protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
@@ -187,14 +189,13 @@ public class WebApkActivity extends WebappActivity {
      */
     private void initializeChildProcessCreationParams(boolean isForWebApk) {
         // TODO(hanxi): crbug.com/664530. WebAPKs shouldn't use a global ChildProcessCreationParams.
-        ChromeApplication chrome = (ChromeApplication) ContextUtils.getApplicationContext();
-        ChildProcessCreationParams params = chrome.getChildProcessCreationParams();
+        ChildProcessCreationParams params = mDefaultParams;
         if (isForWebApk) {
             boolean isExternalService = false;
             params = new ChildProcessCreationParams(getWebappInfo().webApkPackageName(),
                     isExternalService, LibraryProcessType.PROCESS_CHILD);
         }
-        ChildProcessCreationParams.set(params);
+        ChildProcessCreationParams.registerDefault(params);
     }
 
     @Override