content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java - Issue 141223002: Move the android library loader from content to base

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/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java

Issue 141223002: Move the android library loader from content to base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix final nits Created 6 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.gypi ('K') | « content/shell/android/browsertests_apk/content_browser_tests_android.cc ('k') | content/shell/android/linker_test_apk/AndroidManifest.xml » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java

diff --git a/content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java b/content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java

index be36d6e9d4f74c7511c974355294325edf94b945..f00dfd16085f6c37c8e57be49fe1b9622a945f9c 100644

--- a/content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java

+++ b/content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java

@@ -12,13 +12,16 @@ import android.view.LayoutInflater;

import android.view.View;

import org.chromium.base.JNINamespace;

-import org.chromium.content.app.LibraryLoader;

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

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

import org.chromium.content.browser.BrowserStartupController;

-import org.chromium.content.common.ProcessInitException;

import org.chromium.content_shell.ShellManager;

import org.chromium.ui.base.ActivityWindowAndroid;

import org.chromium.ui.base.WindowAndroid;

+/**

+ * Android activity for running content browser tests

+ */

@JNINamespace("content")

public class ContentBrowserTestsActivity extends Activity {

private static final String TAG = "ChromeBrowserTestsActivity";