GitLab

Re-enables this test with the Network Service enabled.

This test did some things which the Network Service does not support and
does not need to support, or which otherwise made testing with the
Network Service more complex than necessary. The following changes have
been made:

  * We no longer attempt to load a network resource from a WebUI
    renderer. This will not be supported with Network Service and is no
    longer desirable to have working in production anyway. There should
    no longer be any WebUI pages making network requests.

  * Use http instead of https for the clients1.google.com requests. This
    allows such requests to be handled by the EmbeddedTestServer which
    already exists in BrowserTestBase, which is itself not configured to
    handle HTTPS requests. Since these requests are filtered by
    hostname, the scheme doesn't matter.

  * Switch the test to use a SimpleURLLoader instead of a
    FakeURLFetcher. This allows the test code to exercise the same
    behavior with or without the Network Service enabled.

Bug: 721414
Cq-Include-Trybots: master.tryserver.chromium.linux:linux_mojo
Change-Id: Iad1f2deaec2e218b9cb168acbe71c90591dc6acf
Reviewed-on: https://chromium-review.googlesource.com/972425
Commit-Queue: Ken Rockot <rockot@chromium.org>
Reviewed-by: Karan Bhatia <karandeepb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548137}

R=amineer@chromium.org

Change-Id: I06af051b9a45032b3196c2eead751d5c8c4dc398
Reviewed-on: https://chromium-review.googlesource.com/996396Reviewed-by: Krishna Govind <govind@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548136}

Bug: 734095
Change-Id: Id6812f667fffe493e5f846e59fa7783d104bb930
Reviewed-on: https://chromium-review.googlesource.com/993399Reviewed-by: Greg Thompson <grt@chromium.org>
Commit-Queue: Xi Cheng <chengx@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548135}

This change adds an overloaded GetProvidedFileSystemInfoList() method
that takes a ProviderId as a parameter, and returns a vector containing
only FileSystemInfo entries for a specific Provider.

This change also modifies the FileSystemProvider API to use this new
function to reduce code duplication.

Bug: chromium:757625
Change-Id: I5426f6768f12a3347aa8b196d2c1804b4f1ed01d
Reviewed-on: https://chromium-review.googlesource.com/986943
Commit-Queue: Bailey Berro <baileyberro@chromium.org>
Reviewed-by: Naoki Fukino <fukino@chromium.org>
Reviewed-by: Zentaro Kavanagh <zentaro@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548134}

https://chromium.googlesource.com/catapult.git/+log/23d04ac91acd..a13166acf03f

$ git log 23d04ac91..a13166acf --date=short --no-merges --format='%ad %ae %s'
2018-04-04 ashleymarie Updating how we save story duration

Created with:
  roll-dep src/third_party/catapult
BUG=chromium:713357


The AutoRoll server is located here: https://catapult-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.


TBR=sullivan@chromium.org

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

Implement an in-memory queue for UserEventSyncBridge to keep user consent
events while the store or change processor are not ready yet. The queue
will be processed as soon as store and change processor are initialized.

Bug: 781765

Change-Id: I0a7fb25d66dce548c0f1ae9cf5f99e869ea54ddc
Reviewed-on: https://chromium-review.googlesource.com/980975Reviewed-by: Gayane Petrosyan <gayane@chromium.org>
Reviewed-by: Mihai Sardarescu <msarda@chromium.org>
Reviewed-by: Martin Šrámek <msramek@chromium.org>
Reviewed-by: Mikel Astiz <mastiz@chromium.org>
Commit-Queue: Christian Dullweber <dullweber@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548132}

This reduces randomness in the build by making our dependency
sorting a stable sort.

Bug: 828528, 828508
Change-Id: Ibf0f1de0d77333cdee575560912728e47b8f292e
Reviewed-on: https://chromium-review.googlesource.com/994545
Commit-Queue: agrieve <agrieve@chromium.org>
Reviewed-by: Samuel Huang <huangs@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548131}

We should cover plugins with greater delays.

