Add apk for running content_browsertests

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

Index: content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java
diff --git a/content/shell/android/java/src/org/chromium/content_shell/ContentShellActivity.java b/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java
similarity index 97%
rename from content/shell/android/java/src/org/chromium/content_shell/ContentShellActivity.java
rename to content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java
index cd3e546e35c5da3122ba26f3338fd8b96b881529..0ce99d846eda50bd36724d435ee6b7f30cba2bab 100644
--- a/content/shell/android/java/src/org/chromium/content_shell/ContentShellActivity.java
+++ b/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.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_shell_apk;
 
 import android.app.Activity;
 import android.content.BroadcastReceiver;
@@ -23,6 +23,8 @@ import org.chromium.content.browser.DeviceUtils;
 import org.chromium.content.browser.TracingIntentHandler;
 import org.chromium.content.common.CommandLine;
 import org.chromium.content.common.ProcessInitException;
+import org.chromium.content_shell.Shell;
+import org.chromium.content_shell.ShellManager;
 import org.chromium.ui.gfx.ActivityNativeWindow;
 
 /**
@@ -38,7 +40,6 @@ public class ContentShellActivity extends ChromiumActivity {
             "org.chromium.content_shell.action.PROFILE_START";
     private static final String ACTION_STOP_TRACE =
             "org.chromium.content_shell.action.PROFILE_STOP";
-    public static final String DEFAULT_SHELL_URL = "http://www.google.com";
     public static final String COMMAND_LINE_ARGS_KEY = "commandLineArgs";
 
     private ShellManager mShellManager;
@@ -76,7 +77,7 @@ public class ContentShellActivity extends ChromiumActivity {
                 mShellManager.setStartupUrl(Shell.sanitizeUrl(startupUrl));
             }
             if (!ContentView.enableMultiProcess(this, ContentView.MAX_RENDERERS_AUTOMATIC)) {
-                String shellUrl = DEFAULT_SHELL_URL;
+                String shellUrl = ShellManager.DEFAULT_SHELL_URL;
                 if (savedInstanceState != null
                     && savedInstanceState.containsKey(ACTIVE_SHELL_URL_KEY)) {
                     shellUrl = savedInstanceState.getString(ACTIVE_SHELL_URL_KEY);