content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java - Issue 2632043002: Create ContentShellActivityTestRule and BaseJUnitRunner

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/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java

Issue 2632043002: Create ContentShellActivityTestRule and BaseJUnitRunner (Closed)

Patch Set: Make apis public and change year Created 3 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

« content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellActivityTestRule.java ('K') | « content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellShellManagementTest.java ('k') | tools/android/eclipse/.classpath » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java

diff --git a/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java b/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java

index d7a2eb57c189d9d68e615a0c003a519ed22c02ec..ea43df3cb4513acaea2b141925c12b69b5594b9a 100644

--- a/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java

+++ b/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java

@@ -8,12 +8,12 @@ import android.app.Activity;

import android.content.Intent;

import android.os.Bundle;

import android.text.TextUtils;

-import android.util.Log;

import android.view.KeyEvent;

import android.widget.Toast;

import org.chromium.base.BaseSwitches;

import org.chromium.base.CommandLine;

+import org.chromium.base.Log;

import org.chromium.base.MemoryPressureListener;

import org.chromium.base.annotations.SuppressFBWarnings;

import org.chromium.base.library_loader.LibraryLoader;