Adds ContentShellTest.apk and very simple test.

Adds ContentShellTest.apk and very simple test.

This change does a number of things to add a ContentShellTest.apk:
- adds javatests directory with
  - AndroidManifest.xml and content_shell_test_apk.xml to make it
    possible to build ContentShellTest.apk
  - Simple test that just starts the content shell, verifies the
    activity isn't null and that the URL is set as expected.

The simple test is run directly by instruments using the following
command:
adb shell am instrument -w org.chromium.content_shell.tests/android.test.InstrumentationTestRunner

BUG=136700
TEST=


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=146435

[cjhopman, 2012-07-11 20:56:56]

tedchoc: content/shell/android
jam: content/content_shell.gypi

[Ted C, 2012-07-11 22:28:28]

http://codereview.chromium.org/10700167/diff/1/content/shell/android/javatest...
File content/shell/android/javatests/AndroidManifest.xml (right):

http://codereview.chromium.org/10700167/diff/1/content/shell/android/javatest...
content/shell/android/javatests/AndroidManifest.xml:20: <uses-permission
android:name="android.permission.ACCESS_MOCK_LOCATION" />
do we need any of the following permissions yet?

http://codereview.chromium.org/10700167/diff/1/content/shell/android/javatest...
File
content/shell/android/javatests/src/org/chromium/content_shell/ContentShellTestBase.java
(right):

http://codereview.chromium.org/10700167/diff/1/content/shell/android/javatest...
content/shell/android/javatests/src/org/chromium/content_shell/ContentShellTestBase.java:16:
public class ContentShellTestBase<T extends Activity> extends
ActivityInstrumentationTestCase2<T> {
why do we need to templatize this base activity?  Won't it always be a
ContentShellActivity?

http://codereview.chromium.org/10700167/diff/1/content/shell/android/javatest...
content/shell/android/javatests/src/org/chromium/content_shell/ContentShellTestBase.java:25:
protected Activity launchContentShellWithUrl(String url) {
Might as well just return ContentShellActivity since it's hardcoded below.

If there is some reason for allowing a template, should this return T?  Also
should you be specifying the class below as activityClass as set in the
constructor?

I still vote for removing the templating from this at all.

http://codereview.chromium.org/10700167/diff/1/content/shell/android/javatest...
File
content/shell/android/javatests/src/org/chromium/content_shell/ContentShellUrlTest.java
(right):

http://codereview.chromium.org/10700167/diff/1/content/shell/android/javatest...
content/shell/android/javatests/src/org/chromium/content_shell/ContentShellUrlTest.java:28:
assertTrue(activity instanceof ContentShellActivity);
If you change launchContentShellWithUrl to return a ContentShellActivity, this
shouldn't be necessary.

Nor the cast below.

[cjhopman, 2012-07-12 18:13:08]

http://codereview.chromium.org/10700167/diff/1/content/shell/android/javatest...
File content/shell/android/javatests/AndroidManifest.xml (right):

http://codereview.chromium.org/10700167/diff/1/content/shell/android/javatest...
content/shell/android/javatests/AndroidManifest.xml:20: <uses-permission
android:name="android.permission.ACCESS_MOCK_LOCATION" />
On 2012/07/11 22:28:28, Ted C wrote:
> do we need any of the following permissions yet?

Done.

http://codereview.chromium.org/10700167/diff/1/content/shell/android/javatest...
File
content/shell/android/javatests/src/org/chromium/content_shell/ContentShellTestBase.java
(right):

http://codereview.chromium.org/10700167/diff/1/content/shell/android/javatest...
content/shell/android/javatests/src/org/chromium/content_shell/ContentShellTestBase.java:16:
public class ContentShellTestBase<T extends Activity> extends
ActivityInstrumentationTestCase2<T> {
On 2012/07/11 22:28:28, Ted C wrote:
> why do we need to templatize this base activity?  Won't it always be a
> ContentShellActivity?

Done. I don't know why this was templatized, but I could find no need for it.

http://codereview.chromium.org/10700167/diff/1/content/shell/android/javatest...
content/shell/android/javatests/src/org/chromium/content_shell/ContentShellTestBase.java:25:
protected Activity launchContentShellWithUrl(String url) {
On 2012/07/11 22:28:28, Ted C wrote:
> Might as well just return ContentShellActivity since it's hardcoded below.
> 
> If there is some reason for allowing a template, should this return T?  Also
> should you be specifying the class below as activityClass as set in the
> constructor?
> 
> I still vote for removing the templating from this at all.

Done.

http://codereview.chromium.org/10700167/diff/1/content/shell/android/javatest...
File
content/shell/android/javatests/src/org/chromium/content_shell/ContentShellUrlTest.java
(right):

http://codereview.chromium.org/10700167/diff/1/content/shell/android/javatest...
content/shell/android/javatests/src/org/chromium/content_shell/ContentShellUrlTest.java:28:
assertTrue(activity instanceof ContentShellActivity);
On 2012/07/11 22:28:28, Ted C wrote:
> If you change launchContentShellWithUrl to return a ContentShellActivity, this
> shouldn't be necessary.
> 
> Nor the cast below.

Done.

[Ted C, 2012-07-12 18:19:28]

lgtm

Just one final thing.

http://codereview.chromium.org/10700167/diff/7001/content/content_shell.gypi
File content/content_shell.gypi (right):

http://codereview.chromium.org/10700167/diff/7001/content/content_shell.gypi#...
content/content_shell.gypi:628: '<(PRODUCT_DIR)/ContentShellTest-debug.apk',
So I just noticed this yesterday, but this is wrong here and in the above
content_shell_apk target.

The generated apk probably ends up in:
<(PRODUCT_DIR)/content_shell_test/ContentShellTest-debug.apk

[cjhopman, 2012-07-12 18:28:28]

http://codereview.chromium.org/10700167/diff/7001/content/content_shell.gypi
File content/content_shell.gypi (right):

http://codereview.chromium.org/10700167/diff/7001/content/content_shell.gypi#...
content/content_shell.gypi:628: '<(PRODUCT_DIR)/ContentShellTest-debug.apk',
On 2012/07/12 18:19:28, Ted C wrote:
> So I just noticed this yesterday, but this is wrong here and in the above
> content_shell_apk target.
> 
> The generated apk probably ends up in:
> <(PRODUCT_DIR)/content_shell_test/ContentShellTest-debug.apk

Done.

[jam, 2012-07-12 18:58:45]

lgtm

[commit-bot: I haz the power, 2012-07-12 19:01:24]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/cjhopman@chromium.org/10700167/4003

[commit-bot: I haz the power, 2012-07-12 20:28:49]

Change committed as 146435