content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsApplication.java - Issue 12091033: Relanding "Add apk for running content_browsertests"

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/ContentBrowserTestsApplication.java

Issue 12091033: Relanding "Add apk for running content_browsertests" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase Created 7 years, 11 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 | « content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java ('k') | content/shell/android/java/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/ContentBrowserTestsApplication.java

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

similarity index 71%

copy from content/shell/android/java/src/org/chromium/content_shell/ContentShellApplication.java

copy to content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsApplication.java

index 16f7c51c0994fb638f4ea5eab3a948fdd8bb5686..315a17e9371cc43c9c2558c7c3833fc426969937 100644

--- a/content/shell/android/java/src/org/chromium/content_shell/ContentShellApplication.java

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

@@ -2,7 +2,7 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-package org.chromium.content_shell;

+package org.chromium.content_browsertests_apk;

import android.app.Application;

@@ -10,13 +10,9 @@ import org.chromium.base.PathUtils;

import org.chromium.content.app.LibraryLoader;

import org.chromium.content.browser.ResourceExtractor;

-/**

- * Entry point for the content shell application. Handles initialization of information that needs

- * to be shared across the main activity and the sandbox services created.

- */

-public class ContentShellApplication extends Application {

+public class ContentBrowserTestsApplication extends Application {

- private static final String NATIVE_LIBRARY = "content_shell_content_view";

+ private static final String NATIVE_LIBRARY = "content_browsertests";

private static final String[] MANDATORY_PAK_FILES = new String[] {"content_shell.pak"};

private static final String PRIVATE_DATA_DIRECTORY_SUFFIX = "content_shell";