- 20 Nov, 2018 40 commits
-
-
Sam McNally authored
Bug: 905174 Change-Id: I87777199174bc09483d10eba2e00f271758663a9 Reviewed-on: https://chromium-review.googlesource.com/c/1343460Reviewed-by:
Sergei Datsenko <dats@chromium.org> Commit-Queue: Sam McNally <sammc@chromium.org> Cr-Commit-Position: refs/heads/master@{#609578}
-
Hirokazu Honda authored
This wrong macro causes GenericDmaBufVideoFrameValidator is used on intel platform. Due to it, VDA unittest with frame validator fails on intel platform. BUG=chromium:856562 TEST=VDA unittest --frame_validator=check on eve Change-Id: Iad1749ea4ada09a9d01b92137ca10c3215d9893d Reviewed-on: https://chromium-review.googlesource.com/c/1343404 Commit-Queue: Hirokazu Honda <hiroh@chromium.org> Reviewed-by:
Alexandre Courbot <acourbot@chromium.org> Cr-Commit-Position: refs/heads/master@{#609577}
-
Shu Chen authored
Bug: 906511 Change-Id: I7ea2770072347eb37a0b9800a2ba0d17cecfe496 Reviewed-on: https://chromium-review.googlesource.com/c/1343577Reviewed-by:
Leo Zhang <googleo@chromium.org> Commit-Queue: Shu Chen <shuchen@chromium.org> Cr-Commit-Position: refs/heads/master@{#609576}
-
Sergei Datsenko authored
I have no idea what I'm doing but it seems to work as asked in crbug.com/875409: move "create shortcut" item under "rename". BUG=chromium:875409 Change-Id: Ibcb09378c932f1eceeab679b5144ef3cd5c7504b Reviewed-on: https://chromium-review.googlesource.com/c/1341292 Commit-Queue: Sergei Datsenko <dats@chromium.org> Reviewed-by:
Luciano Pacheco <lucmult@chromium.org> Cr-Commit-Position: refs/heads/master@{#609575}
-
David Black authored
Previously, a text interaction initiated by suggestion chip would never return TTS. Now, suggestion chips will allow TTS if the previous response contained TTS. In such cases, the suggestion chip text interaction is really a continuation of the preceding voice interaction. This CL also renames the SendTextQuery API to StartTextInteraction to be consistent with the other StartXInteraction APIs. Bug: b:119565728 Change-Id: I8bf836b8d2b542bf4f50e50de55c989ce349f7ce Reviewed-on: https://chromium-review.googlesource.com/c/1337812Reviewed-by:
Xiaohui Chen <xiaohuic@chromium.org> Reviewed-by:
Daniel Cheng <dcheng@chromium.org> Commit-Queue: David Black <dmblack@google.com> Cr-Commit-Position: refs/heads/master@{#609574}
-
chromium-autoroll authored
https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools.git/+log/f5b4a8eee364..b0c143c8eb23 git log f5b4a8eee364..b0c143c8eb23 --date=short --no-merges --format='%ad %ae %s' 2018-11-19 zoddicus@users.noreply.github.com Add tests for matrix type data rule validation (#2082) Created with: gclient setdep -r src/third_party/SPIRV-Tools/src@b0c143c8eb23 The AutoRoll server is located here: https://autoroll.skia.org/r/spirv-tools-chromium-autoroll 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: I7e007c424346e27a8a841d77f78797405f0051c2 Reviewed-on: https://chromium-review.googlesource.com/c/1342942Reviewed-by:
chromium-autoroll <chromium-autoroll@skia-public.iam.gserviceaccount.com> Commit-Queue: chromium-autoroll <chromium-autoroll@skia-public.iam.gserviceaccount.com> Cr-Commit-Position: refs/heads/master@{#609573}
-
Tetsui Ohkubo authored
This CL maps Android's EditorInfo.TYPE_TEXT_FLAG_CAP_* to Chrome's ui::TextInputFlags::TEXT_INPUT_FLAG_AUTOCAPITALIZE_*. Based on the value, when user types on Android apps with Chrome IME, the first letter of each sentence / each word, or all letters will be capitalized by the IME. ARC++ side change: ag/5477541 (WIP) TEST=manual BUG=b/111818971 Change-Id: I26f5f2b03297ec811160132a917057a4fb212815 Reviewed-on: https://chromium-review.googlesource.com/c/1328636Reviewed-by:
Mattias Nissler <mnissler@chromium.org> Reviewed-by:
Yuichiro Hanada <yhanada@chromium.org> Commit-Queue: Tetsui Ohkubo <tetsui@chromium.org> Cr-Commit-Position: refs/heads/master@{#609572}
-
Alexey Baskakov authored
It's not used anyway. We will develop a BMO component instead. Bug: 875698 Change-Id: I1a204eb7821a37d5b1e6e579d1e73eb51bbbf191 Reviewed-on: https://chromium-review.googlesource.com/c/1341729Reviewed-by:
calamity <calamity@chromium.org> Commit-Queue: Alexey Baskakov <loyso@chromium.org> Cr-Commit-Position: refs/heads/master@{#609571}
-
Eliot Courtney authored
(lower fling threshold, slower animation) Bug: 906233 Bug: 906229 Test: opened a PIP window and confirmed the constants were different Change-Id: I024a160e853deb692de25cdea0410e915cec1376 Reviewed-on: https://chromium-review.googlesource.com/c/1341445Reviewed-by:
Mitsuru Oshima <oshima@chromium.org> Commit-Queue: Eliot Courtney <edcourtney@chromium.org> Cr-Commit-Position: refs/heads/master@{#609570}
-
Stuart Langley authored
- Remove the .html file - Add BUILD target for thumbnail_model_unittest.js - Fix closure errors in the unittest.js files. No change in behaviour. Bug: 906896 Change-Id: I12d83ee0f3192565d6248d8f862c9c9e1a199f00 Reviewed-on: https://chromium-review.googlesource.com/c/1343578Reviewed-by:
Noel Gordon <noel@chromium.org> Commit-Queue: Stuart Langley <slangley@chromium.org> Cr-Commit-Position: refs/heads/master@{#609569}
-
Takuto Ikuta authored
This is to prevent unnecessary compiles in CQ compile step. Bug: 904770 Change-Id: Ia1080f887725b6e00a27248c60153127db7dbf76 Reviewed-on: https://chromium-review.googlesource.com/c/1337138Reviewed-by:
Nicolas Ouellet-Payeur <nicolaso@chromium.org> Reviewed-by:
Dirk Pranke <dpranke@chromium.org> Commit-Queue: Takuto Ikuta <tikuta@chromium.org> Cr-Commit-Position: refs/heads/master@{#609568}
-
Michael Giuffrida authored
Moves the switch to show the Play Store icon in the launcher in Demo Mode to be a feature flag instead so it can be enabled in experiments. Bug: 895532 Test: ChromeArcUtilTest.ArcStartModeDefaultDemoModeWithPlayStore Manual: Powerwash device, enroll in Demo Mode (Ctrl+Alt+D), verify Play Store is not available. Enable feature with --enable-features=ShowPlayInDemoMode, restart, and verify Play Store is available. Change-Id: I91db58f56f90757a4c5e72978ef84dd154a85a71 Reviewed-on: https://chromium-review.googlesource.com/c/1333115Reviewed-by:Hidehiko Abe <hidehiko@chromium.org> Commit-Queue: Michael Giuffrida <michaelpg@chromium.org> Cr-Commit-Position: refs/heads/master@{#609567}
-
Yoshifumi Inoue authored
This patch changes LayoutSelectionTest to run on both legacy and ng layout tree for ease of catching LayoutNG regression other than LayoutNG bot. Change-Id: Ic9725a953a1fc7e8c3b9e5cedbc9d79dfa7ae6bb Reviewed-on: https://chromium-review.googlesource.com/c/1341737Reviewed-by:
Yoichi Osato <yoichio@chromium.org> Commit-Queue: Yoshifumi Inoue <yosin@chromium.org> Cr-Commit-Position: refs/heads/master@{#609566}
-
Matthew Mourgos authored
Shows the label "Unnamed Folder" in the app list when a group is created without creating a custom name. Bug: 755547 Change-Id: I31f24f546fa508737920e5d8a590028fd80a0480 Reviewed-on: https://chromium-review.googlesource.com/c/1343000Reviewed-by:
Weidong Guo <weidongg@chromium.org> Commit-Queue: Matthew Mourgos <mmourgos@chromium.org> Cr-Commit-Position: refs/heads/master@{#609565}
-
Sébastien Séguin-Gagnon authored
Change-Id: I6906fc6f60b02f6b3cc7a07c6884b4867fb3888a Reviewed-on: https://chromium-review.googlesource.com/c/1285520Reviewed-by:
Fabio Tirelo <ftirelo@chromium.org> Commit-Queue: Sebastien Seguin-Gagnon <sebsg@chromium.org> Cr-Commit-Position: refs/heads/master@{#609564}
-
Min Qin authored
Bug: 906287 Change-Id: Ia3b48e13ac444d7569333141c6bba0c7dc14302e Reviewed-on: https://chromium-review.googlesource.com/c/1340806 Commit-Queue: Min Qin <qinmin@chromium.org> Reviewed-by:
Shakti Sahu <shaktisahu@chromium.org> Cr-Commit-Position: refs/heads/master@{#609563}
-
Sam McNally authored
Fix cr-menu to hide superfluous separators as claimed in its comment. Bug: 875356 Change-Id: Ib4178efe087649558fd49b32cf43d6eba9e0fff7 Reviewed-on: https://chromium-review.googlesource.com/c/1341446Reviewed-by:
calamity <calamity@chromium.org> Reviewed-by:
Noel Gordon <noel@chromium.org> Commit-Queue: Sam McNally <sammc@chromium.org> Cr-Commit-Position: refs/heads/master@{#609562}
-
chromium-internal-autoroll authored
https://chrome-internal.googlesource.com/chrome/src-internal.git/+log/739d7c2cc952..b01ce5fdb532 Created with: gclient setdep -r src-internal@b01ce5fdb532 The AutoRoll server is located here: https://autoroll-internal.skia.org/r/src-internal-chromium-autoroll 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. BUG=chromium:790086,chromium:790096,chromium:790081 TBR=mmoss@chromium.org Change-Id: I1ce032a94ab50fbf960f84f6e135790b03e51bce Reviewed-on: https://chromium-review.googlesource.com/c/1343184Reviewed-by:
chromium-internal-autoroll <chromium-internal-autoroll@skia-corp.google.com.iam.gserviceaccount.com> Commit-Queue: chromium-internal-autoroll <chromium-internal-autoroll@skia-corp.google.com.iam.gserviceaccount.com> Cr-Commit-Position: refs/heads/master@{#609561}
-
bsheedy authored
Updates the VR permission prompt goldens to be correct after https://chromium-review.googlesource.com/c/1343278. TBR=huayinz@chromium.org Bug: 904471 Change-Id: I72bf3579515cdc0a610e46be0502ad5d3514a9a3 Reviewed-on: https://chromium-review.googlesource.com/c/1343508Reviewed-by:
Brian Sheedy <bsheedy@chromium.org> Commit-Queue: Brian Sheedy <bsheedy@chromium.org> Cr-Commit-Position: refs/heads/master@{#609560}
-
Eric Foo authored
Bug: 868202 Change-Id: I807807511df39b7a4eac3b699fcd2274d4d24138 Reviewed-on: https://chromium-review.googlesource.com/c/1343081Reviewed-by:
Ryan Tseng <hinoka@chromium.org> Reviewed-by:
John Budorick <jbudorick@chromium.org> Commit-Queue: Eric Foo <efoo@chromium.org> Cr-Commit-Position: refs/heads/master@{#609559}
-
Christopher Lam authored
This CL adds ES7/8 features to the ES styleguide, and renames it es.md in light of its more generic nature. All features are To Be Discussed except Async Functions which are allowed. Bug: 671426, 905927 Change-Id: Ib01a7dd3bb5dbcbccf8c262c5210614a4d397594 Reviewed-on: https://chromium-review.googlesource.com/c/1339087 Commit-Queue: calamity <calamity@chromium.org> Reviewed-by:
Michael Giuffrida <michaelpg@chromium.org> Cr-Commit-Position: refs/heads/master@{#609558}
-
kylechar authored
CommandBufferTaskExecutor needs to be created and destroyed on the GPU thread. To ensure it's destroyed on the GPU thread we hold onto a scoped_refptr there and destroy it last. Owning the object there and passing around a raw pointer accomplishes the same thing with less complexity. Bug: none Change-Id: I7c2d4f22044d28799c04144729c03d273abe7592 Reviewed-on: https://chromium-review.googlesource.com/c/1340907Reviewed-by:
Bo <boliu@chromium.org> Reviewed-by:
Sunny Sachanandani <sunnyps@chromium.org> Commit-Queue: kylechar <kylechar@chromium.org> Cr-Commit-Position: refs/heads/master@{#609557}
-
bsheedy authored
Cleans up manual usage of EmbeddedTestServer in XR tests, which was both adding a lot of duplicate code and had the potential to fail to clean up the server if the test failed, which could then affect other tests. This is achieved by making EmbeddedTestServerRule lazy and applying it to all ChromeActivityTestRules, not just WebappActivityTestRule. Bug: 901923 Change-Id: I431dac3ce2488a1a5762a1ab1f5ec68aea16c9f5 Reviewed-on: https://chromium-review.googlesource.com/c/1320024 Commit-Queue: Brian Sheedy <bsheedy@chromium.org> Reviewed-by:
Tommy Nyquist <nyquist@chromium.org> Reviewed-by:
Paul Jensen <pauljensen@chromium.org> Cr-Commit-Position: refs/heads/master@{#609556}
-
chrome://flagsMicah Morton authored
This flag allows for controlling whether user-supplied filesystems in CrOS are mounted with the 'nosymfollow' option that will cause symlink traversal to be blocked. Will be configurable through VariationsService as well as chrome://flags. This needs CL:1338199 to land and then a deps roll to happen before this can land. "sudo -u chronos dbus-send --system --type=method_call --print-reply \ --dest=org.chromium.ChromeFeaturesService \ /org/chromium/ChromeFeaturesService \ "org.chromium.ChromeFeaturesServiceInterface.IsFsNosymfollowEnabled" Bug: 867807 Test: look at chrome://flags as well as: Change-Id: Iffd13ebf95a2d1bb12541a8c910aa0bba18ef79f Reviewed-on: https://chromium-review.googlesource.com/c/1338173Reviewed-by:
Dan Erat <derat@chromium.org> Reviewed-by:
Mattias Nissler <mnissler@chromium.org> Reviewed-by:
Elly Fong-Jones <ellyjones@chromium.org> Commit-Queue: Micah Morton <mortonm@chromium.org> Cr-Commit-Position: refs/heads/master@{#609555}
-
Sunny Sachanandani authored
Bug: 869677 Change-Id: I2ec34190049473f512b30a8bc18f311ec92388e1 Reviewed-on: https://chromium-review.googlesource.com/c/1343049Reviewed-by:
Zhenyao Mo <zmo@chromium.org> Commit-Queue: Sunny Sachanandani <sunnyps@chromium.org> Cr-Commit-Position: refs/heads/master@{#609554}
-
Yusuke Sato authored
BUG=None TEST=No code change Change-Id: I1627f25269b4eeac33d78674a515aeeab028a124 Reviewed-on: https://chromium-review.googlesource.com/c/1343069Reviewed-by:
Elijah Taylor <elijahtaylor@chromium.org> Commit-Queue: Yusuke Sato <yusukes@chromium.org> Cr-Commit-Position: refs/heads/master@{#609553}
-
Min Qin authored
Currently we cache all the DownloadDBEntry when loading in-progress downloads. However, this is not necessary and it wastes a lot of memory. This CL no longer caches those entries, and will only cache them later when OnDownloadUpdated() is called on an in-progress download. BUG=893651 Change-Id: Id5c64f0efe6769446803d2b3ac4b58168917a27d Reviewed-on: https://chromium-review.googlesource.com/c/1340950 Commit-Queue: Min Qin <qinmin@chromium.org> Reviewed-by:
Xing Liu <xingliu@chromium.org> Cr-Commit-Position: refs/heads/master@{#609552}
-
Yuichiro Hanada authored
The original CL is crrev.com/c/1291289. It was reverted due to crash. Please see crbug.com/903671. We changed IsInArcAppWindow() to use the window property, aura::client::kAppType, but it's not set for ARC++ Kiosk apps' window. It makes text input on ARC++ Kiosk apps stop working. This CL adds a temporary workaround for this situation. Ideally, IsArcAppWindow() in arc_util.cc should handle windows of ARC++ Kiosk app correctly. Bug: 891825, 903671 Test: Can type text on Wikipedia kiosk app. Change-Id: I3e6457ee3dc5f3fdcca35a7acbb007325697ddbd Reviewed-on: https://chromium-review.googlesource.com/c/1339779Reviewed-by:
Yusuke Sato <yusukes@chromium.org> Commit-Queue: Yuichiro Hanada <yhanada@chromium.org> Cr-Commit-Position: refs/heads/master@{#609551}
-
Adrienne Walker authored
After the client/service paint cache entries were added, these tests started failing. Fix this by clearing the client paint cache on every iteration so that each op has to always serialize cached subtypes. Change-Id: I7dfae5b5ae34864f77ae1fb28793b1ab2db94c86 Reviewed-on: https://chromium-review.googlesource.com/c/1343502Reviewed-by:
Khushal <khushalsagar@chromium.org> Commit-Queue: enne <enne@chromium.org> Cr-Commit-Position: refs/heads/master@{#609550}
-
Sam McNally authored
This is a reland of 8fcafe0e Wait for the file list to update before attempting to select its contents. Original change's description: > Add tests for sharing and managing items in team drives. > > Bug: 903637 > Change-Id: Ic9f49f7de59210e400a578060eb611fafebe193f > Reviewed-on: https://chromium-review.googlesource.com/c/1341287 > Commit-Queue: Sam McNally <sammc@chromium.org> > Reviewed-by: Noel Gordon <noel@chromium.org> > Cr-Commit-Position: refs/heads/master@{#609191} Bug: 903637, 906577 Change-Id: Id6e2a1ab4eb4b0afb48c53c5cb6ea0e3b28bfa11 Reviewed-on: https://chromium-review.googlesource.com/c/1343399Reviewed-by:
Noel Gordon <noel@chromium.org> Commit-Queue: Sam McNally <sammc@chromium.org> Cr-Commit-Position: refs/heads/master@{#609549}
-
Sam McNally authored
Bug: 797709 Change-Id: I7d0be2bd48d0ff5fd5288f1abd23657f5a77a7fe Reviewed-on: https://chromium-review.googlesource.com/c/1341769 Commit-Queue: Sam McNally <sammc@chromium.org> Reviewed-by:
Sergei Datsenko <dats@chromium.org> Cr-Commit-Position: refs/heads/master@{#609548}
-
Jarryd authored
Fixed the cleanup functions to return a Promise and use explicit domains to make sure the cookies are cleaned up afterwards. Bug: 729800 Change-Id: Iba3ca150431e21be26536658d3b5d77648edfe83 Reviewed-on: https://chromium-review.googlesource.com/c/1226199 Commit-Queue: Jarryd Goodman <jarrydg@chromium.org> Commit-Queue: Victor Costan <pwnall@chromium.org> Reviewed-by:
Victor Costan <pwnall@chromium.org> Cr-Commit-Position: refs/heads/master@{#609547}
-
dpapad authored
This is necessary because of recent Blink changes at r608013. Bug: 905999 Change-Id: I111e3631e4d832afb48a4161552fc27a1bbb9630 Reviewed-on: https://chromium-review.googlesource.com/c/1343197Reviewed-by:
Rebekah Potter <rbpotter@chromium.org> Commit-Queue: Demetrios Papadopoulos <dpapad@chromium.org> Cr-Commit-Position: refs/heads/master@{#609546}
-
chromium-autoroll authored
https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/ae6836ecee57..7da982abf99f git log ae6836ecee57..7da982abf99f --date=short --no-merges --format='%ad %ae %s' 2018-11-19 efoo@chromium.org Update to use new LUCI builders Created with: gclient setdep -r src/third_party/depot_tools@7da982abf99f The AutoRoll server is located here: https://autoroll.skia.org/r/depot-tools-chromium-autoroll 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. BUG=chromium:868202 TBR=agable@chromium.org Change-Id: Ibf7a764150fdd25102bd318d37727901ffdceadc Reviewed-on: https://chromium-review.googlesource.com/c/1343183Reviewed-by:
chromium-autoroll <chromium-autoroll@skia-public.iam.gserviceaccount.com> Commit-Queue: chromium-autoroll <chromium-autoroll@skia-public.iam.gserviceaccount.com> Cr-Commit-Position: refs/heads/master@{#609545}
-
https://crrev.com/c/1337614Max Moroz authored
Bug: 870331, 905289 Change-Id: I4c5decd8b299d64d2b6c302bcd0049f8f9581f48 Reviewed-on: https://chromium-review.googlesource.com/c/1343258 Commit-Queue: Max Moroz <mmoroz@chromium.org> Commit-Queue: Nico Weber <thakis@chromium.org> Reviewed-by:
Nico Weber <thakis@chromium.org> Cr-Commit-Position: refs/heads/master@{#609544}
-
Carlos IL authored
Bug: 755632 Change-Id: I7e156e2df3a3124a13a5b576b7d691d77dd9c08b Reviewed-on: https://chromium-review.googlesource.com/c/1289687 Commit-Queue: Carlos IL <carlosil@chromium.org> Reviewed-by:
Nasko Oskov <nasko@chromium.org> Reviewed-by:
Christopher Thompson <cthomp@chromium.org> Reviewed-by:
Varun Khaneja <vakh@chromium.org> Reviewed-by:
Alex Moshchuk <alexmos@chromium.org> Reviewed-by:
Matt Giuca <mgiuca@chromium.org> Reviewed-by:
Maksim Ivanov <emaxx@chromium.org> Reviewed-by:
Doug Turner <dougt@chromium.org> Reviewed-by:
Steven Holte <holte@chromium.org> Cr-Commit-Position: refs/heads/master@{#609543}
-
Yuri Wiitala authored
TBR=sullivan@chromium.org Bug: 906656 Change-Id: I6eb1c8604b8dc6307fde4df09bfbe7c2918aeb8a Reviewed-on: https://chromium-review.googlesource.com/c/1343062Reviewed-by:
Yuri Wiitala <miu@chromium.org> Cr-Commit-Position: refs/heads/master@{#609542}
-
Xi Cheng authored
Change-Id: I5a5f176793365ee972b0a857531df9daef99ec03 Reviewed-on: https://chromium-review.googlesource.com/c/1343523 Commit-Queue: Xi Cheng <chengx@chromium.org> Commit-Queue: Ilya Sherman <isherman@chromium.org> Reviewed-by:
Ilya Sherman <isherman@chromium.org> Cr-Commit-Position: refs/heads/master@{#609541}
-
Mustafa Emre Acer authored
Bug: 640835 Change-Id: I4aa79b8af48f7dfd63c288dc7c4506fa4a4bf73e Reviewed-on: https://chromium-review.googlesource.com/c/1338999Reviewed-by:
Mustafa Emre Acer <meacer@chromium.org> Reviewed-by:
Adrienne Porter Felt <felt@chromium.org> Commit-Queue: Mustafa Emre Acer <meacer@chromium.org> Cr-Commit-Position: refs/heads/master@{#609540}
-
Nicholas Verne authored
When Crostini users invoke x-terminal-emulator $CMD, the contents of CMD are eventually passed by CrostiniManager in an args[] array to crosh as part of its URL. Fixed in this CL: incorrect usage of vector<StringPiece>. We were adding more pieces in line 1065 which were derived from temporaries (return values of net::Escape...). The temporaries were thrown away but the pieces still pointed to the same memory and we sent nonsense to base::JoinString(). Bug: 898111 Change-Id: If5d3ffcb6ab28d01698ee48cd7fd3d2230381f95 Reviewed-on: https://chromium-review.googlesource.com/c/1341282 Commit-Queue: Nicholas Verne <nverne@chromium.org> Reviewed-by:
Mike Frysinger <vapier@chromium.org> Reviewed-by:
Ben Wells <benwells@chromium.org> Cr-Commit-Position: refs/heads/master@{#609539}
-