base/android/javatests/src/org/chromium/base/metrics/RecordHistogramTest.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: base/android/javatests/src/org/chromium/base/metrics/RecordHistogramTest.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') | « base/android/javatests/src/org/chromium/base/EarlyTraceEventTest.java ('k') | blimp/client/app/android/java/src/org/chromium/blimp/BlimpLibraryLoader.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: base/android/javatests/src/org/chromium/base/metrics/RecordHistogramTest.java

diff --git a/base/android/javatests/src/org/chromium/base/metrics/RecordHistogramTest.java b/base/android/javatests/src/org/chromium/base/metrics/RecordHistogramTest.java

index 6b1888ce59ca62cc586dfd6260b7731761a9e431..82611cdf0349cb32460fc624f89a628199373f39 100644

--- a/base/android/javatests/src/org/chromium/base/metrics/RecordHistogramTest.java

+++ b/base/android/javatests/src/org/chromium/base/metrics/RecordHistogramTest.java

@@ -4,9 +4,11 @@

package org.chromium.base.metrics;

+import android.content.Context;

import android.test.InstrumentationTestCase;

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.base.test.util.MetricsUtils.HistogramDelta;

@@ -20,8 +22,9 @@ public class RecordHistogramTest extends InstrumentationTestCase {

@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);

RecordHistogram.initialize();

}