chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.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: chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.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/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java ('k') | content/public/android/java/src/org/chromium/content/browser/AndroidBrowserProcess.java » ('j') | content/public/android/java/src/org/chromium/content/browser/AndroidBrowserProcess.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java

diff --git a/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java b/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java

index 4d9e6b727ba11640bda272156e18b40dcd41f037..00682ad6bcce116d0dba8aad9861ed3f82efd2c4 100644

--- a/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java

+++ b/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java

@@ -15,6 +15,7 @@ import org.chromium.base.ChromiumActivity;

import org.chromium.chrome.browser.DevToolsServer;

import org.chromium.chrome.browser.TabBase;

import org.chromium.content.app.LibraryLoader;

+import org.chromium.content.browser.AndroidBrowserProcess;

import org.chromium.content.browser.ContentView;

import org.chromium.content.browser.DeviceUtils;

import org.chromium.content.common.CommandLine;

@@ -42,7 +43,7 @@ public class ChromiumTestShellActivity extends ChromiumActivity {

DeviceUtils.addDeviceSpecificUserAgentSwitch(this);

try {

- ContentView.initChromiumBrowserProcess(this, ContentView.MAX_RENDERERS_AUTOMATIC);

+ AndroidBrowserProcess.init(this, AndroidBrowserProcess.MAX_RENDERERS_AUTOMATIC);

} catch (ProcessInitException e) {

Log.e(TAG, "Chromium browser process initialization failed", e);

finish();