Commit 12c01712 authored by hjd's avatar hjd Committed by Commit bot

Fix the CommandLine for the WebView

The CookieManager startup path needs access to the CommandLine
before initialization.

BUG=331424

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

Cr-Commit-Position: refs/heads/master@{#297469}
parent af416844
...@@ -35,6 +35,10 @@ public abstract class AwBrowserProcess { ...@@ -35,6 +35,10 @@ public abstract class AwBrowserProcess {
} catch (ProcessInitException e) { } catch (ProcessInitException e) {
throw new RuntimeException("Cannot load WebView", 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();
} }
/** /**
......
...@@ -8,7 +8,6 @@ import android.test.suitebuilder.annotation.SmallTest; ...@@ -8,7 +8,6 @@ import android.test.suitebuilder.annotation.SmallTest;
import org.chromium.android_webview.AwBrowserProcess; import org.chromium.android_webview.AwBrowserProcess;
import org.chromium.base.CommandLine; import org.chromium.base.CommandLine;
import org.chromium.base.library_loader.LibraryLoader;
import org.chromium.base.test.util.Feature; import org.chromium.base.test.util.Feature;
/** /**
...@@ -35,7 +34,6 @@ public class CommandLineTest extends AwTestBase { ...@@ -35,7 +34,6 @@ public class CommandLineTest extends AwTestBase {
// Setup Chrome. // Setup Chrome.
AwBrowserProcess.loadLibrary(); AwBrowserProcess.loadLibrary();
LibraryLoader.switchCommandLineForWebView();
// Now we should have switched to a native backed command line: // Now we should have switched to a native backed command line:
cl = CommandLine.getInstance(); cl = CommandLine.getInstance();
......
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