content/public/android/javatests/src/org/chromium/content/browser/InterfaceRegistryTest.java - Issue 2247143004: Remove app context init from LibraryLoader.

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/android/javatests/src/org/chromium/content/browser/InterfaceRegistryTest.java

Issue 2247143004: Remove app context init from LibraryLoader. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Add missing setUp calls. Created 4 years, 4 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/android/java/src/org/chromium/base/library_loader/LibraryLoader.java ('K') | « content/public/android/javatests/src/org/chromium/content/browser/ImportantFileWriterAndroidTest.java ('k') | content/public/test/android/javatests/src/org/chromium/content/browser/test/NativeLibraryTestBase.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 9adf51bdda16ff8b8971445e3ecee571066ef64c..5dee06e78514ba42791bf1e720d0e1fd3e5ace6a 100644

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

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

@@ -4,8 +4,10 @@

package org.chromium.content.browser;

+import android.content.Context;

import android.test.suitebuilder.annotation.SmallTest;

+import org.chromium.base.ContextUtils;

import org.chromium.base.library_loader.LibraryLoader;

import org.chromium.base.library_loader.LibraryProcessType;

import org.chromium.content.browser.InterfaceRegistry.ImplementationFactory;

@@ -29,7 +31,7 @@ public class InterfaceRegistryTest extends ContentShellTestBase {

private static final long RUN_LOOP_TIMEOUT_MS = 25;

- private final List<Closeable> mCloseablesToClose = new ArrayList<Closeable>();

+ private final List<Closeable> mCloseablesToClose = new ArrayList<>();

private long mNativeTestEnvironment;

static class CalcConnectionErrorHandler implements ConnectionErrorHandler {

@@ -97,8 +99,9 @@ public class InterfaceRegistryTest extends ContentShellTestBase {

@Override

protected void setUp() throws Exception {

super.setUp();

- LibraryLoader.get(LibraryProcessType.PROCESS_BROWSER).ensureInitialized(

- getInstrumentation().getTargetContext());

+ Context appContext = getInstrumentation().getTargetContext().getApplicationContext();

+ ContextUtils.initApplicationContext(appContext);

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

launchContentShellWithUrl("about://blank");

mNativeTestEnvironment = ShellMojoTestUtils.setupTestEnvironment();

}