Fix r475187 which is a bad revert.

Fix r475187 which is a bad revert.

It collided with r475096.

TBR=sky@chromium.org,oshima@chromium.org,varkha@chromium.org

[Lei Zhang, 2017-05-27 00:17:45]

The CQ bit was checked by thestig@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-05-27 00:18:01]

Dry run: CQ is trying da patch.

Follow status at:
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[oshima, 2017-05-27 00:31:51]

lgtm

sorry about that. I did compile locally but another CL might have landed in
between.

[varkha, 2017-05-27 00:33:30]

On 2017/05/27 00:31:51, oshima wrote:
> lgtm
> 
> sorry about that. I did compile locally but another CL might have landed in
> between.

I have a CL in CQ for this - https://codereview.chromium.org/2913433002/

[Lei Zhang, 2017-05-27 00:36:11]

On 2017/05/27 00:33:30, varkha wrote:
> On 2017/05/27 00:31:51, oshima wrote:
> > lgtm
> > 
> > sorry about that. I did compile locally but another CL might have landed in
> > between.
> 
> I have a CL in CQ for this - https://codereview.chromium.org/2913433002/

Great. I'll defer to your CL and close this one.

[Lei Zhang, 2017-05-27 00:36:16]

Description was changed from

==========
Fix r475187 which is a bad revert.

It collided with r475096.

TBR=sky@chromium.org,oshima@chromium.org,varkha@chromium.org
==========

to

==========
Fix r475187 which is a bad revert.

It collided with r475096.

TBR=sky@chromium.org,oshima@chromium.org,varkha@chromium.org
==========

[varkha, 2017-05-27 00:38:07]

On 2017/05/27 00:36:11, Lei Zhang wrote:
> On 2017/05/27 00:33:30, varkha wrote:
> > On 2017/05/27 00:31:51, oshima wrote:
> > > lgtm
> > > 
> > > sorry about that. I did compile locally but another CL might have landed
in
> > > between.
> > 
> > I have a CL in CQ for this - https://codereview.chromium.org/2913433002/
> 
> Great. I'll defer to your CL and close this one.

Thanks! It is pretty much same, except I have also restored the removal of a
header
that is no longer needed.