content/public/test/android/javatests/src/org/chromium/content/browser/test/NativeLibraryTestBase.java - Issue 897683003: Know the process shared library loaded in

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: content/public/test/android/javatests/src/org/chromium/content/browser/test/NativeLibraryTestBase.java

Issue 897683003: Know the process shared library loaded in (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: address comments Created 5 years, 10 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

« base/base.gyp ('K') | « content/public/android/javatests/src/org/chromium/content/browser/ServiceRegistryTest.java ('k') | content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java » ('j') | content/shell/android/linker_test_apk/src/org/chromium/chromium_linker_test_apk/ChromiumLinkerTestActivity.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/public/test/android/javatests/src/org/chromium/content/browser/test/NativeLibraryTestBase.java

diff --git a/content/public/test/android/javatests/src/org/chromium/content/browser/test/NativeLibraryTestBase.java b/content/public/test/android/javatests/src/org/chromium/content/browser/test/NativeLibraryTestBase.java

index b45e8bd6115dae3a470ef742f0943cf950eee981..ba318e918ff8bdc86a89aa35afe72bd3754e84cb 100644

--- a/content/public/test/android/javatests/src/org/chromium/content/browser/test/NativeLibraryTestBase.java

+++ b/content/public/test/android/javatests/src/org/chromium/content/browser/test/NativeLibraryTestBase.java

@@ -8,6 +8,7 @@ import android.test.InstrumentationTestCase;

import org.chromium.base.ThreadUtils;

import org.chromium.base.library_loader.LibraryLoader;

+import org.chromium.base.library_loader.LibraryProcessType;

import org.chromium.base.library_loader.ProcessInitException;

import org.chromium.content.browser.BrowserStartupController;

import org.chromium.content.browser.test.util.ApplicationUtils;

@@ -54,14 +55,14 @@ public class NativeLibraryTestBase extends InstrumentationTestCase {

private void nativeInitialization(boolean initBrowserProcess) {

if (initBrowserProcess) {

try {

- BrowserStartupController.get(getInstrumentation().getTargetContext())

- .startBrowserProcessesSync(false);

+ BrowserStartupController.get(getInstrumentation().getTargetContext(),

+ LibraryProcessType.PROCESS_BROWSER).startBrowserProcessesSync(false);

} catch (ProcessInitException e) {

throw new Error(e);

}

} else {

try {

- LibraryLoader.ensureInitialized();

+ LibraryLoader.get(LibraryProcessType.PROCESS_BROWSER).ensureInitialized();

} catch (ProcessInitException e) {

throw new Error(e);

}