Add DisplayVk and WindowSurfaceVk subclasses for Fuchsia to the vulkan
renderer, as well as an implementation of OSWindow that renders
fullscreen for the test suite.

Disallow use of the vulkan loader from third_party as Fuchsia uses a fork
of the loader and has not sent those changes upstream yet.

Add a small wayland-inspired library libfuchsia-egl to provide a type
"struct fuchsia_egl_window" to use as EGLNativeWindowType. This type
combines a zx_handle_t to an image pipe channel and a surface size.

Image pipes can only be used once to create a VkSurfaceKHR. This means we
have to recreate the pipe in tests that call eglCreateWindowSurface more
than once with a single OSWindow, or the second call will fail. Add a
resetNativeWindow() method to accomplish this.

Reland disabling -Wextra-semi.

BUG=angleproject:2475
TEST=angle_end2end_tests on Fuchsia

Change-Id: Ie91715bcd760c6c04d4b8a02a91daa71e32ee30c
Reviewed-on: https://chromium-review.googlesource.com/c/1467603
Commit-Queue: Michael Spang <spang@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>

Store an image array offset and source texture type in ImageVk to select the
correct cube face from the source texture.

BUG=angleproject:2668

Change-Id: I03ad25feccb769c906dd28fb573ec342e7816863
Reviewed-on: https://chromium-review.googlesource.com/c/1422542
Commit-Queue: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>

This reverts commit 199a9f38.

Reason for revert: Causes a validation error when the extension is not present. See failures here: https://ci.chromium.org/p/chromium/builders/luci.chromium.try/win-angle-rel/693

Original change's description:
> Vulkan: support instanced draws.
> 
> Enable instanced draws with the Vulkan backend.
> So far it only works when Vulkan has VK_EXT_vertex_attribute_divisor.
> 
> BUG=angleproject:2672
> 
> Change-Id: I9445ba64282fa00a6eaee207b15efa2c7a9abbd3
> Reviewed-on: https://chromium-review.googlesource.com/c/1334973
> Commit-Queue: Frank Henigman <fjhenigman@chromium.org>
> Reviewed-by: Jamie Madill <jmadill@chromium.org>

TBR=fjhenigman@chromium.org,jmadill@chromium.org,syoussefi@chromium.org

Change-Id: Iffccc2cca259bcd19c068a87a415d4e196901f45
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: angleproject:2672
Reviewed-on: https://chromium-review.googlesource.com/c/1468201Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>

This disables the warnings in the FragData test. We were
getting errors in Debug from the multithreading compile
implementation.

Bug: chromium:931294
Change-Id: I6d1424e54335534f794884e40f527b5464113084
Reviewed-on: https://chromium-review.googlesource.com/c/1465960Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

Due to Vulkan Validation Layers breaking Android N backward compatibility.
See http://crrev/c/1405714
and https://github.com/KhronosGroup/Vulkan-ValidationLayers/issues/623

Bug: angleproject:3095
Change-Id: I5da306c567cd9a0088149ca9929b38c8ed2cc86a
Reviewed-on: https://chromium-review.googlesource.com/c/1465954Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>

Store a mip offset in TextureVK to apply to all operations on the ImageHelper.

There is no need to store the mip offset in RenderbufferVk because it creates
the resource with the mip offset on the call to setStorageEGLImageTarget.

Store a mipmap level in the RenderTargetVk object so that clear operations
will target the correct mipmap of the image.

BUG=angleproject:2668

Change-Id: Ie976e3dd3a8de8135a7fbb8c84bd51eec0dddce8
Reviewed-on: https://chromium-review.googlesource.com/c/1422059
Commit-Queue: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>

Enable instanced draws with the Vulkan backend.
So far it only works when Vulkan has VK_EXT_vertex_attribute_divisor.

BUG=angleproject:2672

Change-Id: I9445ba64282fa00a6eaee207b15efa2c7a9abbd3
Reviewed-on: https://chromium-review.googlesource.com/c/1334973
Commit-Queue: Frank Henigman <fjhenigman@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>

Also remove cq.cfg since it is no longer used.

Bug: angleproject:3146
Change-Id: I3c247016e3553a1492072b7c48e2e22ff25578e9
Reviewed-on: https://chromium-review.googlesource.com/c/1465951Reviewed-by: Jamie Madill <jmadill@chromium.org>