Bug: None
Test: None
Change-Id: I6ffcc83c0dbef55fd2f1f7eea8731f1b5d6b5ca2
Reviewed-on: https://chromium-review.googlesource.com/996233Reviewed-by: Kenneth MacKay <kmackay@chromium.org>
Commit-Queue: Michael Montvelishsky <mont@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548130}

User Interface document was moved into Apps during merge.
This update moves it under Extensions.

Bug: None
Change-Id: Ic7a3f53ac24f3b4949940eb237cb572d3420202f
Reviewed-on: https://chromium-review.googlesource.com/996237Reviewed-by: Meggin Kearney <mkearney@chromium.org>
Commit-Queue: Crystal Lambert <crystallambert@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548129}

https://chrome-internal.googlesource.com/chrome/src-internal.git/+log/5e34303e0ea1..78ba74d75584

$ git log 5e34303e0..78ba74d75 --date=short --no-merges --format='%ad %ae %s'

Created with:
  roll-dep src-internal
BUG=chromium:None


The AutoRoll server is located here: https://src-internal-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.


TBR=mmoss@chromium.org

Change-Id: I6db3da49bf515993575c7ccb02d4ae5b8f801fb7
Reviewed-on: https://chromium-review.googlesource.com/995587Reviewed-by: src-internal-chromium-autoroll <src-internal-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Commit-Queue: src-internal-chromium-autoroll <src-internal-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Cr-Commit-Position: refs/heads/master@{#548128}

https://webrtc.googlesource.com/src.git/+log/8058fbbd6bc0..448f4d50dc75

$ git log 8058fbbd6..448f4d50d --date=short --no-merges --format='%ad %ae %s'

Created with:
  roll-dep src/third_party/webrtc
BUG=chromium:None,chromium:none,chromium:none,chromium:none,chromium:none,chromium:None


The AutoRoll server is located here: https://webrtc-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=master.tryserver.chromium.linux:linux_chromium_archive_rel_ng;master.tryserver.chromium.mac:mac_chromium_archive_rel_ng;master.tryserver.chromium.win:win-msvc-dbg
TBR=webrtc-chromium-sheriffs-robots@google.com

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

This de-duplicates logic that appears in CastWebContentsActivity
and CastWebContentsFragment, and allows some of the complicated
procedural logic that appeared in CastWebContentsActivity's
handleIntent() method to be expressed in a purely reactive
paradigm.

Added tests for Intent handling in CastWebContentsActivity.

To make a clean, readable way to express that duplicate Intents
should be deleted, this patch adds a unique() method to
Observable, which creates an Observable that will not activate
if its source is activated with a value that is equivalent to
the previous activation value.

To make the implementation of this new method readable, first()
and changes() methods were also added to Observable. These are
likely to be useful elsewhere.

Bug: Internal b/36777136
Test: cast_base_junit_tests, cast_shell_junit_tests
Change-Id: I42871ef4bcd5b20cba813edf5ef92e0a255bb1d8
Reviewed-on: https://chromium-review.googlesource.com/957873
Commit-Queue: Simeon Anfinrud <sanfin@chromium.org>
Reviewed-by: Luke Halliwell <halliwell@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548126}

This change uses AllResponsesConsumed in the bluetooth Web Platform
Tests in order to make sure we have consumed all the anticipatory
responses that we've set on our fakes.

BUG=569709

Change-Id: I9767792fcd5dda71fabf2f8941638f744aefa2dc
Reviewed-on: https://chromium-review.googlesource.com/988422
Commit-Queue: Conley Owens <cco3@chromium.org>
Reviewed-by: Giovanni Ortuño Urquidi <ortuno@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548125}

The Xbox One rumble data packet was incorrectly specified, and swapped
the positions of the strong_magnitude and weak_magnitude parameters.
This caused effects intended for the "weak" vibration motor to be played
on the "strong" motor and vice versa.

BUG=826637

