GitLab

Bug: 847388

R=rockot@chromium.org

Change-Id: I02a661071e41a7513b4e3aa9bc929e127c78c74f
Reviewed-on: https://chromium-review.googlesource.com/1076109Reviewed-by: Ken Rockot <rockot@chromium.org>
Commit-Queue: Oliver Chang <ochang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#562591}

Bug: 844016
Change-Id: Ida401d3f0dd2b6aa6f82219f4cf3c0ca417762c5
Reviewed-on: https://chromium-review.googlesource.com/1075725Reviewed-by: Bartosz Fabianowski <bartfab@chromium.org>
Commit-Queue: Wez <wez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#562590}

Very minor cleanup. Switching to initializing extensions_delegate_
in the class member initialization section instead of the constructor
body.

Bug: None
Change-Id: I439d3ef34832d9c883f0c9cf0d92df8fbc378d0f
Reviewed-on: https://chromium-review.googlesource.com/1076685Reviewed-by: Mike Pinkerton <pinkerton@chromium.org>
Commit-Queue: Chris Mumford <cmumford@chromium.org>
Cr-Commit-Position: refs/heads/master@{#562589}

Change-Id: I0d25d7a9f1383044d2436d8fcfb81c559d068297
Reviewed-on: https://chromium-review.googlesource.com/1077016Reviewed-by: John Chen <johnchen@chromium.org>
Commit-Queue: Caleb Rouleau <crouleau@chromium.org>
Cr-Commit-Position: refs/heads/master@{#562588}

In multi-window, the non-focused window will have the state of
paused even though it is fully visible.  So look for resumed only
when in non-multi-window, but accept paused when in multi-window.

This differs from MultiWindowUtils.isActivityVisible because that
only mentions visibility, but I am aiming for visible and not
occluded.

BUG=845785,844787

Change-Id: Ifcca3784b899a4a19132b3b57efd5227dc2b3e90
Reviewed-on: https://chromium-review.googlesource.com/1076894Reviewed-by: Theresa <twellington@chromium.org>
Commit-Queue: Ted Choc <tedchoc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#562587}

The test is currently flaky on the Mac trybot.

Bug: 847565
Change-Id: Ic40919118fcd7a2bbc0c0d34a33fac9c3c554aea
Tbr: falken@chromium.org
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/1077198Reviewed-by: Adithya Srinivasan <adithyas@chromium.org>
Commit-Queue: Adithya Srinivasan <adithyas@chromium.org>
Cr-Commit-Position: refs/heads/master@{#562586}

https://chromium.googlesource.com/chromiumos/platform/system_api.git/+log/f6223168d99e..55139d2ab617

$ git log f6223168d..55139d2ab --date=short --no-merges --format='%ad %ae %s'
2018-05-22 jkardatzke Added constants/proto for vm_cicerone
2018-05-22 baileyberro system_api: Add SmbProvider::ParseNetBiosPacket to DBus
2018-05-18 tbarzic Add demo_session_apps_path to UpgradeArcContainer request
2018-05-22 cmtm arc: Remove StartArcInstance dbus method
2018-05-15 smbarber vm_concierge: add LaunchVshd method
2018-05-21 smbarber vm_concierge: export goprotos as system_api/vm_concierge_proto

Created with:
  roll-dep src/third_party/cros_system_api

Change-Id: I794ebf5dd85d21f41b782ed84e5cfe1ac428b0fd
Reviewed-on: https://chromium-review.googlesource.com/1076677Reviewed-by: Dan Erat <derat@chromium.org>
Commit-Queue: Jeffrey Kardatzke <jkardatzke@google.com>
Cr-Commit-Position: refs/heads/master@{#562585}

Bug: 842456
Change-Id: I8f0c17cd50c75987c051e62344ac5e907e1b1133
Reviewed-on: https://chromium-review.googlesource.com/1065463Reviewed-by: Misha Efimov <mef@chromium.org>
Commit-Queue: Paul Jensen <pauljensen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#562584}

This fixes the test, but not the underlying problem. A separate bug
has been created to track this

TBR=junov

Bug: 810437,847594
Change-Id: Id142b936af3378385b4fcc199ed193f5a0fb2241
Reviewed-on: https://chromium-review.googlesource.com/1077098Reviewed-by: Fernando Serboncini <fserb@chromium.org>
Commit-Queue: Fernando Serboncini <fserb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#562583}

https://chromium.googlesource.com/breakpad/breakpad.git/+log/c83fcf647..27c001192

$ git log c83fcf647..27c001192 --date=short --no-merges --format='%ad %ae %s'
2018-05-27 mmoroz@chromium.org Add SEVERITY_CRITICAL to logging, that would help to suppress logs from the fuzz target.
2018-04-13 thestig@chromium.org Read Linux si_code in minidump_processor.

Bug: 846721
Change-Id: Ib7d34a0dd393951be8ab6e30d0c5f341fed3389b
Reviewed-on: https://chromium-review.googlesource.com/1077078Reviewed-by: Will Harris <wfh@chromium.org>
Commit-Queue: Max Moroz <mmoroz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#562582}

Bug: 806987
Change-Id: Ib243063242efccf5469223804b2f569f7973bbd5
Reviewed-on: https://chromium-review.googlesource.com/1076321Reviewed-by: Jesse Doherty <jwd@chromium.org>
Commit-Queue: Roger McFarlane <rogerm@chromium.org>
Cr-Commit-Position: refs/heads/master@{#562581}

My regex wasn't complete in https://chromium-review.googlesource.com/1062830
now there are warnings on 180 metrics as desired (182 identified @
https://bugs.chromium.org/p/chromium/issues/detail?id=807615#c19 minus
the 2 fixed in initial CL).

R=mpearson@chromium.org

Bug: 807615
Change-Id: I4ef7ac8cf84b2a7e2222d3cb06d79aeb07de8108
Reviewed-on: https://chromium-review.googlesource.com/1069850Reviewed-by: Mark Pearson <mpearson@chromium.org>
Commit-Queue: Gabriel Charette <gab@chromium.org>
Cr-Commit-Position: refs/heads/master@{#562580}

All properties are now Ribbonized, so we don't need to generate a massive
switch statement anymore.

R=futhark@chromium.org

      another code generated.

Note: make_style_builder.py has been kept, because it's actually imported
Bug: 751354
Change-Id: I952fc4e30dff3f42ed0e926cd7e4d7ab60705794
Reviewed-on: https://chromium-review.googlesource.com/1076328
Commit-Queue: Anders Ruud <andruud@chromium.org>
Reviewed-by: Rune Lillesveen <futhark@chromium.org>
Cr-Commit-Position: refs/heads/master@{#562579}

The problem was that if you call hitTestWithReply on a node in one tree
(like the desktop, typically the most logical place to call it), it was
storing the callback in a map specific to that try. But then when the hit
test result came back via an event on the correct target node, that node
might be in a different tree - and that tree had its own map from action IDs
to callbacks.

Tested by manually calling desktop.hitTestWithReply with coordinates in
the middle of the feedback link on the www.chromevox.com homepage.

Bug: 818108
Change-Id: I5b995f381f6e260ddcb0f7a1f58a64d0682af949
Reviewed-on: https://chromium-review.googlesource.com/1074490
Commit-Queue: Dominic Mazzoni <dmazzoni@chromium.org>
Reviewed-by: David Tseng <dtseng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#562578}

This change makes the button a little smaller with less buffer white
space around it.

Bug: None
Change-Id: I6bb7bb6e2ee6f773c7c85019055abbc694a5d312
Reviewed-on: https://chromium-review.googlesource.com/1075852Reviewed-by: Mounir Lamouri <mlamouri@chromium.org>
Commit-Queue: apacible <apacible@chromium.org>
Cr-Commit-Position: refs/heads/master@{#562577}

Follow up on this comment: https://chromium-review.googlesource.com/c/chromium/src/+/1068665/13/services/resource_coordinator/public/mojom/page_signal.mojom#18

Change-Id: Ib930db9c0326c9fae8cd7c2bf8b771d5a196c164
Reviewed-on: https://chromium-review.googlesource.com/1076897Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Reviewed-by: Chris Hamilton <chrisha@chromium.org>
Commit-Queue: Sébastien Marchand <sebmarchand@chromium.org>
Cr-Commit-Position: refs/heads/master@{#562576}

- Add extra return values to NetworkContext::CreateTCPConnectedSocket, because
//extensions depends on the ability to get local address and peer address
synchronously.
- Add a network::mojom::SSLConfig to UpgradeToTLS() because //extensions depends
on the ability to configure max and min tls version.
- Add two non-pure virtual methods (SetNoDelay and SetKeepAlive) to
net/socket/transport_client_socket.h, so I can mock out those in tests using
mock socket data (net::MockClientSocket is a subclass of
net::TransportClientSocket).

Bug: 721401
Cq-Include-Trybots: master.tryserver.chromium.linux:linux_mojo
Change-Id: I2019d783b29ff0d68dbea95fb7a0f2d5e81a70fd
Reviewed-on: https://chromium-review.googlesource.com/1073191Reviewed-by: Matt Menke <mmenke@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Maks Orlovich <morlovich@chromium.org>
Commit-Queue: Helen Li <xunjieli@chromium.org>
Cr-Commit-Position: refs/heads/master@{#562575}

This makes custom properties _almost_ normal w.r.t. style building.
As long as we DCHECK that the value is not initial/inherit before
applying, we can treat it as any other CSSProperty.

R=futhark@chromium.org

Bug: 751354
Change-Id: I2009320d95e1371df550fd2a55d7d561042d2061
Reviewed-on: https://chromium-review.googlesource.com/1076327
Commit-Queue: Anders Ruud <andruud@chromium.org>
Reviewed-by: Rune Lillesveen <futhark@chromium.org>
Cr-Commit-Position: refs/heads/master@{#562574}

This may have caused the crash in crbug/847026

Bug: 847026
Cq-Include-Trybots: luci.chromium.try:ios-simulator-full-configs;master.tryserver.chromium.mac:ios-simulator-cronet
Change-Id: Ia3b4a4a756aec2898f8933173a61bdb097f935b5
Reviewed-on: https://chromium-review.googlesource.com/1076672Reviewed-by: Eugene But <eugenebut@chromium.org>
Commit-Queue: Mohammad Refaat <mrefaat@chromium.org>
Cr-Commit-Position: refs/heads/master@{#562573}

decltype of a ternary operator between const ref and a temporary value
is a const value. Which is copied into another temporary and then the const ref
extends it's lifetime.

The intention in the code seems to be to avoid copying match in a common case.

This patch does it in propper way.

Change-Id: Id4e41cd12b4bc76b8439b459a61603af30c1c8f3
Reviewed-on: https://chromium-review.googlesource.com/1076628Reviewed-by: Mark Pearson <mpearson@chromium.org>
Commit-Queue: Denis Yaroshevskiy <dyaroshev@yandex-team.ru>
Cr-Commit-Position: refs/heads/master@{#562572}

Mash (out-of-process ash) doesn't have a CursorClient yet. We'll have
one in a few weeks as we switch to ws2 (window server as a library
built into ash), so just early exit on null.

Bug: 847557, 631103
Test: chrome --enable-features=Mash can login on device
Change-Id: I3190785c218b455652151acad213fef94e85beec
Reviewed-on: https://chromium-review.googlesource.com/1077074Reviewed-by: David Reveman <reveman@chromium.org>
Commit-Queue: James Cook <jamescook@chromium.org>
Cr-Commit-Position: refs/heads/master@{#562571}

AssistantBubbleView should be concerned with choreography of its child
views, not their specific implementations.

Will also make it easier to unit test view classes in isolation.

Note that this CL also creates a constants file for Assistant UI.

Bug: b:80245607
Change-Id: I05be99e93383c5df61c279a54b811a03a8a3cb29
Reviewed-on: https://chromium-review.googlesource.com/1072147Reviewed-by: Xiaohui Chen <xiaohuic@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Commit-Queue: David Black <dmblack@google.com>
Cr-Commit-Position: refs/heads/master@{#562570}

This reverts commit b591d330.

Reason for revert:

Findit (https://goo.gl/kROfz5) identified CL at revision 562448 as the
culprit for failures in the build cycles as shown on:
https://findit-for-me.appspot.com/waterfall/culprit?key=ag9zfmZpbmRpdC1mb3ItbWVyRAsSDVdmU3VzcGVjdGVkQ0wiMWNocm9taXVtL2I1OTFkMzMwMzA4NzI5ZmU3OTBmMTg5M2Y3ODk2ZGE3YzVlNTlkN2IM

Sample Failed Build: https://ci.chromium.org/buildbot/chromium.memory/Linux%20MSan%20Tests/10089

Sample Failed Step: net_unittests

Original change's description:
> Don't call GetOrCreateGroup until we need a group
> 
> Bug: 830917
> Change-Id: I52deae4c68054b0dcef62b18e7b263830b438162
> Reviewed-on: https://chromium-review.googlesource.com/1010507
> Commit-Queue: Brad Lassey <lassey@chromium.org>
> Reviewed-by: Matt Menke <mmenke@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#562448}

Change-Id: I3064c71c087498a908ab9380b560290a3f38b49a
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 830917
Reviewed-on: https://chromium-review.googlesource.com/1077033
Cr-Commit-Position: refs/heads/master@{#562569}

TBR=eseckler@chromium.org

Change-Id: If3d1d379e145091264f6f2110de1046c860c8cfe
Reviewed-on: https://chromium-review.googlesource.com/1076973
Commit-Queue: Dmitry Gozman <dgozman@chromium.org>
Reviewed-by: Pavel Feldman <pfeldman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#562568}

Change-Id: I422b4fb9d65ab231e9736a890d292d7e2889c270
Reviewed-on: https://chromium-review.googlesource.com/1077084Reviewed-by: Pavel Feldman <pfeldman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#562567}

- Combine the original paint and raster invalidation tests in
  - box_paint_invalidator_test.cc
  - paint_invalidation_test.cc
  - raster_invalidation_test.cc
  into paint_and_raster_invalidation_test.cc.

- Make the moved tests as well as CaretDisplayItemClientTest work for
  SPv175, BlinkGenPropertyTrees and SPv2.

- Remove SPv1 paint test configuration and code path in the changed
  code.

- Fix two small bugs to make the all the tests pass:
  - Make the child frame not initially throttled when it is set
    HTML contents. Previously the child frame will skip painting
    because it's always in the initial-throttled state.
  - Avoid invalidation on invisible scrollbar change.

Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.linux:linux_layout_tests_slimming_paint_v2
Change-Id: I1bf491c2ca17d89f967b2989829d6ba871c844c6
Reviewed-on: https://chromium-review.googlesource.com/1075807
Commit-Queue: Xianzhu Wang <wangxianzhu@chromium.org>
Reviewed-by: Philip Rogers <pdr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#562566}

    U+0E1E (พ) => w
    U+0E9E (ພ) => w
    U+0E9F (ຟ) => w

    U+0EA3 (ຣ) => s
    U+0EAE (ຮ) => s

    U+0E1A (บ) => u
    U+0E9A (ບ) => u

    Note that U+0E1F(ฟ) and U+0E23 (ร) were added a while ago.

BUG=833143
TEST=components_unittests --gtest_filter=*IDN*

Change-Id: I882e7d272cdca1d80aa23be94b4d7906ff8653c1
Reviewed-on: https://chromium-review.googlesource.com/1058710Reviewed-by: Peter Kasting <pkasting@chromium.org>
Commit-Queue: Jungshik Shin <jshin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#562565}

Merge internal change: 197832805

R=rch@chromium.org

Change-Id: I2f583a74507647737b330921b25488dc0053e957
Reviewed-on: https://chromium-review.googlesource.com/1070804Reviewed-by: Ryan Hamilton <rch@chromium.org>
Commit-Queue: Bin Wu <wub@chromium.org>
Cr-Commit-Position: refs/heads/master@{#562564}

https://chromium.googlesource.com/angle/angle.git/+log/c2014bc..316c606


git log c2014bc..316c606 --date=short --no-merges --format='%ad %ae %s'
2018-05-29 jmadill@chromium.org Vulkan: Call GraphResource instead of GraphNode.
2018-05-29 geofflang@chromium.org Return a program binary size of 0 when the program is not linked.

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

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=jmadill@chromium.org

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

This CL adds an additional fullscreen viewport adjustment experiment.
In this approach, the WKWebView's frame is translated up and down to
account for the bottom inset created by the secondary toolbar.
Meanwhile, the top safe area inset is adjusted to push the top of the
rendered viewport below the toolbars.

Bug: none
Cq-Include-Trybots: luci.chromium.try:ios-simulator-full-configs;master.tryserver.chromium.mac:ios-simulator-cronet
Change-Id: Idb3ae9fb11ca2b35ee5219a52f9e08aa14363a7b
Reviewed-on: https://chromium-review.googlesource.com/1066975
Commit-Queue: Kurt Horimoto <kkhorimoto@chromium.org>
Reviewed-by: Justin Cohen <justincohen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#562562}

Fix table of contents indentation.

Change-Id: I245c2bc0ac2fcdf3bc7e4234db809a778dd2dc5b
Reviewed-on: https://chromium-review.googlesource.com/1076682Reviewed-by: Ilya Sherman <isherman@chromium.org>
Commit-Queue: Ilya Sherman <isherman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#562561}

Fixes a CHECK failure in Zucchini Apply found by ClusterFuzz.

Scenario:
A disassembler parses an image element and shrinks it to be the
understood size. Apply expects that this understood size is identical to
the size of the element it is trying to patch. This expectation will
always hold for "good" patch data but for an arbitary patch may not.
This results in a CHECK failure when getting reference writers.

Solution:
After parsing, check that the disassembler sizes match their respective
image sizes. Fail to Apply and print an error message if this is not the
case.

Bug: 847278
Change-Id: I96edb738b8f9ea2d16193ea1aa2def7319ee8f70
Reviewed-on: https://chromium-review.googlesource.com/1076369
Commit-Queue: Calder Kitagawa <ckitagawa@chromium.org>
Reviewed-by: Samuel Huang <huangs@chromium.org>
Cr-Commit-Position: refs/heads/master@{#562560}

The include structure has changed in libaom.

Bug: 783519
Change-Id: Ibea981e41e25ef5aa18c3c840b6ebfae9ceee526
Reviewed-on: https://chromium-review.googlesource.com/1074797Reviewed-by: Johann Koenig <johannkoenig@google.com>
Commit-Queue: Johann Koenig <johannkoenig@google.com>
Cr-Commit-Position: refs/heads/master@{#562559}

When users choose not to prompt the download location dialog. We still
prompt the dialog. This is caused by two reasons:

1. The pref is persisted when user click the download button. Instead,
the pref should also be persisted when users click on the checkbox.

2. When exisiting file results in file name conflict, we didn't check
the pref.

Bug: 845311
Change-Id: I8a3bf53cbb9edcd5905003b5739400243977e55a
Reviewed-on: https://chromium-review.googlesource.com/1074378
Commit-Queue: Xing Liu <xingliu@chromium.org>
Reviewed-by: Min Qin <qinmin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#562558}

And fix diagnose_bloat.py regexp that extracts summary
from supersize output

Bug: 702625
Change-Id: Ib8941a2cb84c18d02dd980e4725f44ea6ed4fcb7
Reviewed-on: https://chromium-review.googlesource.com/1071708
Commit-Queue: agrieve <agrieve@chromium.org>
Reviewed-by: Eric Stevenson <estevenson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#562557}

We only print bindings in DEBUG build. However, we generate code for
printing bindings in release build for each new binding we create.
This CL simply hides all printing related code behind DEBUG build. It
reduces the native binary size about 20k.

Bug: NONE
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;master.tryserver.chromium.linux:linux_vr
Change-Id: Ie6b6c6148369717b89c1e4f68336c0950954cc06
Reviewed-on: https://chromium-review.googlesource.com/1076308
Commit-Queue: Biao She <bshe@chromium.org>
Commit-Queue: Christopher Grant <cjgrant@chromium.org>
Reviewed-by: Christopher Grant <cjgrant@chromium.org>
Cr-Commit-Position: refs/heads/master@{#562556}

We use a change observer to trigger updating the selected mode of a
display. This is useful for the drop down menu we use to select the mode
on external displays. However, if display zoom is disabled, we show a
slider instead of a drop down. The slider triggers the same pref value
change even if the user is still dragging it. This causes a usability
regression on the settings resolution slider.

To fix this, the patch adds a check which ensures we only listen to
events fired due to releasing the slider when display zoom is disabled.

Bug: 845712
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: I9965bdf3121289ac29f38175cc9ad179cda41497
Component: Display settings, resolution slider
Reviewed-on: https://chromium-review.googlesource.com/1069773
Commit-Queue: Malay Keshav <malaykeshav@chromium.org>
Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#562555}

Change-Id: I16161b7a07ed8291bb252f81cd568c3cf847c402
Reviewed-on: https://chromium-review.googlesource.com/1075311Reviewed-by: Matthew Jones <mdjones@chromium.org>
Commit-Queue: Marcin Wiącek <marcin@mwiacek.com>
Cr-Commit-Position: refs/heads/master@{#562554}

This change adds the capability to request a hit-test
on an XRSession. The session queries the magic window
provider to get any hits based on the given ray and
then resolves a promise with an array of hit results.

This test is added by https://crrev.com/c/1040880, which
will land immediately after this one.

Bug: 833633
Test: third_party/WebKit/LayoutTests/xr/ar_hittest.html
Change-Id: I225297bcf052765f156790a588eafb817ed75e08
Reviewed-on: https://chromium-review.googlesource.com/1018524
Commit-Queue: Max Rebuschatis <lincolnfrog@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Reviewed-by: Brandon Jones <bajones@chromium.org>
Reviewed-by: David Dorwin <ddorwin@chromium.org>
Reviewed-by: Ian Vollick <vollick@chromium.org>
Reviewed-by: Bill Orr <billorr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#562553}

Bug: 843511,845598
Change-Id: I17b82fb59da08c5522148d5bf57d8c8bbad9b6d6
Reviewed-on: https://chromium-review.googlesource.com/1069228
Commit-Queue: Nico Weber <thakis@chromium.org>
Reviewed-by: Ian Vollick <vollick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#562552}