diff options
| author | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-26 19:20:40 +0000 |
|---|---|---|
| committer | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-26 19:20:40 +0000 |
| commit | 2049b6b9cedf6b4434c7a222534c2c53a97e6ca9 (patch) | |
| tree | 1ba33db303d4d5b9cc55498654e9f88ece31f09e /content/shell/android | |
| parent | ea2110d9259548d50bfdf6757e56471cef488995 (diff) | |
| download | chromium_src-2049b6b9cedf6b4434c7a222534c2c53a97e6ca9.zip chromium_src-2049b6b9cedf6b4434c7a222534c2c53a97e6ca9.tar.gz chromium_src-2049b6b9cedf6b4434c7a222534c2c53a97e6ca9.tar.bz2 | |
Move CommandLineTest to ContentShell and remove FlakyTest annotation.
Successfully passed 30/30
BUG=147997
NOTRY=true
Review URL: https://chromiumcodereview.appspot.com/11417132
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169458 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell/android')
| -rw-r--r-- | content/shell/android/java/src/org/chromium/content_shell/ContentShellActivity.java | 2 | ||||
| -rw-r--r-- | content/shell/android/java/src/org/chromium/content_shell/ContentShellApplication.java | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/content/shell/android/java/src/org/chromium/content_shell/ContentShellActivity.java b/content/shell/android/java/src/org/chromium/content_shell/ContentShellActivity.java index f1ebf5b..00cd670 100644 --- a/content/shell/android/java/src/org/chromium/content_shell/ContentShellActivity.java +++ b/content/shell/android/java/src/org/chromium/content_shell/ContentShellActivity.java @@ -24,7 +24,7 @@ import org.chromium.ui.gfx.ActivityNativeWindow; */ public class ContentShellActivity extends Activity { - private static final String COMMAND_LINE_FILE = "/data/local/tmp/content-shell-command-line"; + public static final String COMMAND_LINE_FILE = "/data/local/tmp/content-shell-command-line"; private static final String TAG = ContentShellActivity.class.getName(); private static final String ACTIVE_SHELL_URL_KEY = "activeUrl"; diff --git a/content/shell/android/java/src/org/chromium/content_shell/ContentShellApplication.java b/content/shell/android/java/src/org/chromium/content_shell/ContentShellApplication.java index 1cb6cb9..16f7c51 100644 --- a/content/shell/android/java/src/org/chromium/content_shell/ContentShellApplication.java +++ b/content/shell/android/java/src/org/chromium/content_shell/ContentShellApplication.java @@ -23,6 +23,10 @@ public class ContentShellApplication extends Application { @Override public void onCreate() { super.onCreate(); + initializeApplicationParameters(); + } + + public static void initializeApplicationParameters() { ResourceExtractor.setMandatoryPaksToExtract(MANDATORY_PAK_FILES); LibraryLoader.setLibraryToLoad(NATIVE_LIBRARY); PathUtils.setPrivateDataDirectorySuffix(PRIVATE_DATA_DIRECTORY_SUFFIX); |