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}

2 files changed, 4 insertions, 2 deletions

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 154179c..a38451d 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwBrowserProcess.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwBrowserProcess.java
@@ -35,6 +35,10 @@ public abstract class AwBrowserProcess {
         } 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();
     }
 
     /**
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/CommandLineTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/CommandLineTest.java
index 500b7b0..4582f64 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/CommandLineTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/CommandLineTest.java
@@ -8,7 +8,6 @@ import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.android_webview.AwBrowserProcess;
 import org.chromium.base.CommandLine;
-import org.chromium.base.library_loader.LibraryLoader;
 import org.chromium.base.test.util.Feature;
 
 /**
@@ -35,7 +34,6 @@ public class CommandLineTest extends AwTestBase {
 
         // Setup Chrome.
         AwBrowserProcess.loadLibrary();
-        LibraryLoader.switchCommandLineForWebView();
 
         // Now we should have switched to a native backed command line:
         cl = CommandLine.getInstance();