Upstream JavaBridge tests.

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..844ced7e7c170da269083974045cd07cead69b8f 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
@@ -9,6 +9,15 @@ import android.content.Intent;
 import android.net.Uri;
 import android.test.ActivityInstrumentationTestCase2;
 
+import org.chromium.content.browser.ContentView;

[Yaron, 2012/09/20 04:13:53]

It doesn't seem like any of these new imports are necessary. Please remove.

+import org.chromium.content.browser.ContentViewClient;
+import org.chromium.content.browser.LoadUrlParams;
+import org.chromium.content.browser.test.TestContentViewClient;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
 /**
  * Base test class for all ContentShell based tests.
  */
@@ -28,6 +37,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();
     }
 }