Add DisableIf annotation to EME test

Add DisableIf annotation to EME test

EME test does not pass on AOSP Android, therefore, add DisableIf annotation to
it (from BaseInstrumentationTestRunner)

Reorganized BaseInstrumentationTestRunner so it doesn't include anything
unrelated to WebViewLayout Testing.

BUG=607350
Committed: https://crrev.com/ea1675fb67d48828efb8c6b168582aa9f33388a2
Cr-Commit-Position: refs/heads/master@{#398659}

[Yoland Yan(Google), 2016-05-04 02:32:26]

yolandyan@google.com changed reviewers:
+ jbudorick@chromium.org, mikecase@chromium.org, timvolodine@chromium.org

[Yoland Yan(Google), 2016-05-04 02:32:27]

EME test does not pass on AOSP Android, therefore, add DisableIf annotation to
it (from BaseInstrumentationTestRunner)

Reorganized BaseInstrumentationTestRunner so it doesn't include anything
unrelated to WebViewLayout Testing.

[Yoland Yan(Google), 2016-05-04 02:32:41]

Description was changed from

==========
Add DisableIf annotation to EME test

BUG=607350
==========

to

==========
Add DisableIf annotation to EME test

EME test does not pass on AOSP Android, therefore, add DisableIf annotation to
it (from BaseInstrumentationTestRunner)

Reorganized BaseInstrumentationTestRunner so it doesn't include anything
unrelated to WebViewLayout Testing.

BUG=607350
==========

[Yoland Yan(Google), 2016-05-04 02:37:56]

On 2016/05/04 02:32:27, yolandyan wrote:
> EME test does not pass on AOSP Android, therefore, add DisableIf annotation to
> it (from BaseInstrumentationTestRunner)
> 
> Reorganized BaseInstrumentationTestRunner so it doesn't include anything
> unrelated to WebViewLayout Testing.

Anything that previously uses BaseInstrumentationTestRunner
https://code.google.com/p/chromium/codesearch#search/&q=BaseInstrumentationTe...

[Yoland Yan(Google), 2016-05-04 02:42:12]

On 2016/05/04 02:37:56, yolandyan wrote:
> On 2016/05/04 02:32:27, yolandyan wrote:
> > EME test does not pass on AOSP Android, therefore, add DisableIf annotation
to
> > it (from BaseInstrumentationTestRunner)
> > 
> > Reorganized BaseInstrumentationTestRunner so it doesn't include anything
> > unrelated to WebViewLayout Testing.
> 
> Anything that previously uses BaseInstrumentationTestRunner
>
https://code.google.com/p/chromium/codesearch#search/&q=BaseInstrumentationTe...

Result:
$ out-gn/Debug/bin/run_system_webview_shell_layout_test_apk --num-retries 0
W    0.055s Main  Unable to find package info for
org.chromium.webview_shell.test
E    2.100s individual_device_set_up(ZX1G22JFG3)  Couldn't set debug app: no
package info
E    3.118s individual_device_set_up(ZX1G22JFG3)  Couldn't set flags: no package
info
C   43.805s Main 
********************************************************************************
C   43.805s Main  Summary
C   43.805s Main 
********************************************************************************
C   43.805s Main  [==========] 12 tests ran.
C   43.805s Main  [  PASSED  ] 11 tests.
C   43.805s Main  [  SKIPPED ] Skipped 1 test, listed below:
C   43.805s Main  [  SKIPPED ]
org.chromium.webview_shell.test.WebViewLayoutTest#testEMEPermission
C   43.805s Main 
********************************************************************************

[Yoland Yan(Google), 2016-05-04 03:00:58]

https://codereview.chromium.org/1952573002/diff/20001/base/test/android/javat...
File
base/test/android/javatests/src/org/chromium/base/test/BaseChromiumInstrumentationTestRunner.java
(right):

https://codereview.chromium.org/1952573002/diff/20001/base/test/android/javat...
base/test/android/javatests/src/org/chromium/base/test/BaseChromiumInstrumentationTestRunner.java:21:
private static final String TAG = "base_chromium_test";
No sure why this TAG is needed?

[jbudorick, 2016-05-04 13:41:32]

https://codereview.chromium.org/1952573002/diff/40001/base/BUILD.gn
File base/BUILD.gn (right):

https://codereview.chromium.org/1952573002/diff/40001/base/BUILD.gn#newcode2267
base/BUILD.gn:2267:
"test/android/javatests/src/org/chromium/base/test/BaseChromiumInstrumentationTestRunner.java",
alphabetize

https://codereview.chromium.org/1952573002/diff/40001/base/test/android/javat...
File
base/test/android/javatests/src/org/chromium/base/test/BaseChromiumInstrumentationTestRunner.java
(right):

https://codereview.chromium.org/1952573002/diff/40001/base/test/android/javat...
base/test/android/javatests/src/org/chromium/base/test/BaseChromiumInstrumentationTestRunner.java:1:
// Copyright 2016 The Chromium Authors. All rights reserved.
Next time you upload, to so with --no-find-copies

https://codereview.chromium.org/1952573002/diff/40001/base/test/android/javat...
base/test/android/javatests/src/org/chromium/base/test/BaseChromiumInstrumentationTestRunner.java:21:
private static final String TAG = "base_chromium_test";
Remove this.

https://codereview.chromium.org/1952573002/diff/40001/base/test/android/javat...
base/test/android/javatests/src/org/chromium/base/test/BaseChromiumInstrumentationTestRunner.java:43:
public Context getTargetContext() {
I don't think this function should be in here.

https://codereview.chromium.org/1952573002/diff/40001/base/test/android/javat...
File
base/test/android/javatests/src/org/chromium/base/test/BaseInstrumentationTestRunner.java
(right):

https://codereview.chromium.org/1952573002/diff/40001/base/test/android/javat...
base/test/android/javatests/src/org/chromium/base/test/BaseInstrumentationTestRunner.java:1:
// Copyright 2016 The Chromium Authors. All rights reserved.
Please don't change the copyright year for files you're modifying.

[Yoland Yan(Google), 2016-05-04 17:08:18]

https://codereview.chromium.org/1952573002/diff/40001/base/BUILD.gn
File base/BUILD.gn (right):

https://codereview.chromium.org/1952573002/diff/40001/base/BUILD.gn#newcode2267
base/BUILD.gn:2267:
"test/android/javatests/src/org/chromium/base/test/BaseChromiumInstrumentationTestRunner.java",
On 2016/05/04 13:41:31, jbudorick wrote:
> alphabetize

Done.

https://codereview.chromium.org/1952573002/diff/40001/base/test/android/javat...
File
base/test/android/javatests/src/org/chromium/base/test/BaseChromiumInstrumentationTestRunner.java
(right):

https://codereview.chromium.org/1952573002/diff/40001/base/test/android/javat...
base/test/android/javatests/src/org/chromium/base/test/BaseChromiumInstrumentationTestRunner.java:1:
// Copyright 2016 The Chromium Authors. All rights reserved.
On 2016/05/04 13:41:31, jbudorick wrote:
> Next time you upload, to so with --no-find-copies

Done.

https://codereview.chromium.org/1952573002/diff/40001/base/test/android/javat...
base/test/android/javatests/src/org/chromium/base/test/BaseChromiumInstrumentationTestRunner.java:21:
private static final String TAG = "base_chromium_test";
On 2016/05/04 13:41:31, jbudorick wrote:
> Remove this.

Done.

https://codereview.chromium.org/1952573002/diff/40001/base/test/android/javat...
base/test/android/javatests/src/org/chromium/base/test/BaseChromiumInstrumentationTestRunner.java:43:
public Context getTargetContext() {
On 2016/05/04 13:41:31, jbudorick wrote:
> I don't think this function should be in here.

Done.

https://codereview.chromium.org/1952573002/diff/40001/base/test/android/javat...
File
base/test/android/javatests/src/org/chromium/base/test/BaseInstrumentationTestRunner.java
(right):

https://codereview.chromium.org/1952573002/diff/40001/base/test/android/javat...
base/test/android/javatests/src/org/chromium/base/test/BaseInstrumentationTestRunner.java:1:
// Copyright 2016 The Chromium Authors. All rights reserved.
On 2016/05/04 13:41:31, jbudorick wrote:
> Please don't change the copyright year for files you're modifying.

Done.

[Yoland Yan(Google), 2016-05-04 17:08:19]

https://codereview.chromium.org/1952573002/diff/40001/base/BUILD.gn
File base/BUILD.gn (right):

https://codereview.chromium.org/1952573002/diff/40001/base/BUILD.gn#newcode2267
base/BUILD.gn:2267:
"test/android/javatests/src/org/chromium/base/test/BaseChromiumInstrumentationTestRunner.java",
On 2016/05/04 13:41:31, jbudorick wrote:
> alphabetize

Done.

https://codereview.chromium.org/1952573002/diff/40001/base/test/android/javat...
File
base/test/android/javatests/src/org/chromium/base/test/BaseChromiumInstrumentationTestRunner.java
(right):

https://codereview.chromium.org/1952573002/diff/40001/base/test/android/javat...
base/test/android/javatests/src/org/chromium/base/test/BaseChromiumInstrumentationTestRunner.java:1:
// Copyright 2016 The Chromium Authors. All rights reserved.
On 2016/05/04 13:41:31, jbudorick wrote:
> Next time you upload, to so with --no-find-copies

Done.

https://codereview.chromium.org/1952573002/diff/40001/base/test/android/javat...
base/test/android/javatests/src/org/chromium/base/test/BaseChromiumInstrumentationTestRunner.java:21:
private static final String TAG = "base_chromium_test";
On 2016/05/04 13:41:31, jbudorick wrote:
> Remove this.

Done.

https://codereview.chromium.org/1952573002/diff/40001/base/test/android/javat...
base/test/android/javatests/src/org/chromium/base/test/BaseChromiumInstrumentationTestRunner.java:43:
public Context getTargetContext() {
On 2016/05/04 13:41:31, jbudorick wrote:
> I don't think this function should be in here.

Done.

https://codereview.chromium.org/1952573002/diff/40001/base/test/android/javat...
File
base/test/android/javatests/src/org/chromium/base/test/BaseInstrumentationTestRunner.java
(right):

https://codereview.chromium.org/1952573002/diff/40001/base/test/android/javat...
base/test/android/javatests/src/org/chromium/base/test/BaseInstrumentationTestRunner.java:1:
// Copyright 2016 The Chromium Authors. All rights reserved.
On 2016/05/04 13:41:31, jbudorick wrote:
> Please don't change the copyright year for files you're modifying.

Done.

[timvolodine, 2016-05-05 14:21:51]

https://codereview.chromium.org/1952573002/diff/80001/base/test/android/javat...
File
base/test/android/javatests/src/org/chromium/base/test/BaseChromiumInstrumentationTestRunner.java
(right):

https://codereview.chromium.org/1952573002/diff/80001/base/test/android/javat...
base/test/android/javatests/src/org/chromium/base/test/BaseChromiumInstrumentationTestRunner.java:16:
public class BaseChromiumInstrumentationTestRunner extends
BaseInstrumentationTestRunner {
what is the rationale for adding this extra class? it doesn't seem to carry any
new functionality.

also, in the class javadoc it has the same description as
BaseInstrumentationtestRunner

[Yoland Yan(Google), 2016-05-06 17:28:07]

https://codereview.chromium.org/1952573002/diff/80001/base/test/android/javat...
File
base/test/android/javatests/src/org/chromium/base/test/BaseChromiumInstrumentationTestRunner.java
(right):

https://codereview.chromium.org/1952573002/diff/80001/base/test/android/javat...
base/test/android/javatests/src/org/chromium/base/test/BaseChromiumInstrumentationTestRunner.java:16:
public class BaseChromiumInstrumentationTestRunner extends
BaseInstrumentationTestRunner {
On 2016/05/05 14:21:51, timvolodine wrote:
> what is the rationale for adding this extra class? it doesn't seem to carry
any
> new functionality.
> 
> also, in the class javadoc it has the same description as
> BaseInstrumentationtestRunner

Will change the description.

This class is created so anything related to BaseChromiumApplication is done in
BaseChromiumInstrumentationTestRunner. So that WebViewLayoutTestRunner can
extend BaseInstrumentationTestRunner for the TestHooks.

This happened last year too in this CL
https://codereview.chromium.org/1410023002/.

[jbudorick, 2016-05-09 18:14:00]

lgtm

[Yoland Yan(Google), 2016-06-06 21:18:51]

+timevolodine, This CL rebased, should be ready :)

[timvolodine, 2016-06-07 14:08:58]

lgtm thanks!

[Yoland Yan(Google), 2016-06-07 20:27:21]

The CQ bit was checked by yolandyan@google.com

[Yoland Yan(Google), 2016-06-07 20:27:22]

The patchset sent to the CQ was uploaded after l-g-t-m from
jbudorick@chromium.org
Link to the patchset: https://codereview.chromium.org/1952573002/#ps120001
(title: "Rebase")

[commit-bot: I haz the power, 2016-06-07 20:32:19]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1952573002/120001

[commit-bot: I haz the power, 2016-06-07 21:05:20]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-06-07 21:05:21]

Try jobs failed on following builders:
  android_arm64_dbg_recipe on tryserver.chromium.android (JOB_FAILED,
https://build.chromium.org/p/tryserver.chromium.android/builders/android_arm6...)
  android_clang_dbg_recipe on tryserver.chromium.android (JOB_FAILED,
https://build.chromium.org/p/tryserver.chromium.android/builders/android_clan...)
  android_compile_dbg on tryserver.chromium.android (JOB_FAILED,
https://build.chromium.org/p/tryserver.chromium.android/builders/android_comp...)
  cast_shell_android on tryserver.chromium.android (JOB_FAILED,
https://build.chromium.org/p/tryserver.chromium.android/builders/cast_shell_a...)
  linux_android_rel_ng on tryserver.chromium.android (JOB_FAILED,
https://build.chromium.org/p/tryserver.chromium.android/builders/linux_androi...)
  cast_shell_linux on tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/cast_shell_linu...)
  chromeos_amd64-generic_chromium_compile_only_ng on tryserver.chromium.linux
(JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/chromeos_amd64-...)
  chromeos_daisy_chromium_compile_only_ng on tryserver.chromium.linux
(JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/chromeos_daisy_...)
  chromeos_x86-generic_chromium_compile_only_ng on tryserver.chromium.linux
(JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/chromeos_x86-ge...)
  chromium_presubmit on tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/chromium_presub...)
  linux_chromium_asan_rel_ng on tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)
  linux_chromium_chromeos_compile_dbg_ng on tryserver.chromium.linux
(JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)
  linux_chromium_chromeos_ozone_rel_ng on tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)
  linux_chromium_chromeos_rel_ng on tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)
  linux_chromium_clobber_rel_ng on tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)
  linux_chromium_compile_dbg_ng on tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)
  linux_chromium_gn_chromeos_rel on tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)
  linux_chromium_rel_ng on tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)
  ios-device on tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios-device/builds...)
  ios-device-gn on tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios-device-gn/bui...)
  ios-simulator on tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios-simulator/bui...)
  ios-simulator-gn on tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios-simulator-gn/...)
  mac_chromium_compile_dbg_ng on tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_comp...)
  mac_chromium_gn_rel on tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_gn_r...)
  mac_chromium_rel_ng on tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_rel_...)
  win8_chromium_ng on tryserver.chromium.win (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.win/builders/win8_chromium_ng/...)
  win_chromium_compile_dbg_ng on tryserver.chromium.win (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_comp...)
  win_chromium_rel_ng on tryserver.chromium.win (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_rel_...)
  win_chromium_x64_rel_ng on tryserver.chromium.win (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_x64_...)
  win_clang on tryserver.chromium.win (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.win/builders/win_clang/builds/...)

