GitLab

https://chromium.googlesource.com/angle/angle.git/+log/f6fd48fd329f..f5557accff71


git log f6fd48fd329f..f5557accff71 --date=short --no-merges --format='%ad %ae %s'
2018-06-18 jmadill@chromium.org translator: Store symbol type in TField.
2018-06-18 lucferron@chromium.org SampleApps: Refactor to use cli args the same way
2018-06-18 lucferron@chromium.org Vulkan: Implement conversion to uint16 for drawElements with ubytes
2018-06-18 lucferron@chromium.org Vulkan: Fill in glslang resources with our caps


Created with:
  gclient setdep -r src/third_party/angle@f5557accff71

The AutoRoll server is located here: https://angle-chromium-roll.skia.org

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.

CQ_INCLUDE_TRYBOTS=luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
TBR=cwallez@chromium.org

Change-Id: Ib446737a17b3795a59c61841cc3fdb7e3dffa870
Reviewed-on: https://chromium-review.googlesource.com/1104919Reviewed-by: angle-chromium-autoroll <angle-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Commit-Queue: angle-chromium-autoroll <angle-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Cr-Commit-Position: refs/heads/master@{#568177}

Bug: 852116
Change-Id: I558bbb8cbb2cfc614d6953ec2778e9802de26430
Reviewed-on: https://chromium-review.googlesource.com/1094325
Commit-Queue: Pedro Amaral <amaralp@chromium.org>
Reviewed-by: Ted Choc <tedchoc@chromium.org>
Reviewed-by: Matthew Jones <mdjones@chromium.org>
Cr-Commit-Position: refs/heads/master@{#568176}

Simplifies the config, and fixes an oversight were the tests were running
on the regular cros bots, but not on the cros memory bots.

Bug: 843511
Change-Id: I751ead56fca4adec28b991243a03cc516417ca3f
Reviewed-on: https://chromium-review.googlesource.com/1104799
Commit-Queue: Nico Weber <thakis@chromium.org>
Reviewed-by: Jonathan Ross <jonross@chromium.org>
Cr-Commit-Position: refs/heads/master@{#568175}

At some point, the floor regressed to be non-hittable.  Mark it as
explicitly hit-testable.

BUG=853822
R=tiborg

Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:linux_vr;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
Change-Id: Ie8ceda269a3e403c4fbf3eeb46709344d1faa90f
Reviewed-on: https://chromium-review.googlesource.com/1104980Reviewed-by: Tibor Goldschwendt <tiborg@chromium.org>
Commit-Queue: Christopher Grant <cjgrant@chromium.org>
Cr-Commit-Position: refs/heads/master@{#568174}

Bug: 849201, b/109944165
Change-Id: I051b1af77f9434b40c9f5ca9e9357d46e3072f82
Reviewed-on: https://chromium-review.googlesource.com/1104962Reviewed-by: Ryan Hamilton <rch@chromium.org>
Commit-Queue: Ryan Hamilton <rch@chromium.org>
Cr-Commit-Position: refs/heads/master@{#568173}

The causes the parameter to work when the network service is enabled.
This CL disables referrers for Safe Browsing requests when the network
service is enabled - none of the requests use referrers, so it seems
like hooking up the kEnableReferrers pref to that NetworkContext is more
effort than it's worth. Never send it rather than always send it just to
make sure we respect the user's preference, when referrers are disabled.

Bug: 838906
Cq-Include-Trybots: luci.chromium.try:linux_mojo
Change-Id: I8c9d8350bfce99e1140900f5dbcbda9eb0cc9718
Reviewed-on: https://chromium-review.googlesource.com/1087570
Commit-Queue: Matt Menke <mmenke@chromium.org>
Reviewed-by: Varun Khaneja <vakh@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Dominic Battré <battre@chromium.org>
Reviewed-by: Maks Orlovich <morlovich@chromium.org>
Cr-Commit-Position: refs/heads/master@{#568172}

TBR=boliu@chromium.org

Bug: 853816
Change-Id: Icda147b5735a5bda3abf67e296d870a120b55918
Reviewed-on: https://chromium-review.googlesource.com/1105061Reviewed-by: Becky Zhou <huayinz@chromium.org>
Reviewed-by: Bo <boliu@chromium.org>
Commit-Queue: Becky Zhou <huayinz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#568171}

This change adds Feature Policy tests for Dedicated Workers.

Bug: 841510
Change-Id: I117f8a5bb61d5783b6867e7edcc9d99aff41a497
Reviewed-on: https://chromium-review.googlesource.com/1093379
Commit-Queue: Ovidio Henriquez <odejesush@chromium.org>
Reviewed-by: Reilly Grant <reillyg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#568170}

A sensor's initial reading is checked to see if an event should be
fired immediately after it is activated. Unfortunately this initial
reading was not actually read from shared memory. Depending on timing
the reading might be refreshed by the polling timer or upon receiving
a SensorReadingChanged message.

This patch updates the code to take this initial reading on
initialization so that we can reliably decide whether to send an
initial reading event.

Bug: 789515,809537
Change-Id: I96f441aad3ec474ef94fd634aa34bf9b29b9edf9
Reviewed-on: https://chromium-review.googlesource.com/1103178Reviewed-by: Jun Cai <juncai@chromium.org>
Commit-Queue: Reilly Grant <reillyg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#568169}

Change-Id: I806de57477f1acd310bcdb7e0e7121f8d98ceeca
Reviewed-on: https://chromium-review.googlesource.com/1103217Reviewed-by: Peter Kasting <pkasting@chromium.org>
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#568168}

- The new action is for correctly ref counting the COM object.
- The AddRef is required for Rules 1c and 1d defined in
  "Reference-Counting Rules"
  https://msdn.microsoft.com/en-us/library/ms810016.aspx?f=255&MSPPError=-2147217396

Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
Change-Id: Ieb0e38f077b3786a77a0c415be3a703dc7f9ecca
Reviewed-on: https://chromium-review.googlesource.com/1103236
Commit-Queue: Rintaro Kuroiwa <rkuroiwa@chromium.org>
Reviewed-by: Xiaohan Wang <xhwang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#568167}

When Harmony is enabled textfields have an additional child in the form
of the focus ring, so the expectation needed to be updated.

Bug: 846410
Change-Id: I0b807d7f69c97eed7bc56e9520f51d3a845fba76
Reviewed-on: https://chromium-review.googlesource.com/1103586Reviewed-by: David Tseng <dtseng@chromium.org>
Commit-Queue: Bret Sepulveda <bsep@chromium.org>
Cr-Commit-Position: refs/heads/master@{#568166}

This CL cleans up this class in preparation for future types to be added.

Bug: 853843
Change-Id: Ibdf6f624cc01e776bd885fa785a1cdb37a19a150
Reviewed-on: https://chromium-review.googlesource.com/1104965Reviewed-by: Christian Fremerey <chfremer@chromium.org>
Commit-Queue: Emircan Uysaler <emircan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#568165}

We're seeing some crashes where looking up a child's parent while
the child is being destroyed can crash. Curiously, stack traces suggest
that the "child" being destroyed could actually be the root.

Bug: 851958
Change-Id: I6b10f6e98ca3d969af0c17d60eb1266647391ca5
Reviewed-on: https://chromium-review.googlesource.com/1101173Reviewed-by: Ken Buchanan <kenrb@chromium.org>
Commit-Queue: Kevin McNee <mcnee@chromium.org>
Cr-Commit-Position: refs/heads/master@{#568164}

Checking IsUserPrimary() before login is incorrect, we need to also
check IsActiveUserSessionStarted() anywhere we want to hide or disable
UI for the secondary user.

Bug was introduced in https://chromium-review.googlesource.com/1089585

Bug: 853715
Change-Id: Id7cb90da16e62be6f23d7df7ce499c8e4fef4786
Reviewed-on: https://chromium-review.googlesource.com/1104983
Commit-Queue: Steven Bennetts <stevenjb@chromium.org>
Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#568163}

Add a metric to indicate where in the redirect chain the safe browsing
activation occurred, either at the start, middle, or end, or in the
case where the navigation is direct, in the only position.

Bug: 851545
Change-Id: I39d0848aee825db287171a2c63862bdb434373a1
Reviewed-on: https://chromium-review.googlesource.com/1099647Reviewed-by: Alexei Svitkine <asvitkine@chromium.org>
Reviewed-by: Charlie Harrison <csharrison@chromium.org>
Commit-Queue: Eric Robinson <ericrobinson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#568162}

Implements and tests the Context child process spawning aspects of
ContextProvider.

Additionally moves non-main portions of "//webrunner:webrunner" into a
component, so that they can be called from unit tests.

Bug: 850743
Change-Id: I4f4aafac71ac56d72c6931db3751201bc516d92a
Reviewed-on: https://chromium-review.googlesource.com/1096453
Commit-Queue: Kevin Marshall <kmarshall@chromium.org>
Reviewed-by: Jochen Eisinger <jochen@chromium.org>
Reviewed-by: Sergey Ulanov <sergeyu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#568161}

Removed extra slash from help center URL, also updated the histogram
enum to match the recommendation in base/metrics/histogram_macros.h

Bug: 853897

Change-Id: Ie6372e1b535ae50d468680842e2213c9c404cbb0
Reviewed-on: https://chromium-review.googlesource.com/1104959
Commit-Queue: Carlos IL <carlosil@chromium.org>
Reviewed-by: Emily Stark <estark@chromium.org>
Cr-Commit-Position: refs/heads/master@{#568160}

Previously MixerOutputStreamFuchsia was using media_client library,
which is deprecated now. Update it to use AudioRenderer2 FIDL interface
directly.

Bug: 851733
Change-Id: I72a43369d16ecd626aa7294a6f3500b57bb3731e
Reviewed-on: https://chromium-review.googlesource.com/1100376Reviewed-by: Kenneth MacKay <kmackay@chromium.org>
Reviewed-by: Wez <wez@chromium.org>
Commit-Queue: Sergey Ulanov <sergeyu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#568159}

The only layout that should use -[NSEvent characters] to match keyEquivalents
rather than -[NSEvent charactersIgnoringModifiers] is DVORAK-QWERTY. This CL
updates the logic in NSMenuItem(ChromeAdditions) to make this check.

Bug: 852820
Change-Id: Ib3f63bfadfd10ec5259324b2d7d52510997f7a98
Reviewed-on: https://chromium-review.googlesource.com/1103121Reviewed-by: Nico Weber <thakis@chromium.org>
Commit-Queue: Erik Chen <erikchen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#568158}

Summary of changes available at:
https://chromium.googlesource.com/v8/v8/+log/743d013b..d4c89837

Please follow these instructions for assigning/CC'ing issues:
https://github.com/v8/v8/wiki/Triaging%20issues

Please close rolling in case of a roll revert:
https://v8-roll.appspot.com/
This only works with a Google account.

CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_trusty_blink_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel;luci.chromium.try:android_optional_gpu_tests_rel

TBR=hablich@chromium.org,machenbach@chromium.org,kozyatinskiy@chromium.org,sergiyb@chromium.org

Change-Id: I7fffc8bdcaeea129c414a0109493282ed09a3b3a
Reviewed-on: https://chromium-review.googlesource.com/1104886Reviewed-by: V8 Autoroller <v8-ci-autoroll-builder@chops-service-accounts.iam.gserviceaccount.com>
Commit-Queue: V8 Autoroller <v8-ci-autoroll-builder@chops-service-accounts.iam.gserviceaccount.com>
Cr-Commit-Position: refs/heads/master@{#568157}

BleConnectionManager originally landed in:
https://chromium-review.googlesource.com/c/chromium/src/+/1100133

It was reverted by:
https://chromium-review.googlesource.com/c/chromium/src/+/1103917

The CL was reverted due to failures in the ASAN build.

This CL uploads the original CL as patchset 1 and fixes the failing ASAN
tests in the following patchset.

Original CL description below:

> Creates connections to remote devices over Bluetooth, using either the
> listener role (BLE scans only) or the initiator role (a combination of BLE
> advertising and scanning).
>
> When a connection is attempted, it remains active until either an
> AuthenticatedChannel is returned successfully or until the request is
> explicitly removed via one of the Cancel*() functions.

Bug: 824568, 752273
Change-Id: I45322a246d56b9b33142c010ad2755c7872574d1
Reviewed-on: https://chromium-review.googlesource.com/1104792Reviewed-by: Ryan Hansberry <hansberry@chromium.org>
Commit-Queue: Kyle Horimoto <khorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#568156}

Increasing the verb count from 10 to 100 in Skia's edge-AA tessellating
path renderer improves performance on many tests, including
Animometer's Canvas Stroke Paths and the bugs listed below.

Bug: 805031, 223694, 715116
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
Change-Id: I57d775ddce3200e5f54bae448de9fd2dffe30e72
Reviewed-on: https://chromium-review.googlesource.com/1099564Reviewed-by: Zhenyao Mo <zmo@chromium.org>
Reviewed-by: Justin Novosad <junov@chromium.org>
Commit-Queue: Stephen White <senorblanco@chromium.org>
Cr-Commit-Position: refs/heads/master@{#568155}

This change moves gamepad_mojom_traits to device/gamepad/public/cpp and
creates a shared component for them to be specified as a dependency in
gamepad.typemap. This will enable GamepadSharedMemoryReader to depend on
the traits after the move to blink.

Bug: 612330
Change-Id: I688a981313ec90a8c5bf909b0df4bb3e1f711388
Reviewed-on: https://chromium-review.googlesource.com/1103612Reviewed-by: Ken Rockot <rockot@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Commit-Queue: Oksana Zhuravlova <oksamyt@chromium.org>
Cr-Commit-Position: refs/heads/master@{#568154}

Previously PlatformWindowInitProperties was passed to Ozone platform
implementations as a const reference. This doesn't allow to pass movable
parameters (e.g. handles) when creating platform windows. On Fuchsia it
is necessary to pass view_owner_request when creating a view.
view_owner_request wraps an handle, so it's not copyable. Updated all
code that works with PlatformWindowInitProperties to pass it by value.

Also updated DesktopWindowTreeHostPlatform to default to POPUP window
type for any widget types other then WINDOW and MENU.

Bug: 829980
Change-Id: I34c7a8fe957f364833a5e4eafd272794eec99b56
Reviewed-on: https://chromium-review.googlesource.com/1103223Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Sergey Ulanov <sergeyu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#568153}

Change-Id: I831758dd130433f1b449098302a04a6dcc5e8414
Reviewed-on: https://chromium-review.googlesource.com/1104806Reviewed-by: Devlin <rdevlin.cronin@chromium.org>
Commit-Queue: proberge <proberge@chromium.org>
Cr-Commit-Position: refs/heads/master@{#568152}

Use ImageSkia for drag image since mojo supports it now.

Bug: 837716
Change-Id: Ic338ef82b7ade738b77bf71f4cd354240cad672b
Reviewed-on: https://chromium-review.googlesource.com/1103181Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Xiyuan Xia <xiyuan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#568151}

Bug: b/78190629
Cq-Include-Trybots: luci.chromium.try:closure_compilation
Change-Id: I553fb8a9363775f3dfe110bef559f12c2e93db34
Reviewed-on: https://chromium-review.googlesource.com/1103614
Commit-Queue: Yue Li <updowndota@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#568150}

The client was not always passing in the right translucent value, leading
to the window being marked opaque on the server when it isn't.

BUG=849380
TEST=none

Change-Id: I39f73a9ede381f0310a8532bc76ce700007f1352
Reviewed-on: https://chromium-review.googlesource.com/1103701Reviewed-by: Fady Samuel <fsamuel@chromium.org>
Commit-Queue: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#568149}

This flag will controls the "WebGPU" runtime enabled features that
exposes the prototype WebGPU Blink bindings.

BUG=chromium:852089

Change-Id: Id6e718f85eb05045b8b4056a16b6cb966fba3e4a
Reviewed-on: https://chromium-review.googlesource.com/1097608
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#568148}

DIR_MODULE should not be used to discover resource files on Fuchsia.
Replaced it with DIR_ASSETS. This fixes resource loading on Fuchsia,
but has no effect on other platforms.

Change-Id: Ia0d235a4d07dc2f3e6bcd905a401ede113998e8e
Bug: 805727
Reviewed-on: https://chromium-review.googlesource.com/1100377Reviewed-by: Sergey Volk <servolk@chromium.org>
Commit-Queue: Sergey Ulanov <sergeyu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#568147}

This UKM is recorded at the same time as the PageLoad UKM so that the
data can be tied together. This does not record on pages that did not
show the InfoBar. Otherwise, it records 3 states: (a) InfoBar shown, but
page not paused (b) page paused (c) page paused then resumed.

Bug: 852824
Change-Id: I912774c3c9651e342bfa7435e6adf33bd194fb87
Reviewed-on: https://chromium-review.googlesource.com/1101831
Commit-Queue: Ryan Sturm <ryansturm@chromium.org>
Reviewed-by: Robert Kaplow <rkaplow@chromium.org>
Reviewed-by: Tarun Bansal <tbansal@chromium.org>
Cr-Commit-Position: refs/heads/master@{#568146}

This CL adds the missing scroll functionality to the Views Autofill
implementation. Previously, dropdowns that were too tall for their
window would extend beyond its boundaries (Win + Mac) or even be cut
off entirely (Linux). The major changes include:
- Changes to PopupViewCommon to use window bounds, rather than display
  bounds
- The creation of a mock version of PVC for contexts where we cannot
  safely get the needed window object
- Exposing the x and y portions of the calculation logic in PVC
- Changes to the dropdown, including the addition of a scroll view,
  and new logic which determines the needed size. The new size logic
  first uses the new PVC function to determine the height, then adjusts
  for the scroll bar if present, then applies existing rules (rounding,
  minimum, etc.), and finally uses the other new PVC function to get
  the final width.

Change-Id: I4434fa045bfe010d51d582272fbc011b813d3ab0
Reviewed-on: https://chromium-review.googlesource.com/1072427
Commit-Queue: Tommy Martino <tmartino@chromium.org>
Reviewed-by: Evan Stade <estade@chromium.org>
Reviewed-by: Fabio Tirelo <ftirelo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#568145}

Bug: 852406
Change-Id: Iab6fc1125a0af2feed0c2c3d9918591f9b0bd332
Reviewed-on: https://chromium-review.googlesource.com/1099861
Commit-Queue: Matthew Jones <mdjones@chromium.org>
Reviewed-by: Ted Choc <tedchoc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#568144}

Case was revealed by https://github.com/web-platform-tests/wpt/pull/9794
Specifically, Navigator implements NavigatorUserMedia;

Navigator was not being added as a depenedency, and thus was not being imported.

Change-Id: I07436c561bb0b567a431393a20f6a179ef5b364b
Reviewed-on: https://chromium-review.googlesource.com/1104707Reviewed-by: Robert Ma <robertma@chromium.org>
Commit-Queue: Luke Bj <lukebjerring@chromium.org>
Cr-Commit-Position: refs/heads/master@{#568143}

Add a feature for media controls to recognise a gesture
and expand into the display cutout.

BUG=849790

Change-Id: Ice6de82f4fb94e366fca68338a55236fa1f05c8a
Reviewed-on: https://chromium-review.googlesource.com/1087710Reviewed-by: Jochen Eisinger <jochen@chromium.org>
Commit-Queue: Becca Hughes <beccahughes@chromium.org>
Cr-Commit-Position: refs/heads/master@{#568142}

Change-Id: I0389ed2168472e524a126d263bd30a52602cdb7e
Reviewed-on: https://chromium-review.googlesource.com/1102880
Commit-Queue: Jordy Greenblatt <jordynass@chromium.org>
Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#568141}

BUG=852888

TBR=perezju@chromium.org

Change-Id: I773594071fb0e9357af63d3024dd71125cad9723
Reviewed-on: https://chromium-review.googlesource.com/1104880Reviewed-by: Steven Holte <holte@chromium.org>
Commit-Queue: Steven Holte <holte@chromium.org>
Cr-Commit-Position: refs/heads/master@{#568140}

This change only plumbs SecureChannelClient into the necessary locations in Tether;
it does not actually use it. A subsequent CL will utilize SecureChannelClient, instead
of BleConnectionManager, inside MessageTransferOperation.

Bug: 824568, 752273
Change-Id: I85adef9c17caf63ce9bea34621fb7a1c4666a3d9
Reviewed-on: https://chromium-review.googlesource.com/1104952Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Commit-Queue: Ryan Hansberry <hansberry@chromium.org>
Cr-Commit-Position: refs/heads/master@{#568139}

SetPermissionInfo and SetPermissionInfoForUsbGuard were checking whether
Harmony was enabled by checking the feature flag instead of calling
MaterialDesignController::IsSecondaryUiMaterial. The latter will return
true under Refresh when the former does not.

Also deletes some obsolete Mac-only code.

Bug: 846410
Change-Id: I9cdf5ec0dee8fb2fcc519fa3c09702014d7342fe
Reviewed-on: https://chromium-review.googlesource.com/1103583
Commit-Queue: Bret Sepulveda <bsep@chromium.org>
Reviewed-by: Trent Apted <tapted@chromium.org>
Cr-Commit-Position: refs/heads/master@{#568138}