[Android] Move content_browsertests to main waterfall/trybots.

[Android] Move content_browsertests to main waterfall/trybots.

It's passing consistently on android_fyi_dbg trybots and on FYI waterfall bots running ICS.

BUG=270144
NOTRY=True

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

[craigdh, 2013-08-08 18:24:47]

lgtm.

[commit-bot: I haz the power, 2013-08-08 20:29:26]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/frankf@chromium.org/22299007/1

[commit-bot: I haz the power, 2013-08-08 20:32:44]

Change committed as 216442

[Isaac (use chromium), 2013-08-28 08:24:37]

Please get approval from the infra team for changes that increase running time
of the android cq bots (especially one that increases it by 50%!).  Android bots
already have the lowest throughput of all the bots on CQ, so making them slower
makes tryserver restarts especially problematic on android.  It also can cause
phones to run out of power.

navabi@ already reverted this change once because we didn't have enough
capacity:
https://codereview.chromium.org/15042004/

Android is blocking the CQ.  We may need to revert this again.  Though I'm
confused why hinoka@'s alerts didn't fire...

[frankf, 2013-08-28 17:30:35]

1. The previous revert was due to timeouts in tests themselves not the running
time. The original CL had infra lgtm
2. Adding content_browsertests has been discussed many times in the infra
meeting. So this has been long-time coming.

Given these tests has been running for 3 weeks, I highly recommend increasing
infra capacity instead of turning of tests.

[cmp, 2013-09-03 05:14:16]

On 2013/08/28 17:30:35, frankf wrote:
> 1. The previous revert was due to timeouts in tests themselves not the running
> time. The original CL had infra lgtm
> 2. Adding content_browsertests has been discussed many times in the infra
> meeting. So this has been long-time coming.
> 
> Given these tests has been running for 3 weeks, I highly recommend increasing
> infra capacity instead of turning of tests.

Hey Frank, the original revert AFAIK was also because the content_browsertests
tests were taking too long to run.  Someone on Clank was supposed to look into
fixing that, but that never happened.  Android is already blocking it in most
cases, but this change causes the CQ to get very far behind.  This is a problem
for us and we can't allow any config to block the Chromium CQ so badly.

We should revert this and try to fix content_browsertests run time.  We are
separately working on increasing our capacity which involves switching our
devices from GN to N4.