Bug: angleproject:3146 
Change-Id: Iae0ec05ee7c26b5401225fd929b84c303a61ae40
Reviewed-on: https://chromium-review.googlesource.com/c/1465948Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>

Bug: angleproject:3036
Change-Id: Ica056743eed2aa08e96b8a85e693ae70355b52d5
Reviewed-on: https://chromium-review.googlesource.com/c/1464739Reviewed-by: Courtney Goeltzenleuchter <courtneygo@google.com>
Reviewed-by: Ian Elliott <ianelliott@google.com>
Commit-Queue: Ian Elliott <ianelliott@google.com>

Bug: 930723,angleproject:3144
Change-Id: Ib5524607ce072c8a37836d56fe5654284443fb49
Reviewed-on: https://chromium-review.googlesource.com/c/1464080Reviewed-by: Geoff Lang <geofflang@chromium.org>
Commit-Queue: Geoff Lang <geofflang@chromium.org>

This reverts commit ad194995.

Reason for revert: broke GPU optional bots since the revert of its previous CL

Original change's description:
> Disable broken tests on Fuchsia
> 
> This disables tests that do not work on Fuchsia. Most of them are related
> to cube maps which currently crash inside the intel driver.
> 
> BUG=angleproject:2475, angleproject:3145, angleproject:3081
> TEST=angle_end2end_tests on Fuchsia
> 
> Change-Id: Ifc0be390c6d5c43a756e1afb6ced9e3bd5b6986e
> Reviewed-on: https://chromium-review.googlesource.com/c/1446497
> Commit-Queue: Michael Spang <spang@chromium.org>
> Reviewed-by: Geoff Lang <geofflang@chromium.org>

TBR=spang@chromium.org,geofflang@chromium.org,jmadill@chromium.org

Change-Id: Id1861ee94b89020bcd64dd8e7e52588b76830783
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: angleproject:2475, angleproject:3145, angleproject:3081
Reviewed-on: https://chromium-review.googlesource.com/c/1465881Reviewed-by: Zhenyao Mo <zmo@chromium.org>
Commit-Queue: Zhenyao Mo <zmo@chromium.org>

This reverts commit 991d1cfb.

Reason for revert: Failing compile on the fuchsia bots on the ANGLE
auto-roller.

https://ci.chromium.org/p/chromium/builders/luci.chromium.try/fuchsia_x64/209198

In file included from ../../third_party/angle/util/fuchsia/ScenicWindow.cpp:10:
In file included from ../../third_party/angle/util/fuchsia/ScenicWindow.h:13:
In file included from gen/third_party/fuchsia-sdk/sdk/fidl/fuchsia/ui/policy/cpp/fidl.h:5:
In file included from ../../third_party/fuchsia-sdk/sdk/pkg/fidl_cpp/include/lib/fidl/cpp/internal/header.h:12:
../../third_party/fuchsia-sdk/sdk/pkg/fit/include/lib/fit/function.h:135:6: error: extra ';' after member function definition [-Werror,-Wextra-semi]
    };
     ^
1 error generated.

Original change's description:
> Vulkan: Port renderer to Fuchsia
> 
> Add DisplayVk and WindowSurfaceVk subclasses for Fuchsia to the vulkan
> renderer, as well as an implementation of OSWindow that renders
> fullscreen for the test suite.
> 
> Disallow use of the vulkan loader from third_party as Fuchsia uses a fork
> of the loader and has not sent those changes upstream yet.
> 
> Add a small wayland-inspired library libfuchsia-egl to provide a type
> "struct fuchsia_egl_window" to use as EGLNativeWindowType. This type
> combines a zx_handle_t to an image pipe channel and a surface size.
> 
> Image pipes can only be used once to create a VkSurfaceKHR. This means we
> have to recreate the pipe in tests that call eglCreateWindowSurface more
> than once with a single OSWindow, or the second call will fail. Add a
> resetNativeWindow() method to accomplish this.
> 
> BUG=angleproject:2475
> TEST=angle_end2end_tests on Fuchsia
> 
> Change-Id: I71a613a362dd1c8aada49a3c02ae461e064457bf
> Reviewed-on: https://chromium-review.googlesource.com/c/1446496
> Commit-Queue: Michael Spang <spang@chromium.org>
> Reviewed-by: Jamie Madill <jmadill@chromium.org>

TBR=spang@chromium.org,geofflang@chromium.org,jmadill@chromium.org,syoussefi@chromium.org