Change-Id: I39a1afe093cd858b7f5e65f60e5c54a010e6012a
Reviewed-on: https://chromium-review.googlesource.com/994254Reviewed-by: Brandon Jones <bajones@chromium.org>
Commit-Queue: Matt Reynolds <mattreynolds@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548124}

This is one more identical change as https://chromium-review.googlesource.com/c/chromium/src/+/986535
in chrome/browser/ui/views which I'd missed in that CL.

TBR=sky@chromium.org

Bug: 825327
Change-Id: I6e3c8a1dbf0028c842fce9db1e4e1d4e648974f2
Reviewed-on: https://chromium-review.googlesource.com/996152Reviewed-by: Gabriel Charette <gab@chromium.org>
Commit-Queue: Gabriel Charette <gab@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548123}

For enterprise users(especially GSuite users in PhishGuard Enterprise v1),
PhishGuard's modal dialog warning text and the
page info security detail text should include ORG_NAME.

This also means for signed-in users, we need to check whether the
password reuse happens on the account matches enterprise policy before
showing the warning.

Bug: 824502
Change-Id: Ifeba7ce5f88c279e8463f1009f67e3e0f69bc5d4
Reviewed-on: https://chromium-review.googlesource.com/981307Reviewed-by: Patti <patricialor@chromium.org>
Reviewed-by: Julian Pastarmov <pastarmovj@chromium.org>
Reviewed-by: Elly Fong-Jones <ellyjones@chromium.org>
Reviewed-by: Ted Choc <tedchoc@chromium.org>
Reviewed-by: Varun Khaneja <vakh@chromium.org>
Reviewed-by: Nathan Parker <nparker@chromium.org>
Commit-Queue: Jialiu Lin <jialiul@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548122}

