[Android] Upstream some java test annotations.

[Android] Upstream some java test annotations.

Specifically:
- PhoneOnly
- TabletOnly
- TimeoutScale

uiautomator tests will require these annotations downstream.

BUG=

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=192379

[Yaron, 2013-04-03 14:32:37]

https://codereview.chromium.org/13494005/diff/1/base/test/android/javatests/s...
File base/test/android/javatests/src/org/chromium/base/test/util/PhoneOnly.java
(right):

https://codereview.chromium.org/13494005/diff/1/base/test/android/javatests/s...
base/test/android/javatests/src/org/chromium/base/test/util/PhoneOnly.java:5:
package org.chromium.base.test.util;
Seems like PhoneOnly and TabletOnly should be in the content test util package
and not base.

[frankf, 2013-04-03 18:02:53]

I think our intense negotiations over where things should live resulted in:

"Test utilities that are pure Java and do not depend on content or other
Chromium code should live in:
base/test/android/javatests/src/org/chromium/base/test/util"

From:

http://www.chromium.org/developers/testing/android-tests


On 2013/04/03 14:32:37, Yaron wrote:
>
https://codereview.chromium.org/13494005/diff/1/base/test/android/javatests/s...
> File
base/test/android/javatests/src/org/chromium/base/test/util/PhoneOnly.java
> (right):
> 
>
https://codereview.chromium.org/13494005/diff/1/base/test/android/javatests/s...
> base/test/android/javatests/src/org/chromium/base/test/util/PhoneOnly.java:5:
> package org.chromium.base.test.util;
> Seems like PhoneOnly and TabletOnly should be in the content test util package
> and not base.

[Yaron, 2013-04-03 21:37:55]

It still doesn't really make sense to be in base as you should not have a test
below content that has a notion of phone or tablet. I still think it should live
in content but it's not really worth arguing so I'll give you a rubberstamp lgtm

[frankf, 2013-04-03 22:11:23]

On 2013/04/03 22:09:43, frankf wrote:

I'm impartial as well. The important thing is to have consistent documentation,
since confusion over where to put things have come up several times now. 

@karin, I think you wrote that doc, can you chime in? Is
content/public/test/android/javatests/src/org/chromium/content/browser/test/util
more appropriate?

[klundberg, 2013-04-03 22:19:30]

On 2013/04/03 22:11:23, frankf wrote:
> On 2013/04/03 22:09:43, frankf wrote:
> 
> I'm impartial as well. The important thing is to have consistent
documentation,
> since confusion over where to put things have come up several times now. 
> 
> @karin, I think you wrote that doc, can you chime in? Is
>
content/public/test/android/javatests/src/org/chromium/content/browser/test/util
> more appropriate?

When I wrote the document, I discussed location of test utils with several
people and the general agreement was that utilities that are not specific to
content should be in base. 

In this specific case, the annotations are not specific to content although I
understand Yaron's comment that we probably won't have tests below content that
are specific to table or phone.  However, several of the other annotations are
useful for tests outside of content and IMHO, that is enough of a reason to have
these annotations in base as well as it would easily be confusing to have some
annotations in base and some in content.

[frankf, 2013-04-04 18:37:41]

Committed patchset #1 manually as r192379 (presubmit successful).