Add support for the ChromiumTestShellTest APK.

chrome/android/testshell/javatests/src/org/chromium/chrome/testshell/ChromiumTestShellTestBase.java

Index: chrome/android/testshell/javatests/src/org/chromium/chrome/testshell/ChromiumTestShellTestBase.java
diff --git a/content/shell/android/javatests/src/org/chromium/content_shell/ContentShellTestBase.java b/chrome/android/testshell/javatests/src/org/chromium/chrome/testshell/ChromiumTestShellTestBase.java
similarity index 53%
copy from content/shell/android/javatests/src/org/chromium/content_shell/ContentShellTestBase.java
copy to chrome/android/testshell/javatests/src/org/chromium/chrome/testshell/ChromiumTestShellTestBase.java
index 59a6f7de77f2aa3e3706a1cba51c6b2734ff0910..3bffb428b2671c181ac27aa141f5a8a108b6961a 100644
--- a/content/shell/android/javatests/src/org/chromium/content_shell/ContentShellTestBase.java
+++ b/chrome/android/testshell/javatests/src/org/chromium/chrome/testshell/ChromiumTestShellTestBase.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.chrome.testshell;
 
 import android.content.ComponentName;
 import android.content.Intent;
@@ -10,24 +10,26 @@ import android.net.Uri;
 import android.test.ActivityInstrumentationTestCase2;
 
 /**
- * Base test class for all ContentShell based tests.
+ * Base test class for all ChromiumTestShell based tests.
  */
-public class ContentShellTestBase extends ActivityInstrumentationTestCase2<ContentShellActivity> {
+public class ChromiumTestShellTestBase extends
+        ActivityInstrumentationTestCase2<ChromiumTestShellActivity> {
 
-    public ContentShellTestBase() {
-        super(ContentShellActivity.class);
+    public ChromiumTestShellTestBase() {
+        super(ChromiumTestShellActivity.class);
     }
 
     /**
-     * Starts the ContentShell activity and loads the given URL.
+     * Starts the ChromiumTestShell activity and loads the given URL.
      */
-    protected ContentShellActivity launchContentShellWithUrl(String url) {
+    protected ChromiumTestShellActivity launchChromiumTestShellWithUrl(String url) {
         Intent intent = new Intent(Intent.ACTION_MAIN);
         intent.addCategory(Intent.CATEGORY_LAUNCHER);
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         intent.setData(Uri.parse(url));
         intent.setComponent(new ComponentName(getInstrumentation().getTargetContext(),
-              ContentShellActivity.class));
-        return (ContentShellActivity) getInstrumentation().startActivitySync(intent);
+                ChromiumTestShellActivity.class));
+        setActivityIntent(intent);
+        return getActivity();
     }
 }