- 13 Apr, 2018 40 commits
-
-
Dale Curtis authored
Use WillRepeatedly() instead of WillOnce(). BUG=831566 TBR=chcunningham Change-Id: I2cebaebcfa5ff026c43d3c4a267f5d3653e91dae Reviewed-on: https://chromium-review.googlesource.com/1012699Reviewed-by:
Dale Curtis <dalecurtis@chromium.org> Commit-Queue: Dale Curtis <dalecurtis@chromium.org> Cr-Commit-Position: refs/heads/master@{#550717}
-
Dave Tapuska authored
Adjust ToggleFullscreen IPC to be two IPCs (Enter/Exit). Pass the options on the Enter IPC. This change is only plumbing necessary to get the options up to the content layer. A follow-on CL will be created that will modify the implementation of fullscreen on Android and plumbing at the WebContents layer. BUG=829937 Change-Id: I76ff73b6435bc6ae2ead57f06a98557a4961258d Reviewed-on: https://chromium-review.googlesource.com/999831 Commit-Queue: Dave Tapuska <dtapuska@chromium.org> Reviewed-by:
Avi Drissman <avi@chromium.org> Reviewed-by:
Daniel Cheng <dcheng@chromium.org> Reviewed-by:
Philip Jägenstedt <foolip@chromium.org> Cr-Commit-Position: refs/heads/master@{#550716}
-
Paul Irish authored
Change-Id: If64e6f5fc245da7d9bbb8d3925d004b545338b0a Reviewed-on: https://chromium-review.googlesource.com/993477 Commit-Queue: Paul Irish <paulirish@chromium.org> Reviewed-by:
Pavel Feldman <pfeldman@chromium.org> Cr-Commit-Position: refs/heads/master@{#550715}
-
Eric Stevenson authored
This CL adds the --step flag to make debugging large rolls more efficient. Also adds the --apply-patch flag to give users the ability to apply local patches before performing each build (not compatible with --cloud). Note that this doesn't work for patches to supersize; we copy supersize to a temp dir before modifying local state. Side note: using diagnose_bloat.py with CLs before and after the blink rename require "git config merge.renamelimit 20000". Bug: 831601 Change-Id: Ida5d0a879355e48c942dab07afd5489c36bca1ca Reviewed-on: https://chromium-review.googlesource.com/1011681Reviewed-by:
agrieve <agrieve@chromium.org> Commit-Queue: Eric Stevenson <estevenson@chromium.org> Cr-Commit-Position: refs/heads/master@{#550714}
-
Yafei Duan authored
Adding user action recording for P2P sharing: - When user shares page loaded in current tab from overflow menu. - When user shares pages from Download Home. - When user clicks on the reload button in the snackbar shown when an untrusted page is loaded. Bug: 758690 Change-Id: I1b5c4dae5d33fb84b363ca2b26b2c56eb58efcf0 Reviewed-on: https://chromium-review.googlesource.com/1009073Reviewed-by:
Peter Williamson <petewil@chromium.org> Reviewed-by:
Robert Kaplow <rkaplow@chromium.org> Reviewed-by:
Joy Ming <jming@chromium.org> Commit-Queue: Yafei Duan <romax@chromium.org> Cr-Commit-Position: refs/heads/master@{#550713}
-
Alessio Bazzica authored
Removing unneeded files. Bug: webrtc:9076 Change-Id: If54b612ef8c9e5c27f868ab039a340fbbc215445 Reviewed-on: https://chromium-review.googlesource.com/995934Reviewed-by:
Tom Sepez <tsepez@chromium.org> Commit-Queue: Ale Bzk <alessiob@chromium.org> Cr-Commit-Position: refs/heads/master@{#550712}
-
Daniel Bratell authored
There were two sets of message map macros, one with IsMsgHandled as a function, one with it as a macro. If combined in some translation unit that could cause compilation problems, and it did in some Opera builds. This patch changes the code so that there is only one implementation of the macros and it's the "safe" one, where "safe" means that it can handle that the underlying object is deleted inside a message handler without crashing. 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.win:win_optional_gpu_tests_rel Change-Id: I2f039d8d93a539c8322caa664e642956c5d6d372 Reviewed-on: https://chromium-review.googlesource.com/995896Reviewed-by:
Scott Violet <sky@chromium.org> Commit-Queue: Scott Violet <sky@chromium.org> Cr-Commit-Position: refs/heads/master@{#550711}
-
Andrey Kosyakov authored
This reverts commit 031b31c4. Reason for revert: triggers an assert on in devtools download interception tests with network service. Original change's description: > DevTools: fix interception for <a download='...'> downloads with network service > > Bug: 721408 > > Change-Id: I60f0cf81a69d7826d2043aa8222d2e69ff9e406a > Reviewed-on: https://chromium-review.googlesource.com/1006231 > Commit-Queue: Andrey Kosyakov <caseq@chromium.org> > Reviewed-by: Min Qin <qinmin@chromium.org> > Reviewed-by: Dmitry Gozman <dgozman@chromium.org> > Cr-Commit-Position: refs/heads/master@{#550690} TBR=dgozman@chromium.org,caseq@chromium.org,qinmin@chromium.org Change-Id: I51f1a7145faa59103ff06b537380745913af2cf2 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: 721408 Reviewed-on: https://chromium-review.googlesource.com/1012817Reviewed-by:
Andrey Kosyakov <caseq@chromium.org> Commit-Queue: Andrey Kosyakov <caseq@chromium.org> Cr-Commit-Position: refs/heads/master@{#550710}
-
Becca Hughes authored
The current MediaEnagementClient sends a bit to the renderer if the page has a high MEI score. We would like to use this for other things too but we need to send across more information (this is a precursor CL to crrev.com/c/962803). In order to do this properly this CL renames the existing interfaces to use a generic 'AutoplayConfiguration' name and sends flags instead of a single bool. BUG=821284 Change-Id: I509e35f52c57ae79817dc59eaa4a81fcf51e6310 Reviewed-on: https://chromium-review.googlesource.com/1010716 Commit-Queue: Becca Hughes <beccahughes@chromium.org> Reviewed-by:
Avi Drissman <avi@chromium.org> Reviewed-by:
Daniel Cheng <dcheng@chromium.org> Reviewed-by:
Mounir Lamouri <mlamouri@chromium.org> Cr-Commit-Position: refs/heads/master@{#550709}
-
Rohit Rao authored
BUG=805154 TEST=None Cq-Include-Trybots: master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:ios-simulator-full-configs Change-Id: Iaa70b4edc0e0cf69ad8d2fa00be867d56ccc7625 Reviewed-on: https://chromium-review.googlesource.com/1012164 Commit-Queue: Rohit Rao <rohitrao@chromium.org> Reviewed-by:
Sergio Collazos <sczs@chromium.org> Cr-Commit-Position: refs/heads/master@{#550708}
-
Alex Moshchuk authored
This reverts commit 21168346. Reason for revert: These tests were almost certainly fixed by the reverts in https://bugs.chromium.org/p/chromium/issues/detail?id=828529. Original change's description: > Disable flaky WebviewLogin Tests on ChromeOS. > > Disables: > WebviewLoginTest.StoragePartitionHandling > WebviewProxyAuthLoginTest.ProxyAuthTransfer > > Bug: 832608 > Change-Id: Ie5e2d9c8b0fd99fd3c018a004f8b7b0c567d8c38 > TBR: achuith@chromium.org > Reviewed-on: https://chromium-review.googlesource.com/1012036 > Reviewed-by: Ramin Halavati <rhalavati@chromium.org> > Commit-Queue: Ramin Halavati <rhalavati@chromium.org> > Cr-Commit-Position: refs/heads/master@{#550595} TBR=achuith@chromium.org,rhalavati@chromium.org Change-Id: I70215f566a19f05b8b7bea8ce867a5e47e5c417f No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: 832608 Reviewed-on: https://chromium-review.googlesource.com/1012757Reviewed-by:
Alex Moshchuk <alexmos@chromium.org> Commit-Queue: Alex Moshchuk <alexmos@chromium.org> Cr-Commit-Position: refs/heads/master@{#550707}
-
Maria Khomenko authored
This is no longer necessary since we only load partner bookmarks on demand now. Bug: 832371 Change-Id: Id6b76f7a8278aace0c682a00cd1d490e11311c73 Reviewed-on: https://chromium-review.googlesource.com/1011582Reviewed-by:
Ilya Sherman <isherman@chromium.org> Commit-Queue: Maria Khomenko <mariakhomenko@chromium.org> Cr-Commit-Position: refs/heads/master@{#550706}
-
https://pdfium.googlesource.com/pdfium.git/+log/7afdad5ab7a1..996c93068bfc $ git log 7afdad5ab..996c93068 --date=short --no-merges --format='%ad %ae %s' 2018-04-13 thestig Rename the other CPDF_Color::SetValue() variant. Created with: roll-dep src/third_party/pdfium The AutoRoll server is located here: https://pdfium-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=dsinclair@chromium.org Change-Id: Ie4bd6cf5456c533a4e8545517401abeed0b05e47 Reviewed-on: https://chromium-review.googlesource.com/1012135 Commit-Queue: pdfium-chromium-autoroll <pdfium-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com> Reviewed-by:
pdfium-chromium-autoroll <pdfium-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com> Cr-Commit-Position: refs/heads/master@{#550705}
-
Alexei Filippov authored
BUG=832364 Change-Id: I4baf520742f740bc296eb12ce76d9e82796f9f9a Reviewed-on: https://chromium-review.googlesource.com/1011586Reviewed-by:
Dmitry Gozman <dgozman@chromium.org> Commit-Queue: Alexei Filippov <alph@chromium.org> Cr-Commit-Position: refs/heads/master@{#550704}
-
Alex Newcomer authored
Whenever an elevation is set (and the BubbleBorder is no longer default) remove the 1px border stroke. This brings the touchable app context menus closer to spec. Bug: 830929 Change-Id: Ia95af9088e2a7cb17b6195700b9cf73e1d0d9c86 Reviewed-on: https://chromium-review.googlesource.com/1008417 Commit-Queue: Alex Newcomer <newcomer@chromium.org> Reviewed-by:
Michael Wasserman <msw@chromium.org> Cr-Commit-Position: refs/heads/master@{#550703}
-
Becky Zhou authored
Bug: 829377 Change-Id: Icf768d451f9967d954cf0ba40ff42a04c5dbe44d Reviewed-on: https://chromium-review.googlesource.com/1011389Reviewed-by:
Theresa <twellington@chromium.org> Commit-Queue: Becky Zhou <huayinz@chromium.org> Cr-Commit-Position: refs/heads/master@{#550702}
-
Kenneth Russell authored
Fix a collision of Pixel_Video_VP9 on the Mac Intel 10.13 bot. Tbr: ynovikov@chromium.org No-Try: True Bug: 830228 Change-Id: Ib074b0a8adc5961faea3341c082dcdbd2b7ff19e Reviewed-on: https://chromium-review.googlesource.com/1012463Reviewed-by:
Kenneth Russell <kbr@chromium.org> Reviewed-by:
Yuly Novikov <ynovikov@chromium.org> Commit-Queue: Kenneth Russell <kbr@chromium.org> Cr-Commit-Position: refs/heads/master@{#550701}
-
Benjamin Pastene authored
https://chrome-internal-review.googlesource.com/608831 should give it enough bots to avoid serious pending times. Will add more bots if needed. TBR=jbudorick@chromium.org Bug: 731962 Change-Id: I5dea57cd599d8f1b24192c458017509ad68d47f4 Reviewed-on: https://chromium-review.googlesource.com/1012597Reviewed-by:
Ben Pastene <bpastene@chromium.org> Commit-Queue: Ben Pastene <bpastene@chromium.org> Cr-Commit-Position: refs/heads/master@{#550700}
-
Dave Schuyler authored
This CL moves when the bitmap fetcher request is canceled. This change is being made to reduce noise in a future CL (where the request_id_ will be a collection of request IDs rather than just one). Along the way, several presubmit warnings are addressed. The overall intention is make a future CL clearer (less noisy). Bug: None Change-Id: I8455f7921c85b3bd9824e06355b7c1c068fec5b2 Reviewed-on: https://chromium-review.googlesource.com/1011284Reviewed-by:
Justin Donnelly <jdonnelly@chromium.org> Commit-Queue: Dave Schuyler <dschuyler@chromium.org> Cr-Commit-Position: refs/heads/master@{#550699}
-
Jacob Dufault authored
It'd be better to remove the notification entirely, but there are still some users of this notification, like accessibility and power. I suspect the correct long-term fix is to migrate these users to session state changed observers. Bug: 784495 Change-Id: I5a60f4ff4010cb11e541415bea11245766dd6eeb Reviewed-on: https://chromium-review.googlesource.com/964713 Commit-Queue: Jacob Dufault <jdufault@chromium.org> Reviewed-by:
Xiyuan Xia <xiyuan@chromium.org> Cr-Commit-Position: refs/heads/master@{#550698}
-
Wez authored
This fixes the component build for Fuchsia. TBR: sergeyu Bug: 831384 Change-Id: Ifd335abe1f1013e28b0c266b525312b704b021e6 Reviewed-on: https://chromium-review.googlesource.com/1012587Reviewed-by:
Wez <wez@chromium.org> Commit-Queue: Wez <wez@chromium.org> Cr-Commit-Position: refs/heads/master@{#550697}
-
Jun Mukai authored
Bug: b/77472684 Change-Id: I23a9d55eb778cc9e3e38babcf77efdbd5fcfb699 Reviewed-on: https://chromium-review.googlesource.com/1008402 Commit-Queue: Jun Mukai <mukai@chromium.org> Reviewed-by:
David Reveman <reveman@chromium.org> Cr-Commit-Position: refs/heads/master@{#550696}
-
Matthew Jones authored
This patch fixes the tint applied to all icons in the accessibility tab switcher when modern is not enabled. If the icon is a bitmap (if it is an actual favicon from the site) it does not get tinted. Bug: 817914 Change-Id: Iae7baa6be32f15098d354c50b7f09f152859215e Reviewed-on: https://chromium-review.googlesource.com/1010827 Commit-Queue: Matthew Jones <mdjones@chromium.org> Reviewed-by:
Ted Choc <tedchoc@chromium.org> Cr-Commit-Position: refs/heads/master@{#550695}
-
Tommy C. Li authored
On drag selection, the steady state URL should not be unelided until the mouse is released, at which point it should be unelided. The selection should be adjusted so that the same portion is selected even after the prefix is reattached. This CL tests that. Bug: 797354 Change-Id: Ie6a6a6dcbe08f2eba3def90595b496cfff4206b8 Reviewed-on: https://chromium-review.googlesource.com/1008878 Commit-Queue: Tommy Li <tommycli@chromium.org> Reviewed-by:
Justin Donnelly <jdonnelly@chromium.org> Cr-Commit-Position: refs/heads/master@{#550694}
-
Charlie Andrews authored
TBR=nednguyen@chromium.org NOTRY=true Bug: 832806 Change-Id: Ia99490ecfa12eeb2078d31535fbaf8fd1b454e28 Reviewed-on: https://chromium-review.googlesource.com/1012450Reviewed-by:
Charlie Andrews <charliea@chromium.org> Commit-Queue: Charlie Andrews <charliea@chromium.org> Cr-Commit-Position: refs/heads/master@{#550693}
-
Chromium WPT Sync authored
Using wpt-import in Chromium dea26b73. With Chromium commits locally applied on WPT: 303956b6 "Enable WPT tests for the Generic Sensor classes" 0ade0386 "Web Animations: Fix bugs in procedure to process a keyframes argument" c3895d83 "Revert "Reland: Use PostTask to schedule cross-process postMessage forwarding."" Build: https://ci.chromium.org/buildbot/chromium.infra.cron/wpt-importer/15536 Note to sheriffs: This CL imports external tests and adds expectations for those tests; if this CL is large and causes a few new failures, please fix the failures by adding new lines to TestExpectations rather than reverting. See: https://chromium.googlesource.com/chromium/src/+/master/docs/testing/web_platform_tests.md TBR=danyao No-Export: true Change-Id: I7d713441772805e708c67d765d6b27edd566f380 Reviewed-on: https://chromium-review.googlesource.com/1012223 Commit-Queue: Blink WPT Bot <blink-w3c-test-autoroller@chromium.org> Reviewed-by:
Blink WPT Bot <blink-w3c-test-autoroller@chromium.org> Cr-Commit-Position: refs/heads/master@{#550692}
-
Daniel Cheng authored
Change-Id: I6af5df47bef38156f7e6237da3edb5ef84fb1be0 Reviewed-on: https://chromium-review.googlesource.com/1005014Reviewed-by:
Lei Zhang <thestig@chromium.org> Commit-Queue: Daniel Cheng <dcheng@chromium.org> Cr-Commit-Position: refs/heads/master@{#550691}
-
Andrey Kosyakov authored
Bug: 721408 Change-Id: I60f0cf81a69d7826d2043aa8222d2e69ff9e406a Reviewed-on: https://chromium-review.googlesource.com/1006231 Commit-Queue: Andrey Kosyakov <caseq@chromium.org> Reviewed-by:
Min Qin <qinmin@chromium.org> Reviewed-by:
Dmitry Gozman <dgozman@chromium.org> Cr-Commit-Position: refs/heads/master@{#550690}
-
Matthew Jones authored
Contextual Search show/hide events are not 1:1. Show can be called multiple times when the text selection changes (which is pretty often). This would cause the bottom sheet to remain hidden after Contextual Search was gone. This patch checks if Contextual Search is already showing in the BottomSheetController as not to change the behavior of other Contextual Search observers. Bug: 827353 Change-Id: Ib133224042cef6509d3cd7b81df78810093190f8 Reviewed-on: https://chromium-review.googlesource.com/1012193Reviewed-by:
Theresa <twellington@chromium.org> Commit-Queue: Matthew Jones <mdjones@chromium.org> Cr-Commit-Position: refs/heads/master@{#550689}
-
Matt Menke authored
I believe there's a bug in URLLoader that's causing them to occasionally crash, when the data pipe is closed before reading the entire response body. TBR=jam@chromium.org NOTRY=true Bug: 755309 Cq-Include-Trybots: master.tryserver.chromium.linux:linux_mojo Change-Id: Id3f98fdea01b56b1c0c3b0edf927701579afa38d Reviewed-on: https://chromium-review.googlesource.com/1012443Reviewed-by:
Matt Menke <mmenke@chromium.org> Commit-Queue: Matt Menke <mmenke@chromium.org> Cr-Commit-Position: refs/heads/master@{#550688}
-
Jacob Dufault authored
Bug: 784495 Change-Id: I8a797815817b364b0dcdd5e836cad40c571cb2fa Reviewed-on: https://chromium-review.googlesource.com/978862 Commit-Queue: Jacob Dufault <jdufault@chromium.org> Reviewed-by:
Oliver Chang <ochang@chromium.org> Reviewed-by:
Xiyuan Xia <xiyuan@chromium.org> Cr-Commit-Position: refs/heads/master@{#550687}
-
Steve Anton authored
This flag is a no-op in WebRTC. Bug: None Change-Id: I2342618483bdd9b0458962c3773b98e9d28380ab Reviewed-on: https://chromium-review.googlesource.com/1011394Reviewed-by:
Sergey Ulanov <sergeyu@chromium.org> Commit-Queue: Sergey Ulanov <sergeyu@chromium.org> Cr-Commit-Position: refs/heads/master@{#550686}
-
Kim Paulhamus authored
Changes OnceCallbacks to use TestCallbackReceiver. Bug: 799044 Change-Id: Ifdad6592537490cdae8d9a8c95809db350fd4f11 Reviewed-on: https://chromium-review.googlesource.com/1011628Reviewed-by:
Jan Wilken Dörrie <jdoerrie@chromium.org> Commit-Queue: Kim Paulhamus <kpaulhamus@chromium.org> Cr-Commit-Position: refs/heads/master@{#550685}
-
Owen Min authored
Because the first policy cache will be loaded synchronously before local_state creation. We'll miss its OnStoreLoaded/Error event as CloudPolicyService has to be created after |local_state|. It means we won't know the result of cache loading. To resolve this, check the initialization status once the CloudPolicyService has been created. Fetch policy from server if cache is not loaded properly. Bug: 832694 Change-Id: Idd0b9e35ea2afded586b73c765197b5574ba3900 Reviewed-on: https://chromium-review.googlesource.com/1011211 Commit-Queue: Owen Min <zmin@chromium.org> Reviewed-by:
Roger Tawa <rogerta@chromium.org> Reviewed-by:
Julian Pastarmov <pastarmovj@chromium.org> Cr-Commit-Position: refs/heads/master@{#550684}
-
Mustaq Ahmed authored
Also added web-platform-tests. Blink intent thread: https://groups.google.com/a/chromium.org/forum/#!topic/blink-dev/G2s1Ol3qcgA Closes https://github.com/w3c/pointerevents/issues/167 Bug: 827271 Change-Id: I8429b9541f8cfc38223b3a34116b74c2aba92ee5 Reviewed-on: https://chromium-review.googlesource.com/986877Reviewed-by:
Dave Tapuska <dtapuska@chromium.org> Commit-Queue: Mustaq Ahmed <mustaq@chromium.org> Cr-Commit-Position: refs/heads/master@{#550683}
-
Henrique Nakashima authored
The format should be: /** * Description. * * @param {Foo} foo The foo * @return {Bar} * @private */ Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation Change-Id: I48fbf027e16a07a37c5688cac41084bf500e7f93 Reviewed-on: https://chromium-review.googlesource.com/1005908 Commit-Queue: Henrique Nakashima <hnakashima@chromium.org> Reviewed-by:Demetrios Papadopoulos <dpapad@chromium.org> Cr-Commit-Position: refs/heads/master@{#550682}
-
Vaclav Brozek authored
One of the use-cases of auto is to remove duplicated type information: std::unique_ptr<X> x = std::make_unique<X>(...); then becomes just auto x = std::make_unique<X>(...); The benefit is code which is easier to read, without losing any information about the type. This CL is a follow-up after https://crrev.com/c/998194, which introduced a line std::unique_ptr<ArcAppResult> copy = std::make_unique<ArcAppResult>( That line is being shortened using auto. Bug: 733662 Change-Id: I694330c283a453b5d2020c8ec237fafdf6572f20 Reviewed-on: https://chromium-review.googlesource.com/1011604Reviewed-by:
Xiyuan Xia <xiyuan@chromium.org> Commit-Queue: Vaclav Brozek <vabr@chromium.org> Cr-Commit-Position: refs/heads/master@{#550681}
-
Emily Hanley authored
We have a new way to trigger perf tests, migrating those that run on mac and linux. Bug: 757933 Change-Id: Ic6fda31c34d288b584d28a523d848944a0724519 Reviewed-on: https://chromium-review.googlesource.com/1010863Reviewed-by:
Chrome Cunningham <chcunningham@chromium.org> Reviewed-by:
John Budorick <jbudorick@chromium.org> Reviewed-by:
Asanka Herath <asanka@chromium.org> Reviewed-by:
Simon Hatch <simonhatch@chromium.org> Commit-Queue: Emily Hanley <eyaich@chromium.org> Cr-Commit-Position: refs/heads/master@{#550680}
-
wutao authored
This patch adds the Settings to launcher apps grid. 1. Added class InternalAppItem. 2. Added class InternalAppModelBuilder. Bug: 824437 Test: InternalAppModelBuilderTest.Build Change-Id: I0dd06e767527b73e7ed14ca4dbab3e26d5c6e075 Reviewed-on: https://chromium-review.googlesource.com/1007496Reviewed-by:
Nicolas Zea <zea@chromium.org> Reviewed-by:
Xiyuan Xia <xiyuan@chromium.org> Commit-Queue: Tao Wu <wutao@chromium.org> Cr-Commit-Position: refs/heads/master@{#550679}
-
Charlie Andrews authored
TBR=nednguyen@chromium.org NOTRY=true Bug: 832686 Change-Id: Ia03388a34d307ddea50cd8158a4e09a2243dfe6e Reviewed-on: https://chromium-review.googlesource.com/1012483Reviewed-by:
Charlie Andrews <charliea@chromium.org> Commit-Queue: Charlie Andrews <charliea@chromium.org> Cr-Commit-Position: refs/heads/master@{#550678}
-