blimp/client/app/android/javatests/src/org/chromium/blimp/BlimpNativeInstrumentationTestCase.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: blimp/client/app/android/javatests/src/org/chromium/blimp/BlimpNativeInstrumentationTestCase.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') | « blimp/client/app/android/java/src/org/chromium/blimp/BlimpRendererActivity.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/init/NativeInitializationController.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: blimp/client/app/android/javatests/src/org/chromium/blimp/BlimpNativeInstrumentationTestCase.java

diff --git a/blimp/client/app/android/javatests/src/org/chromium/blimp/BlimpNativeInstrumentationTestCase.java b/blimp/client/app/android/javatests/src/org/chromium/blimp/BlimpNativeInstrumentationTestCase.java

index 179138e52bbd0cf98b66653c00211616082f17fb..58da59cbd3201f25604e544305a93cd558abf309 100644

--- a/blimp/client/app/android/javatests/src/org/chromium/blimp/BlimpNativeInstrumentationTestCase.java

+++ b/blimp/client/app/android/javatests/src/org/chromium/blimp/BlimpNativeInstrumentationTestCase.java

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

package org.chromium.blimp;

+import android.content.Context;

import android.test.InstrumentationTestCase;

+import org.chromium.base.ContextUtils;

import org.chromium.base.ThreadUtils;

import org.chromium.base.library_loader.ProcessInitException;

@@ -24,9 +26,13 @@ public class BlimpNativeInstrumentationTestCase extends InstrumentationTestCase

ThreadUtils.runOnUiThreadBlocking(new Runnable() {

@Override

public void run() {

+ Context appContext =

+ getInstrumentation().getTargetContext().getApplicationContext();

+ ContextUtils.initApplicationContext(appContext);

try {

- BlimpLibraryLoader.startAsync(getInstrumentation().getTargetContext(),

+ BlimpLibraryLoader.startAsync(appContext,

new BlimpLibraryLoader.Callback() {

+ @Override

public void onStartupComplete(boolean success) {

mSuccess = success;

mNativeReadySemaphore.release();