| 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 f13ecac4583143e94b8371d5076d8126571b7874..59454d210121ab4f8f608048726764bf2eaebcec 100644
|
| --- a/android_webview/java/src/org/chromium/android_webview/AwBrowserProcess.java
|
| +++ b/android_webview/java/src/org/chromium/android_webview/AwBrowserProcess.java
|
| @@ -32,14 +32,14 @@ public abstract class AwBrowserProcess {
|
| public static void loadLibrary() {
|
| PathUtils.setPrivateDataDirectorySuffix(PRIVATE_DATA_DIRECTORY_SUFFIX);
|
| try {
|
| - LibraryLoader.loadNow();
|
| + LibraryLoader.get(LibraryLoader.WEBVIEW).loadNow();
|
| + // Switch the command line implementation from Java to native.
|
| + // It's okay for the WebView to do this before initialization because we have
|
| + // setup the JNI bindings by this point.
|
| + LibraryLoader.get(LibraryLoader.WEBVIEW).switchCommandLineForWebView();
|
| } catch (ProcessInitException e) {
|
| throw new RuntimeException("Cannot load WebView", e);
|
| }
|
| - // Switch the command line implementation from Java to native.
|
| - // It's okay for the WebView to do this before initialization because we have
|
| - // setup the JNI bindings by this point.
|
| - LibraryLoader.switchCommandLineForWebView();
|
| }
|
|
|
| /**
|
| @@ -56,7 +56,8 @@ public abstract class AwBrowserProcess {
|
| @Override
|
| public void run() {
|
| try {
|
| - BrowserStartupController.get(context).startBrowserProcessesSync(true);
|
| + BrowserStartupController.get(context, LibraryLoader.WEBVIEW)
|
| + .startBrowserProcessesSync(true);
|
| initializePlatformKeySystem();
|
| } catch (ProcessInitException e) {
|
| throw new RuntimeException("Cannot initialize WebView", e);
|
|
|