Remove ContentViewCore.enableMultiProcess etc.

android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.android_webview.test;
 
 import android.app.Instrumentation;
 import android.content.Context;
 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;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
 import org.chromium.content.browser.test.util.TestCallbackHelperContainer;
 import org.chromium.content.common.ProcessInitException;
 import org.chromium.ui.gfx.ActivityNativeWindow;
 
 import java.util.concurrent.atomic.AtomicInteger;
@@ skipping 16 matching lines @@
     }
 
     @Override
     protected void setUp() throws Exception {
         super.setUp();
         final Context context = getActivity();
         getInstrumentation().runOnMainSync(new Runnable() {
             @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);
+             }
         });
     }
 
     /**
      * Runs a {@link Callable} on the main thread, blocking until it is
      * complete, and returns the result. Calls
      * {@link Instrumentation#waitForIdleSync()} first to help avoid certain
      * race conditions.
      *
      * @param <R> Type of result to return
@@ skipping 239 matching lines @@
             final AwContents awContents,
             final boolean includeDiskFiles) throws Throwable {
         runTestOnUiThread(new Runnable() {
             @Override
             public void run() {
               awContents.clearCache(includeDiskFiles);
             }
         });
     }
 }