Disable test with NeedsManualRebaseline conflicting with Pass Timeout.

Disable test with NeedsManualRebaseline conflicting with Pass Timeout.

BUG=569175, 569514
TBR=yangguo

Committed: https://chromium.googlesource.com/chromium/src/+/804833f57c70d1f99bc0bc1a66eb403f317d50ff

[wkorman, 2015-12-28 01:00:38]

On 2015/12/28 at 00:59:24, wkorman wrote:
> 

Where by "disable" I mean "comment out the conflicting NeedsManualRebaseline
entry". Poorly phrased change description but the landing is already in flight
so too late to edit it, apologies.

[commit-bot: I haz the power, 2015-12-28 01:01:38]

Description was changed from

==========
Disable test with NeedsManualRebaseline conflicting with Pass Timeout.

BUG=569175,569514
TBR=yangguo
==========

to

==========
Disable test with NeedsManualRebaseline conflicting with Pass Timeout.

BUG=569175,569514
TBR=yangguo

Committed: https://crrev.com/804833f57c70d1f99bc0bc1a66eb403f317d50ff
Cr-Commit-Position: refs/heads/master@{#366949}
==========

[commit-bot: I haz the power, 2015-12-28 01:01:39]

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

[wkorman, 2015-12-28 01:02:10]

Description was changed from

==========
Disable test with NeedsManualRebaseline conflicting with Pass Timeout.

BUG=569175,569514
TBR=yangguo

Committed: https://crrev.com/804833f57c70d1f99bc0bc1a66eb403f317d50ff
Cr-Commit-Position: refs/heads/master@{#366949}
==========

to

==========
Disable test with NeedsManualRebaseline conflicting with Pass Timeout.

BUG=569175,569514
TBR=yangguo

Committed:
https://chromium.googlesource.com/chromium/src/+/804833f57c70d1f99bc0bc1a66eb...
==========

[wkorman, 2015-12-28 01:02:11]

Committed patchset #1 (id:1) manually as
804833f57c70d1f99bc0bc1a66eb403f317d50ff (presubmit successful).