This updates 6 generated descriptor/*/gen-io-op-disconnect-*
tests to use getUserDescriptionDescriptor(), etc.

BUG=509038

Change-Id: I997897747c7da2374ac2a0497f9a23e32fa170d2
Reviewed-on: https://chromium-review.googlesource.com/985393
Commit-Queue: Conley Owens <cco3@chromium.org>
Reviewed-by: Giovanni Ortuño Urquidi <ortuno@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548121}

This ensures that property tree state for the sticky elements are updated
properly, to subsequently be used in hit testing and paint.

Bug:827224

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

TBR=ajuma

Change-Id: Id53cf594550396205858c3dcaf77d99fba0960d9
Reviewed-on: https://chromium-review.googlesource.com/994064
Commit-Queue: Robert Ma <robertma@chromium.org>
Reviewed-by: Robert Ma <robertma@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548119}

Just one more step in Removing the Physical Web from Chrome.

BUG=826540

Change-Id: I6d413b2d0b3257a9d38a86ab09eb82ff0f42f127
Reviewed-on: https://chromium-review.googlesource.com/988804Reviewed-by: Matt Reynolds <mattreynolds@chromium.org>
Reviewed-by: Tommy Nyquist <nyquist@chromium.org>
Reviewed-by: Colin Blundell <blundell@chromium.org>
Reviewed-by: Bernhard Bauer <bauerb@chromium.org>
Commit-Queue: Conley Owens <cco3@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548118}

TBR=nodir@chromium.org
BUG=chromium:815092
BUG=chromium:828131

Change-Id: Idaca8cd41d96aef948ad9dd72bc8ee9ba23a33d5
Reviewed-on: https://chromium-review.googlesource.com/993692Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548117}

BUG=825431

Cq-Include-Trybots: master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:ios-simulator-full-configs
Change-Id: I95f5f986900aa31f4a484a36c0fbd789cf2b3c5e
Reviewed-on: https://chromium-review.googlesource.com/995916Reviewed-by: edchin <edchin@chromium.org>
Commit-Queue: Rohit Rao <rohitrao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548116}

The imported 3pp code has been cleaned and translated to C++.
Build targets will be added in a separate CL.

Bug: webrtc:9076
Change-Id: Ia53a042a842db734199271691c7b7c26e09b8ae0
Reviewed-on: https://chromium-review.googlesource.com/983557Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Ale Bzk <alessiob@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548115}

- GetAccessibleName()
- IsOpeningSettingsSupported()

These two methods represent fields that are already present in
message_center::Notification.

This also gets rid of ArcNotificationContentViewDelegate in favor
of having the ArcNotificationView create and maintain a reference
to the ArcNotificationContentView directly.


Change-Id: Ifcad792f38902b567f71665046c0d9ba02d74305
Bug: 768439
Reviewed-on: https://chromium-review.googlesource.com/969541
Commit-Queue: Evan Stade <estade@chromium.org>
Reviewed-by: Yoshiki Iguchi <yoshiki@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548114}

This reverts commit 0e554b21.

Reason for revert: Two crash reports already on the morning of the new Canary.

Original change's description:
> Add CHECK in Job::SetSpdyHttpStreamOrBidirectionalStreamImpl().
> 
> Bug: 819101
> Change-Id: I6618354362d7454ad4ffa69d383ef739895932d4
> Reviewed-on: https://chromium-review.googlesource.com/990512
> Commit-Queue: Bence Béky <bnc@chromium.org>
> Reviewed-by: Ryan Hamilton <rch@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#547694}

TBR=rch@chromium.org,bnc@chromium.org

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

Bug: 828865
Change-Id: If00bd7afc74680126998cecefd67fe21201cdc13
Reviewed-on: https://chromium-review.googlesource.com/995852Reviewed-by: Bence Béky <bnc@chromium.org>
Commit-Queue: Bence Béky <bnc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548113}

Typo from https://chromium-review.googlesource.com/959445.

Bug: 802963
Change-Id: Ide52935d3a4b2bdbf2d3f29cf67893bd7b54ce10
Reviewed-on: https://chromium-review.googlesource.com/985131Reviewed-by: Donn Denman <donnd@chromium.org>
Reviewed-by: Theresa <twellington@chromium.org>
Commit-Queue: Donn Denman <donnd@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548112}

This is a follow up on crrev.com/c/982646

Bug: 796334
Change-Id: I63b04d2f2ab61ef1d9a45f3d360df5f1e1290959
Reviewed-on: https://chromium-review.googlesource.com/988742Reviewed-by: Naoki Fukino <fukino@chromium.org>
Reviewed-by: Zentaro Kavanagh <zentaro@chromium.org>
Commit-Queue: Bailey Berro <baileyberro@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548111}

Change-Id: Ibe413cfc3e46c24a865ea90213125761836de95f
Reviewed-on: https://chromium-review.googlesource.com/991603Reviewed-by: Wei-Yin Chen (陳威尹) <wychen@chromium.org>
Reviewed-by: Vasilii Sukhanov <vasilii@chromium.org>
Commit-Queue: Alex Chu <alexchu@google.com>
Cr-Commit-Position: refs/heads/master@{#548110}

This is a precursor for an upcoming change that will split the public bits
of the MessageLoop class (used through MessageLoop(ForUI|IO)::current())
to another class.

Bug: 825327
Change-Id: I3cda2a0e1b2ff48aaeeaeeb68d99c5dda926350f
Reviewed-on: https://chromium-review.googlesource.com/978776
Commit-Queue: Gabriel Charette <gab@chromium.org>
Reviewed-by: kylechar <kylechar@chromium.org>
Reviewed-by: danakj <danakj@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548109}

Bug: 827551
Change-Id: I134199ca4538f469fc29d0b315a9e36f72e8df80
Reviewed-on: https://chromium-review.googlesource.com/982611Reviewed-by: Balazs Engedy <engedy@chromium.org>
Commit-Queue: Adam Langley <agl@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548108}

Noticed the script was complaining of unknown sections:
  .gnu.hash
  .note.android.ident
  .note.crashpad.info

Change-Id: I546325135fab4a334ff9a16c635fe86cc6ef4c47
Reviewed-on: https://chromium-review.googlesource.com/995955Reviewed-by: Peter Wen <wnwen@chromium.org>
Commit-Queue: agrieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548107}

Modifiers specified as:
{ ctrl: true }
worked, but
{ ctrl: false }

got interpreted as having ctrl down (as the code only checked the presence of the value and not its boolean state).

Change-Id: Icec8959441c193d548fcaf45b163c41fdb351472
Reviewed-on: https://chromium-review.googlesource.com/985967
Commit-Queue: David Tseng <dtseng@chromium.org>
Reviewed-by: Devlin <rdevlin.cronin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548106}

It is now possible to get the same information from the returned buffer.

BUG=788243

Change-Id: I5e76eedb5b5539167f93b1d275007f33f82a1c2b
Reviewed-on: https://chromium-review.googlesource.com/977055Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Reviewed-by: Avi Drissman <avi@chromium.org>
Reviewed-by: Wei Li <weili@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548105}

When in tablet mode on Chrome OS, webpages should have a
mobile-like behavior such as:
- Shrink viewport contents to fit the window size.
- Mobile viewport style.

This also exposes WebContents::NotifyPreferencesChanged() so
that it's possible to trigger an update of all RVHs associated
with a WebContents including OOPIFs

BUG=822455,828697
TEST=browser_tests --gtest_filter=TabletModePageBehaviorTest.*

Change-Id: Id80316fdb7c504a8a6f40ca9127c13ca58a9eee9
Reviewed-on: https://chromium-review.googlesource.com/978519
Commit-Queue: Ahmed Fakhry <afakhry@chromium.org>
Reviewed-by: Alex Moshchuk <alexmos@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548104}

This replaces external reference of Assistant logo in OOBE OptIn to
internal static icon.

Test: Manually
Bug: 828642
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: I9d0c42acf53095af14c31fc1d64ab5f4731a9509
Reviewed-on: https://chromium-review.googlesource.com/994732Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Commit-Queue: Yury Khmel <khmel@google.com>
Cr-Commit-Position: refs/heads/master@{#548103}

Also migrates //headless from its own unique_ptr<> based ProtocolHandler
map to use content::ProtocolHandlerMap.

Bug: 556939
Change-Id: I4ceea7f048542da1dd7a1f4a68d6ab91f75ff813
Reviewed-on: https://chromium-review.googlesource.com/989397
Commit-Queue: Wez <wez@chromium.org>
Reviewed-by: Sami Kyöstilä <skyostil@chromium.org>
Reviewed-by: Jochen Eisinger <jochen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548102}

FrameIsScrollableDidChange had a typo and always returned true. This
prevented an early-out in ScrollingCoordinator's
UpdateAfterCompositingChangeIfNeeded from being effective.

This patch should have no web-visible changes and should only improve
performance by making an early-out work.

Bug: 826883
Change-Id: Ic3bbac06b6cf7e6a1097a42ba43d1dfd35dcb0c6
Reviewed-on: https://chromium-review.googlesource.com/994546Reviewed-by: David Bokan <bokan@chromium.org>
Commit-Queue: Philip Rogers <pdr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548101}

... mostly by removing the inclusion of redundant header files.

Bug: 734095
Change-Id: Ibed243cbdedba4499a6e62f2b79d31cdbf77b535
Reviewed-on: https://chromium-review.googlesource.com/989396Reviewed-by: Finnur Thorarinsson <finnur@chromium.org>
Commit-Queue: Xi Cheng <chengx@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548100}

The modern media controls should not show what has been previously
cached on the left hand side of the play head. This pins the segment to
the zero position so it always is filled in.

BUG=827539

Change-Id: I97f5f06b7e349faf163667d2b19ef8930e0b13c7
Reviewed-on: https://chromium-review.googlesource.com/994180Reviewed-by: Tommy Steimel <steimel@chromium.org>
Reviewed-by: Mounir Lamouri <mlamouri@chromium.org>
Commit-Queue: Becca Hughes <beccahughes@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548099}

Do not migrate proxied connections for connectivity probing packets. Protected by existing flag FLAGS_quic_reloadable_flag_quic_enable_server_proxy.

Merge internal change: 191428948

R=rch@chromium.org

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