chrome/android/shell/javatests/src/org/chromium/chrome/shell/ChromeShellTestBase.java - Issue 1060373004: Add SyncCustomizationFragmentTest.

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/shell/javatests/src/org/chromium/chrome/shell/ChromeShellTestBase.java

Issue 1060373004: Add SyncCustomizationFragmentTest. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Use better start browser function. Created 5 years, 8 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/shell/java/src/org/chromium/chrome/shell/TabManager.java ('k') | chrome/android/sync_shell/java/AndroidManifest.xml.jinja2 » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/shell/javatests/src/org/chromium/chrome/shell/ChromeShellTestBase.java

diff --git a/chrome/android/shell/javatests/src/org/chromium/chrome/shell/ChromeShellTestBase.java b/chrome/android/shell/javatests/src/org/chromium/chrome/shell/ChromeShellTestBase.java

index 36591786ddccb4cb2371b4540eedc21401978c79..54515f4d26a0248af3ec4cdd037e69b316405fd3 100644

--- a/chrome/android/shell/javatests/src/org/chromium/chrome/shell/ChromeShellTestBase.java

+++ b/chrome/android/shell/javatests/src/org/chromium/chrome/shell/ChromeShellTestBase.java

@@ -13,14 +13,11 @@ import android.net.Uri;

import android.text.TextUtils;

import android.util.Log;

-import org.chromium.base.CommandLine;

import org.chromium.base.ThreadUtils;

-import org.chromium.base.library_loader.LibraryProcessType;

import org.chromium.base.library_loader.ProcessInitException;

import org.chromium.base.test.BaseActivityInstrumentationTestCase;

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

import org.chromium.chrome.test.util.ApplicationData;

-import org.chromium.content.browser.BrowserStartupController;

import org.chromium.content.browser.test.util.Criteria;

import org.chromium.content.browser.test.util.CriteriaHelper;

import org.chromium.content.common.ContentSwitches;

@@ -41,17 +38,15 @@ public class ChromeShellTestBase extends BaseActivityInstrumentationTestCase<Chr

super(ChromeShellActivity.class);

}

- protected static void startChromeBrowserProcessSync(final Context targetContext) {

+ protected static void startChromeBrowserProcessSync(final Context context) {

ThreadUtils.runOnUiThreadBlocking(new Runnable() {

@Override

public void run() {

- CommandLine.initFromFile("/data/local/tmp/chrome-shell-command-line");

try {

- BrowserStartupController.get(targetContext, LibraryProcessType.PROCESS_BROWSER)

- .startBrowserProcessesSync(false);

+ ((ChromeShellApplication) context.getApplicationContext())

+ .startBrowserProcessesAndLoadLibrariesSync(context, true);

} catch (ProcessInitException e) {

Log.e(TAG, "Unable to load native library.", e);

- fail("Unable to load native library");

}

});