[the real yoland, 2016-06-07 21:36:51]

The CQ bit was checked by yolandyan@chromium.org

[the real yoland, 2016-06-07 21:36:52]

The patchset sent to the CQ was uploaded after l-g-t-m from
jbudorick@chromium.org, timvolodine@chromium.org
Link to the patchset: https://codereview.chromium.org/1952573002/#ps140001
(title: "Rebase")

[commit-bot: I haz the power, 2016-06-07 21:38:05]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1952573002/140001

[commit-bot: I haz the power, 2016-06-07 22:37:37]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-06-07 22:37:38]

Try jobs failed on following builders:
  linux_android_rel_ng on tryserver.chromium.android (JOB_FAILED,
https://build.chromium.org/p/tryserver.chromium.android/builders/linux_androi...)

[Yoland Yan(Google), 2016-06-08 19:00:25]

The CQ bit was checked by yolandyan@google.com

[Yoland Yan(Google), 2016-06-08 19:00:26]

The patchset sent to the CQ was uploaded after l-g-t-m from
jbudorick@chromium.org, timvolodine@chromium.org
Link to the patchset: https://codereview.chromium.org/1952573002/#ps160001
(title: "Rebase...I am getting trolled")

[commit-bot: I haz the power, 2016-06-08 19:01:05]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1952573002/160001

[commit-bot: I haz the power, 2016-06-08 19:05:33]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-06-08 19:05:35]