Change-Id: I2d9abefa9db5363ba63a17c1773d0e147040d055
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: angleproject:2475
Reviewed-on: https://chromium-review.googlesource.com/c/1465761Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

This disables tests that do not work on Fuchsia. Most of them are related
to cube maps which currently crash inside the intel driver.

BUG=angleproject:2475, angleproject:3145, angleproject:3081
TEST=angle_end2end_tests on Fuchsia

Change-Id: Ifc0be390c6d5c43a756e1afb6ced9e3bd5b6986e
Reviewed-on: https://chromium-review.googlesource.com/c/1446497
Commit-Queue: Michael Spang <spang@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>

Add DisplayVk and WindowSurfaceVk subclasses for Fuchsia to the vulkan
renderer, as well as an implementation of OSWindow that renders
fullscreen for the test suite.

Disallow use of the vulkan loader from third_party as Fuchsia uses a fork
of the loader and has not sent those changes upstream yet.

Add a small wayland-inspired library libfuchsia-egl to provide a type
"struct fuchsia_egl_window" to use as EGLNativeWindowType. This type
combines a zx_handle_t to an image pipe channel and a surface size.

Image pipes can only be used once to create a VkSurfaceKHR. This means we
have to recreate the pipe in tests that call eglCreateWindowSurface more
than once with a single OSWindow, or the second call will fail. Add a
resetNativeWindow() method to accomplish this.

BUG=angleproject:2475
TEST=angle_end2end_tests on Fuchsia

Change-Id: I71a613a362dd1c8aada49a3c02ae461e064457bf
Reviewed-on: https://chromium-review.googlesource.com/c/1446496
Commit-Queue: Michael Spang <spang@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>

Contains several useful tests including some that cover bugs with
compressed texture support. And some uses of CopyTexImage.

Bug: angleproject:2904
Bug: angleproject:2914
Change-Id: I90398ce2c513ace07cb9d414cd9a65c79e63aadb
Reviewed-on: https://chromium-review.googlesource.com/c/1462058
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>

This warning could pop up whenever an OpenGL app would write
to a particular output and not bind an attachment. This is
valid in OpenGL. Also it could happen when writing to
gl_FragData instead of gl_FragColor. Since it's hard to fix
every usage we can just suppress the warning.

Also adds a way to change test platform warnings into errors.

Bug: angleproject:2866
Change-Id: I9793f58121ac848d74d6b0131e79ebab2c70f45c
Reviewed-on: https://chromium-review.googlesource.com/c/1462057
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>

Fixes a validation error and rendering artifact in the WebGL test:
textures/misc/tex-image-and-sub-image-2d-with-array-buffer-view

Only applies to masked clears when combined with draw calls using
uniforms or textures.

Also make it easier to inspect layer messages in the debugger.

Bug: angleproject:2912
Change-Id: I4561895439221581b9dbc341d6de5d5a6c2096aa
Reviewed-on: https://chromium-review.googlesource.com/c/1462056
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>

Resetting cmd buffers in various ways to understand VK driver perf on
various devices.

Also includes some changes to get the chromium APK wrapper for
angle_white_box_perftests compiling.

Bug: angleproject:3137
Change-Id: I56bd163cdd6605ce09effe509a9c7ac5e0008e7a
Reviewed-on: https://chromium-review.googlesource.com/c/1456482
Commit-Queue: Tobin Ehlis <tobine@google.com>
Reviewed-by: Jamie Madill <jmadill@chromium.org>

Instead of passing lots of RendererVk member variables into
GenerateCaps(), do the work in a member function.

BUG=angleproject:2672

Change-Id: Icf16f3388174ddb676272ec0fa76a288ce2d1e4e
Reviewed-on: https://chromium-review.googlesource.com/c/1463959Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Frank Henigman <fjhenigman@chromium.org>

If currentExtent is unspecified and EGL_WIDTH & EGL_HEIGHT are provided,
we'll use a surface size of 0xFFFFFFFF. That's not going to work and
appears to be a typo. Use the size specified in EGL_WIDTH & EGL_HEIGHT
instead.

BUG=angleproject:2475
TEST=angle_end2end_tests on Fuchsia with an earlier version of
  CL 1446496 PS12. It is N/A with later patches.

