Use waitForActivity in CustomTabActivityTest

Use waitForActivity in CustomTabActivityTest

CustomTabActivityTest#testTabReparenting* was assuming
that checkMonitorHit would also mean that getLastActivity()
is guaranteed to return an Activity.
Since that assumption was incorrect, this change gets the
logic in line with the other CustomTabActivityTest monitors
and changes it to use waitForActivityWithTimeout instead.
The CriteriaHelper timeout is used to keep the timeout
identical to how it was before.

BUG=610091
Committed: https://crrev.com/c3be22bfd9c16f9b6ca288d9737a1df5dde2ee0b
Cr-Commit-Position: refs/heads/master@{#392611}

[kraush, 2016-05-07 16:22:49]

kraush@amazon.com changed reviewers:
+ lizeb@chromium.org

[kraush, 2016-05-07 16:22:50]

Hi Benoit,

Can you take a look at this change to stabilize some tests?

Thanks! :)
Holger

[Benoit L, 2016-05-10 13:26:56]

On 2016/05/07 16:22:50, kraush wrote:
> Hi Benoit,
> 
> Can you take a look at this change to stabilize some tests?
> 
> Thanks! :)
> Holger

Thanks!

lgtm

[kraush, 2016-05-10 14:31:45]

The CQ bit was checked by kraush@amazon.com

[commit-bot: I haz the power, 2016-05-10 14:32:00]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1950983008/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1950983008/1

[commit-bot: I haz the power, 2016-05-10 15:24:32]

Committed patchset #1 (id:1)

[commit-bot: I haz the power, 2016-05-10 15:25:50]

Description was changed from

==========
Use waitForActivity in CustomTabActivityTest

CustomTabActivityTest#testTabReparenting* was assuming
that checkMonitorHit would also mean that getLastActivity()
is guaranteed to return an Activity.
Since that assumption was incorrect, this change gets the
logic in line with the other CustomTabActivityTest monitors
and changes it to use waitForActivityWithTimeout instead.
The CriteriaHelper timeout is used to keep the timeout
identical to how it was before.

BUG=610091
==========

to

==========
Use waitForActivity in CustomTabActivityTest

CustomTabActivityTest#testTabReparenting* was assuming
that checkMonitorHit would also mean that getLastActivity()
is guaranteed to return an Activity.
Since that assumption was incorrect, this change gets the
logic in line with the other CustomTabActivityTest monitors
and changes it to use waitForActivityWithTimeout instead.
The CriteriaHelper timeout is used to keep the timeout
identical to how it was before.

BUG=610091

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

[commit-bot: I haz the power, 2016-05-10 15:25:51]

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