Commit b5022da0 authored by mnaganov's avatar mnaganov Committed by Commit bot

Ensure ChildProcessCreationParams are passed before loading native code

If Chrome starts without child services pre-warming, ChildProcessLauncher
is not getting the special binding flag, and this causes child service
creation failure.

BUG=592722,593250

Review URL: https://codereview.chromium.org/1797383003

Cr-Commit-Position: refs/heads/master@{#381519}
parent 988d4da2
...@@ -45,6 +45,7 @@ import org.chromium.chrome.browser.webapps.ActivityAssigner; ...@@ -45,6 +45,7 @@ import org.chromium.chrome.browser.webapps.ActivityAssigner;
import org.chromium.components.variations.VariationsAssociatedData; import org.chromium.components.variations.VariationsAssociatedData;
import org.chromium.content.app.ContentApplication; import org.chromium.content.app.ContentApplication;
import org.chromium.content.browser.BrowserStartupController; import org.chromium.content.browser.BrowserStartupController;
import org.chromium.content.browser.ChildProcessLauncher;
import org.chromium.content.browser.DeviceUtils; import org.chromium.content.browser.DeviceUtils;
import org.chromium.content.browser.SpeechRecognition; import org.chromium.content.browser.SpeechRecognition;
import org.chromium.net.NetworkChangeNotifier; import org.chromium.net.NetworkChangeNotifier;
...@@ -297,6 +298,9 @@ public class ChromeBrowserInitializer { ...@@ -297,6 +298,9 @@ public class ChromeBrowserInitializer {
} }
}); });
// See crbug.com/593250. This can be removed after N SDK is released, crbug.com/592722.
ChildProcessLauncher.setChildProcessCreationParams(
mApplication.getChildProcessCreationParams());
if (isAsync) { if (isAsync) {
// We want to start this queue once the C++ startup tasks have run; allow the // 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 // C++ startup to run asynchonously, and set it up to start the Java queue once
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment