Revert of Make Rebaseline/NeedsRebaseline/NeedsManualRebaseline not conflict with Pass lines.

Revert of Make Rebaseline/NeedsRebaseline/NeedsManualRebaseline not conflict with Pass lines. (patchset #2 id:20001 of https://codereview.chromium.org/1412533002/ )

Reason for revert:
Interim fix for http://crbug.com/569175 until we can update script to not strip Pass/Failure lines for tests also matching NeedsRebaseline.

Original issue's description:
> Make Rebaseline/NeedsRebaseline/NeedsManualRebaseline not conflict with Pass lines.
>
> As per https://groups.google.com/a/chromium.org/forum/#!topic/blink-dev/OI_gXMX7yUs.
>
> Committed: https://crrev.com/30fe1b01a50cefa35a0578311944e3b09cb27f38
> Cr-Commit-Position: refs/heads/master@{#357741}

TBR=dpranke@chromium.org,ojan@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=569175
Committed: https://crrev.com/15e6ff0a3524008ca07189146a7034519a947378
Cr-Commit-Position: refs/heads/master@{#366947}

[wkorman, 2015-12-28 00:41:41]

Created Revert of Make Rebaseline/NeedsRebaseline/NeedsManualRebaseline not
conflict with Pass lines.

[wkorman, 2015-12-28 00:42:23]

Description was changed from

==========
Revert of Make Rebaseline/NeedsRebaseline/NeedsManualRebaseline not conflict
with Pass lines. (patchset #2 id:20001 of
https://codereview.chromium.org/1412533002/ )

Reason for revert:
Interim fix for http://crbug.com/569175 until we can update script to not strip
Pass/Failure lines for tests also matching NeedsRebaseline.

Original issue's description:
> Make Rebaseline/NeedsRebaseline/NeedsManualRebaseline not conflict with Pass
lines.
> 
> As per
https://groups.google.com/a/chromium.org/forum/#!topic/blink-dev/OI_gXMX7yUs.
> 
> Committed: https://crrev.com/30fe1b01a50cefa35a0578311944e3b09cb27f38
> Cr-Commit-Position: refs/heads/master@{#357741}

TBR=dpranke@chromium.org,eae@chromium.org,joelo@chromium.org,pdr@chromium.org...
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
==========

to

==========
Revert of Make Rebaseline/NeedsRebaseline/NeedsManualRebaseline not conflict
with Pass lines. (patchset #2 id:20001 of
https://codereview.chromium.org/1412533002/ )

Reason for revert:
Interim fix for http://crbug.com/569175 until we can update script to not strip
Pass/Failure lines for tests also matching NeedsRebaseline.

Original issue's description:
> Make Rebaseline/NeedsRebaseline/NeedsManualRebaseline not conflict with Pass
lines.
> 
> As per
https://groups.google.com/a/chromium.org/forum/#!topic/blink-dev/OI_gXMX7yUs.
> 
> Committed: https://crrev.com/30fe1b01a50cefa35a0578311944e3b09cb27f38
> Cr-Commit-Position: refs/heads/master@{#357741}

TBR=dpranke@chromium.org,ojan@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=569175
==========

[wkorman, 2015-12-28 00:42:50]

The CQ bit was checked by wkorman@chromium.org

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

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

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

Committed patchset #1 (id:1)

[commit-bot: I haz the power, 2015-12-28 00:44:49]

Description was changed from

==========
Revert of Make Rebaseline/NeedsRebaseline/NeedsManualRebaseline not conflict
with Pass lines. (patchset #2 id:20001 of
https://codereview.chromium.org/1412533002/ )

Reason for revert:
Interim fix for http://crbug.com/569175 until we can update script to not strip
Pass/Failure lines for tests also matching NeedsRebaseline.

Original issue's description:
> Make Rebaseline/NeedsRebaseline/NeedsManualRebaseline not conflict with Pass
lines.
> 
> As per
https://groups.google.com/a/chromium.org/forum/#!topic/blink-dev/OI_gXMX7yUs.
> 
> Committed: https://crrev.com/30fe1b01a50cefa35a0578311944e3b09cb27f38
> Cr-Commit-Position: refs/heads/master@{#357741}

TBR=dpranke@chromium.org,ojan@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=569175
==========

to

==========
Revert of Make Rebaseline/NeedsRebaseline/NeedsManualRebaseline not conflict
with Pass lines. (patchset #2 id:20001 of
https://codereview.chromium.org/1412533002/ )

Reason for revert:
Interim fix for http://crbug.com/569175 until we can update script to not strip
Pass/Failure lines for tests also matching NeedsRebaseline.

Original issue's description:
> Make Rebaseline/NeedsRebaseline/NeedsManualRebaseline not conflict with Pass
lines.
>
> As per
https://groups.google.com/a/chromium.org/forum/#!topic/blink-dev/OI_gXMX7yUs.
>
> Committed: https://crrev.com/30fe1b01a50cefa35a0578311944e3b09cb27f38
> Cr-Commit-Position: refs/heads/master@{#357741}

TBR=dpranke@chromium.org,ojan@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=569175

Committed: https://crrev.com/15e6ff0a3524008ca07189146a7034519a947378
Cr-Commit-Position: refs/heads/master@{#366947}
==========

[commit-bot: I haz the power, 2015-12-28 00:44:49]

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