Try jobs failed on following builders:
  ios-device on tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios-device/builds...)
  ios-device-gn on tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios-device-gn/bui...)
  ios-simulator on tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios-simulator/bui...)
  ios-simulator-gn on tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios-simulator-gn/...)

[Yoland Yan(Google), 2016-06-08 19:10:28]

The CQ bit was checked by yolandyan@google.com

[Yoland Yan(Google), 2016-06-08 19:10:29]

The patchset sent to the CQ was uploaded after l-g-t-m from
jbudorick@chromium.org, timvolodine@chromium.org
Link to the patchset: https://codereview.chromium.org/1952573002/#ps180001
(title: "More rebase")

[commit-bot: I haz the power, 2016-06-08 19:10:52]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1952573002/180001

[commit-bot: I haz the power, 2016-06-08 20:28:50]

Description was changed from

==========
Add DisableIf annotation to EME test

EME test does not pass on AOSP Android, therefore, add DisableIf annotation to
it (from BaseInstrumentationTestRunner)

Reorganized BaseInstrumentationTestRunner so it doesn't include anything
unrelated to WebViewLayout Testing.

BUG=607350
==========

to

==========
Add DisableIf annotation to EME test

EME test does not pass on AOSP Android, therefore, add DisableIf annotation to
it (from BaseInstrumentationTestRunner)

