chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.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: chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java

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

Patch Set: Fix per review. Created 4 years, 3 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 | « chrome/android/java/src/org/chromium/chrome/browser/init/NativeInitializationController.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabsConnectionTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java

index f9af63a3514859db30cd3c3775d7e2c1801f4727..c8721de4045c33eef35ed2571d5648ec0900c3ed 100644

--- a/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java

+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java

@@ -115,14 +115,13 @@ public class CustomTabActivityTest extends CustomTabActivityTestBase {

@Override

protected void setUp() throws Exception {

super.setUp();

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

mTestServer = EmbeddedTestServer.createAndStartFileServer(

- getInstrumentation().getContext(), Environment.getExternalStorageDirectory());

+ appContext, Environment.getExternalStorageDirectory());

mTestPage = mTestServer.getURL(TEST_PAGE);

mTestPage2 = mTestServer.getURL(TEST_PAGE_2);

- PathUtils.setPrivateDataDirectorySuffix(PRIVATE_DATA_DIRECTORY_SUFFIX,

- getInstrumentation().getTargetContext().getApplicationContext());

- LibraryLoader.get(LibraryProcessType.PROCESS_BROWSER)

- .ensureInitialized(getInstrumentation().getTargetContext().getApplicationContext());

+ PathUtils.setPrivateDataDirectorySuffix(PRIVATE_DATA_DIRECTORY_SUFFIX, appContext);

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

}

@Override

@@ -165,7 +164,7 @@ public class CustomTabActivityTest extends CustomTabActivityTestBase {

private PendingIntent addMenuEntriesToIntent(Intent intent, int numEntries) {

PendingIntent pi = PendingIntent.getBroadcast(getInstrumentation().getTargetContext(), 0,

new Intent(), 0);

- ArrayList<Bundle> menuItems = new ArrayList<Bundle>();

+ ArrayList<Bundle> menuItems = new ArrayList<>();

for (int i = 0; i < numEntries; i++) {

Bundle bundle = new Bundle();

bundle.putString(CustomTabsIntent.KEY_MENU_ITEM_TITLE, TEST_MENU_TITLE);