| Index: android_webview/java/src/org/chromium/android_webview/AwBrowserProcess.java
|
| diff --git a/android_webview/java/src/org/chromium/android_webview/AwBrowserProcess.java b/android_webview/java/src/org/chromium/android_webview/AwBrowserProcess.java
|
| index 35bb81ed96d516a924431fa1a3cb0ccd44142413..a0ac2e34bf3e23a27fcdcb76f7155dad77201a37 100644
|
| --- a/android_webview/java/src/org/chromium/android_webview/AwBrowserProcess.java
|
| +++ b/android_webview/java/src/org/chromium/android_webview/AwBrowserProcess.java
|
| @@ -7,6 +7,7 @@
|
| import android.app.Application;
|
| import android.content.Context;
|
|
|
| +import org.chromium.android_webview.policy.AwPolicyProvider;
|
| import org.chromium.base.ApplicationStatus;
|
| import org.chromium.base.CommandLine;
|
| import org.chromium.base.PathUtils;
|
| @@ -15,6 +16,7 @@
|
| import org.chromium.base.library_loader.LibraryProcessType;
|
| import org.chromium.base.library_loader.ProcessInitException;
|
| import org.chromium.content.browser.BrowserStartupController;
|
| +import org.chromium.policy.CombinedPolicyProvider;
|
|
|
| /**
|
| * Wrapper for the steps needed to initialize the java and native sides of webview chromium.
|
| @@ -61,6 +63,12 @@ public void run() {
|
| if (application != null) {
|
| ApplicationStatus.initializeActivityIndependent(application, context);
|
| }
|
| +
|
| + // The policies are used by browser startup, so we need to register the policy
|
| + // providers before starting the browser process. This only registers java objects
|
| + // and doesn't need the native library.
|
| + CombinedPolicyProvider.get().registerProvider(new AwPolicyProvider(context));
|
| +
|
| try {
|
| BrowserStartupController.get(context, LibraryProcessType.PROCESS_WEBVIEW)
|
| .startBrowserProcessesSync(!CommandLine.getInstance().hasSwitch(
|
|
|