Fixed compilation after 688009 cherry-pick

Fixed compilation after 688009 cherry-pick

The problem was caused by incorrect merge conflict resolution.

BUG=688009
NOTRY=true
NOPRESUBMIT=true

[Eugene But (OOO till 7-30), 2017-02-16 18:25:27]

eugenebut@chromium.org changed reviewers:
+ lpromero@chromium.org

[lpromero, 2017-02-16 18:28:19]

lgtm

[Eugene But (OOO till 7-30), 2017-02-16 18:31:36]

The CQ bit was checked by eugenebut@chromium.org

[commit-bot: I haz the power, 2017-02-16 18:33:31]

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

[commit-bot: I haz the power, 2017-02-16 18:33:32]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-02-16 18:33:33]

CLs for remote refs other than refs/heads/master must contain NOTRY=true and
NOPRESUBMIT=true in order for the CQ to process them

[Eugene But (OOO till 7-30), 2017-02-16 18:36:42]

Description was changed from

==========
Fixed compilation after 688009 cherry-pick

The problem was caused by incorrect merge conflict resolution.

BUG=688009
==========

to

==========
Fixed compilation after 688009 cherry-pick

The problem was caused by incorrect merge conflict resolution.

BUG=688009
NOTRY=true
NOPRESUBMIT=true
==========

[Eugene But (OOO till 7-30), 2017-02-16 18:36:46]

The CQ bit was checked by eugenebut@chromium.org

[commit-bot: I haz the power, 2017-02-16 18:37:26]

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

[commit-bot: I haz the power, 2017-02-16 19:01:28]

CQ is committing da patch.

Bot data: {"patchset_id": 1, "attempt_start_ts": 1487270206100140, "parent_rev":
"90f62e0c89fdcc453b38025181ca8d9c089accf7", "commit_rev":
"aa2485e99f2a87ab0fe88e6185960c9a153f0e4f"}

[commit-bot: I haz the power, 2017-02-16 19:03:56]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-02-16 19:03:59]

Prior attempt to commit was detected, but we were not able to check whether the
issue was successfully committed. Please check Git history manually and re-check
CQ or close this issue as needed.

[lpromero, 2017-02-17 13:48:12]

On 2017/02/16 19:03:59, commit-bot: I haz the power wrote:
> Prior attempt to commit was detected, but we were not able to check whether
the
> issue was successfully committed. Please check Git history manually and
re-check
> CQ or close this issue as needed.

This has been committed:
commit aa2485e99f2a87ab0fe88e6185960c9a153f0e4f
Author: eugenebut <eugenebut@chromium.org>
Date:   Thu Feb 16 20:01:23 2017

    Fixed compilation after 688009 cherry-pick

    The problem was caused by incorrect merge conflict resolution.

    BUG=688009
    NOTRY=true
    NOPRESUBMIT=true

    Review-Url: https://codereview.chromium.org/2698203004
    Cr-Commit-Position: refs/branch-heads/2987@{#552}
    Cr-Branched-From:
ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}