Remove ContentViewCore.enableMultiProcess etc.

BUG=


Review URL: https://chromiumcodereview.appspot.com/11926028

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181765 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 4 insertions, 9 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 3e465d6..5e027f6 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwBrowserProcess.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwBrowserProcess.java
@@ -49,7 +49,7 @@ public abstract class AwBrowserProcess {
             public void run() {
                 try {
                     LibraryLoader.ensureInitialized();
-                    AndroidBrowserProcess.initContentViewProcess(context,
+                    AndroidBrowserProcess.init(context,
                             AndroidBrowserProcess.MAX_RENDERERS_SINGLE_PROCESS);
                 } catch (ProcessInitException e) {
                     throw new RuntimeException("Cannot initialize WebView", e);
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java
index 71e6714..724669f 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java
@@ -10,12 +10,12 @@ import android.test.ActivityInstrumentationTestCase2;
 
 import junit.framework.Assert;
 
+import org.chromium.android_webview.AwBrowserProcess;
 import org.chromium.android_webview.AwContents;
 import org.chromium.android_webview.AwContentsClient;
 import org.chromium.android_webview.AwSettings;
 import org.chromium.android_webview.test.util.JSUtils;
 import org.chromium.content.browser.ContentSettings;
-import org.chromium.content.browser.ContentView;
 import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content.browser.LoadUrlParams;
 import org.chromium.content.browser.test.util.CallbackHelper;
@@ -52,13 +52,8 @@ public class AndroidWebViewTestBase
             @Override
             public void run() {
                 AwTestResourceProvider.registerResources(context);
-                try {
-                    ContentViewCore.initChromiumBrowserProcess(
-                            context, ContentView.MAX_RENDERERS_SINGLE_PROCESS);
-                } catch (ProcessInitException e) {
-                    throw new Error("Failed to initialize browser process", e);
-                }
-            }
+                AwBrowserProcess.start(context);
+             }
         });
     }