Change-Id: I7e67b2c796318bed512dd6d5d22ef2183916416d
Reviewed-on: https://chromium-review.googlesource.com/c/1461637
Commit-Queue: Michael Spang <spang@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>

No support for non-zero mipmaps as sources yet.

Suppress dEQP tests due to apparent driver bugs with scissored clears on depth
or stencil attachments.

BUG=angleproject:2668

Change-Id: Idaa5e70ce9b0c91232fbb989cbf4de1b9134aafb
Reviewed-on: https://chromium-review.googlesource.com/c/1415010
Commit-Queue: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>

This test applies to the OpenGL ES renderer only. Vulkan-only builds fail
this tests because EGL_ANGLE_platform_angle_context_virtualization isn't
provided.

BUG=angleproject:2475
TEST=angle_end2end_tests on Fuchsia

Change-Id: I4668d88a43a707cf385c78a0582a81cfd722ec90
Reviewed-on: https://chromium-review.googlesource.com/c/1461636Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

previously declared variable fails on DirectX.

Combined user defined variables with their unique ids to avoid
overwriting same name variables of different scope.

Bug: angleproject:2126
Change-Id: If9ad9e48f629d83b105d43ee28a50b8176d0e0a1
Reviewed-on: https://chromium-review.googlesource.com/c/1456484Reviewed-by: Geoff Lang <geofflang@chromium.org>
Commit-Queue: Rafael Cintron <rafael.cintron@microsoft.com>

Local testing did not turn up any crashes.

Bug: angleproject:2983
Change-Id: I5e87ed0768e5bc4454c1a896f96d09ddd92baf44
Reviewed-on: https://chromium-review.googlesource.com/c/1458656Reviewed-by: Geoff Lang <geofflang@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

Uses FIFO with interval 1 and mailbox/immediate with interval 0 (with a
fallback to FIFO).  An end2end test is added to make sure the present
mode is correctly set.

Bug: angleproject:2932
Change-Id: I45d2b1e551b5c63c42ca3c8964bd5e62abd2d459
Reviewed-on: https://chromium-review.googlesource.com/c/1456622Reviewed-by: Ian Elliott <ianelliott@google.com>
Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>

This saves a lot of spam about dirty git formatting when changing
.gni files.

Bug: angleproject:3139
Change-Id: I244d5254ac6bd7bd1a7bedac5c34bd141fe0b9c0
Reviewed-on: https://chromium-review.googlesource.com/c/1460611Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

Bug: angleproject:3015
Change-Id: Ib01cc5e0df6db27981cb843a6bd386de5d10c2db
Reviewed-on: https://chromium-review.googlesource.com/c/1452740
Commit-Queue: Jonah Ryan-Davis <jonahr@google.com>
Reviewed-by: Geoff Lang <geofflang@chromium.org>

It's possible that IsOpenGLES doesn't work SurfaceTest. Also there was a
second failing test that should be skipped.

Bug: angleproject:3138
Change-Id: I5950819c343ce1413f4617c4c410aaba42b5a268
Reviewed-on: https://chromium-review.googlesource.com/c/1459602Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

Now that vk::ImageHelper is stored as a pointer, it can be shared between an
offscreen surface and texture.

BUG=angleproject:3073

Change-Id: I91e520259106eef497950b8b2e622fbf910f7444
Reviewed-on: https://chromium-review.googlesource.com/c/1412234
Commit-Queue: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>

It seems like there isn't a way to reference a local SVG in gitiles.
We'd need to upload the image to cloud storage. Instead we can use
the image in the repo if we link to the github version.

Bug: angleproject:3002
Change-Id: Ib1879d562e83ae16f531b204ca86cb73d45c5bb8
Reviewed-on: https://chromium-review.googlesource.com/c/1459600Reviewed-by: Jamie Madill <jmadill@chromium.org>

Bug: angleproject:3002
Change-Id: Ice785dc13b62879b4ec74ec8374d16eb88c5b257
Reviewed-on: https://chromium-review.googlesource.com/c/1459598Reviewed-by: Jamie Madill <jmadill@chromium.org>

Bug: angleproject:3002
Change-Id: I35df4e9f2af909f175402ce96773afb885bce595
Reviewed-on: https://chromium-review.googlesource.com/c/1455536Reviewed-by: Yuly Novikov <ynovikov@chromium.org>

Fill some gaps in the ANGLE end2end instanced draw test.
The only testing of points was on D3D11 and D3D11_FL9_3.
There was little testing of number of instances and different divisors.

