android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java - Issue 11926028: Remove ContentViewCore.enableMultiProcess etc.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java

Issue 11926028: Remove ContentViewCore.enableMultiProcess etc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: combine 2 init methods to 1 Created 7 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « android_webview/java/src/org/chromium/android_webview/AwBrowserProcess.java ('k') | chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java » ('j') | content/public/android/java/src/org/chromium/content/browser/AndroidBrowserProcess.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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 26295b6cd81b2c04bbb6fa6f6969ef04dba94842..54d1d3fca8710bf2a72466f070aad8cc974a3c12 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);

+ }

});

}