GitLab

This reverts commit 27c33249.

Reason for revert: Need to revert https://chromium-review.googlesource.com/c/chromium/src/+/656597 and https://chromium-review.googlesource.com/673093 which this patch depends on.

Original change's description:
> Fix ozone Linux build
> 
> This CL fixes the ozone Linux build after r504590.
> 
> TBR=tommi@chromium.org
> CC=​mfoltz@chromium.org
> 
> Change-Id: Ice6b7e1f5858c43bd1d9388ef84ee179e2268a32
> Reviewed-on: https://chromium-review.googlesource.com/688155
> Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
> Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#504738}

TBR=tommi@chromium.org,thomasanderson@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Change-Id: I89257302c00b903a61bfd8e483dcff61b3256113
Reviewed-on: https://chromium-review.googlesource.com/691310Reviewed-by: mark a. foltz <mfoltz@chromium.org>
Commit-Queue: mark a. foltz <mfoltz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#505233}