content/public/android/javatests/src/org/chromium/content/browser/BrowserStartupControllerTest.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/public/android/javatests/src/org/chromium/content/browser/BrowserStartupControllerTest.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/public/android/java/templates/native_libraries_version.h ('k') | content/public/android/javatests/src/org/chromium/content/browser/ContentCommandLineTest.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/BrowserStartupControllerTest.java

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

index 188aa080dd5bab2e417d3ac6e0c07f64dbcb59c7..b9d9f2639b7f50a5b22ecf055309e20ab683cd2f 100644

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

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

@@ -9,10 +9,13 @@ import android.test.InstrumentationTestCase;

import android.test.suitebuilder.annotation.SmallTest;

import org.chromium.base.ThreadUtils;

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

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

import org.chromium.base.test.util.AdvancedMockContext;

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

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

+/**

+ * Test of BrowserStartupController

+ */

public class BrowserStartupControllerTest extends InstrumentationTestCase {

private TestBrowserStartupController mController;

@@ -26,7 +29,8 @@ public class BrowserStartupControllerTest extends InstrumentationTestCase {

@Override

void prepareToStartBrowserProcess(int numRenderers) throws ProcessInitException {

if (!mLibraryLoadSucceeds) {

- throw new ProcessInitException(ResultCodes.RESULT_CODE_NATIVE_LIBRARY_LOAD_FAILED);

+ throw new ProcessInitException(

+ LoaderErrors.LOADER_ERROR_NATIVE_LIBRARY_LOAD_FAILED);

}