Remove old one-off tests which are now redundant.

Disable the D3D11_FL9_3 points test which was passing purely by chance.
That code has bugs and only supports data from a buffer, while the
test uses data in client memory.

BUG=angleproject:2672

Change-Id: I5b5707a6fdd0960e81c25a2eb8ed96a1452d9868
Reviewed-on: https://chromium-review.googlesource.com/c/1450789
Commit-Queue: Frank Henigman <fjhenigman@chromium.org>
Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>

We would accidentally propagate include directories to the test
main target. This would show up as compile errors of the form:

In file included from ../../third_party/angle/testing/gtest/include/gtest/gtest.h:10:
../../third_party/angle/third_party/googletest/src/googletest/include/gtest/gtest.h:303:22: error: no member named 'ImplicitlyConvertible' in namespace 'testing::internal'
          !internal::ImplicitlyConvertible<T, AssertionResult>::value>::type*
           ~~~~~~~~~~^

This fixes the GN properties such that we no longer get the wrong
/testing/ and /third_party/googletest/ directories included. This
regressed when glslang was rolled.

Bug: angleproject:3088
Change-Id: I710f767cfe476454c10dacf2103b9203f1b5ee19
Reviewed-on: https://chromium-review.googlesource.com/c/1459596Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

Bug: angleproject:3138
Change-Id: If82467a0ab98d2b2f77337be41b33ee817e44e58
Reviewed-on: https://chromium-review.googlesource.com/c/1459597Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

Add instance & device extensions provided by layers prior to running
VerifyExtensionsPresent() so that we won't abort when required extensions
are provided in a layer. This happens particularly on Fuchsia as the
swapchain extension is implemented in a layer.

BUG=angleproject:2475
TEST=angle_end2end_tests on Fuchsia

Change-Id: I30385dfe55b14783a20d1410f1209d3e3ad10632
Reviewed-on: https://chromium-review.googlesource.com/c/1456487Reviewed-by: Ian Elliott <ianelliott@google.com>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Courtney Goeltzenleuchter <courtneygo@google.com>
Commit-Queue: Michael Spang <spang@chromium.org>

This reverts commit 1f8132a1.

Reason for revert: anglebug.com/3135

Bug: angleproject:3135

Original change's description:
> Vulkan: Reduce Default Descriptor Pool Max Sets
>
> The current value of kDefaultDescriptorPoolMaxSets is 2048, which
> allocates too much memory on a Pixel device, causing Android's low
> memory killer to terminate dEQP (leading to a test failure). This change
> reduces the value of kDefaultDescriptorPoolMaxSets to 128 to reduce the
> memory usage during the test. We suspect a later change may be required
> to dynamically grow the descriptor pools and update the recycling
> behavior.
>
> dEQP-EGL.functional.multicontext.non_shared_clear
>
> Bug: angleproject:3056
> Change-Id: I8a681b509823956a58d6c08f64a23203458e075e
> Reviewed-on: https://chromium-review.googlesource.com/c/1454280
> Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
> Reviewed-by: Jamie Madill <jmadill@chromium.org>
> Commit-Queue: Tim Van Patten <timvp@google.com>

TBR=jmadill@chromium.org,timvp@google.com,syoussefi@google.com,syoussefi@chromium.org

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

Bug: angleproject:3056
Change-Id: Iff950425141eb5028c3660ba0567a9d29e691604
Reviewed-on: https://chromium-review.googlesource.com/c/1459256
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Tim Van Patten <timvp@google.com>

Vulkan allows a swapchain to be created based off of an older swapchain
that's still presenting, to support seamless window resizing.  The old
swapchain will remain alive (though no image can be acquired from it)
and automatically cleaned once no image is being presented from it.

The retired swapchain can be destroyed once all operations on its images
are completed.  We store the old swapchain next to the serial of
submission that's used for CPU throttling and defer the destroy call
until after `finishToSerial` for that serial is called.

Bug: angleproject:2942
Change-Id: Ic62a5a57b712ffa2b087f5fecde0dc8942194075
Reviewed-on: https://chromium-review.googlesource.com/c/1435634
Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Yuly Novikov <ynovikov@chromium.org>

Bug: angleproject:3124
Change-Id: Idfcd84f92126eb7548f86f8c327887a34e3218a9
Reviewed-on: https://chromium-review.googlesource.com/c/1457025Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>