Add support for the ChromiumTestShellTest APK.

content/shell/android/javatests/src/org/chromium/content_shell/ContentShellTestBase.java

Index: content/shell/android/javatests/src/org/chromium/content_shell/ContentShellTestBase.java
diff --git a/content/shell/android/javatests/src/org/chromium/content_shell/ContentShellTestBase.java b/content/shell/android/javatests/src/org/chromium/content_shell/ContentShellTestBase.java
index 59a6f7de77f2aa3e3706a1cba51c6b2734ff0910..7dd3061dfe4e3caff244eaf4d5a40f46f3dc46c4 100644
--- a/content/shell/android/javatests/src/org/chromium/content_shell/ContentShellTestBase.java
+++ b/content/shell/android/javatests/src/org/chromium/content_shell/ContentShellTestBase.java
@@ -28,6 +28,7 @@ public class ContentShellTestBase extends ActivityInstrumentationTestCase2<Conte
         intent.setData(Uri.parse(url));
         intent.setComponent(new ComponentName(getInstrumentation().getTargetContext(),
               ContentShellActivity.class));
-        return (ContentShellActivity) getInstrumentation().startActivitySync(intent);
+        setActivityIntent(intent);
+        return getActivity();
     }
 }