Upstream: Renderers are running in WebAPKs.

chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.init;
 
 import android.app.Activity;
 import android.content.Context;
 import android.os.AsyncTask;
 import android.os.Build;
@@ skipping 294 matching lines @@
 
         initQueue.add(new NativeInitTask() {
             @Override
             public void initFunction() {
                 if (delegate.isActivityDestroyed()) return;
                 delegate.finishNativeInitialization();
             }
         });
 
         // See crbug.com/593250. This can be removed after N SDK is released, crbug.com/592722.
-        ChildProcessCreationParams.set(mApplication.getChildProcessCreationParams());
+        ChildProcessCreationParams creationParams = mApplication.getChildProcessCreationParams();
+        // WebAPK uses this code path to initialize Chrome's native code, and the
+        // ChildProcessCreationParams has been set in {@link WebApkActivity}. We have to prevent
+        // resetting with a wrong parameter here. TODO(hanxi): Remove the entire if block after
+        // N SDK is released, since it breaks WebAPKs on N+.
+        if (creationParams != null && ChildProcessCreationParams.get() != null) {
+            ChildProcessCreationParams.set(creationParams);

[no sievers, 2016/06/24 21:33:40]

Is this still needed?

[Xi Han, 2016/06/24 21:57:06]

Since I am not sure whether we can remove
ChildProcessCreationParams.set(creationParams) entirely, so the if check is
still needed. It prevent the creation parameter being reset, since we still need
the package name within it.

+        }
         if (isAsync) {
             // We want to start this queue once the C++ startup tasks have run; allow the
             // C++ startup to run asynchonously, and set it up to start the Java queue once
             // it has finished.
             startChromeBrowserProcessesAsync(
                     delegate.shouldStartGpuProcess(),
                     new BrowserStartupController.StartupCallback() {
                         @Override
                         public void onFailure() {
                             delegate.onStartupFailure();
@@ skipping 105 matching lines @@
                         Log.e(TAG, "Killing process because of locale change.");
                         Process.killProcess(Process.myPid());
                     }
 
                     DeviceFormFactor.resetValuesIfNeeded(mApplication);
                 }
             }
         };
     }
 }