Reorganized BaseInstrumentationTestRunner so it doesn't include anything
unrelated to WebViewLayout Testing.

BUG=607350
==========

[commit-bot: I haz the power, 2016-06-08 20:28:53]

Committed patchset #10 (id:180001)

[commit-bot: I haz the power, 2016-06-08 20:30:41]

Description was changed from

==========
Add DisableIf annotation to EME test

EME test does not pass on AOSP Android, therefore, add DisableIf annotation to
it (from BaseInstrumentationTestRunner)

Reorganized BaseInstrumentationTestRunner so it doesn't include anything
unrelated to WebViewLayout Testing.

BUG=607350
==========

to

==========
Add DisableIf annotation to EME test

EME test does not pass on AOSP Android, therefore, add DisableIf annotation to
it (from BaseInstrumentationTestRunner)

Reorganized BaseInstrumentationTestRunner so it doesn't include anything
unrelated to WebViewLayout Testing.

BUG=607350

Committed: https://crrev.com/ea1675fb67d48828efb8c6b168582aa9f33388a2
Cr-Commit-Position: refs/heads/master@{#398659}
==========

[commit-bot: I haz the power, 2016-06-08 20:30:42]

Patchset 10 (id:??) landed as
https://crrev.com/ea1675fb67d48828efb8c6b168582aa9f33388a2
Cr-Commit-Position: refs/heads/master@{#398659}