GitLab

We want to use the first Cacao optimization in a matching
PageHint that is enabled on the client. This handles checking for
the basic enabled state of the optimizations in order. The overall
context should have already confirmed the host is not blacklisted
and has acceptable scheme.

Bug: 936205
Change-Id: I71610db3c204e82292c7bee4fed302643514ae73
Reviewed-on: https://chromium-review.googlesource.com/c/1491903
Commit-Queue: Doug Arnett <dougarnett@chromium.org>
Reviewed-by: Tarun Bansal <tbansal@chromium.org>
Cr-Commit-Position: refs/heads/master@{#636294}

Screenshots: https://bugs.chromium.org/p/chromium/issues/detail?id=930043#c10
Bug: 930043
Change-Id: I6b47bedfed778a81202c1cc9364e603483556019
Reviewed-on: https://chromium-review.googlesource.com/c/1493090Reviewed-by: Erik Luo <luoe@chromium.org>
Commit-Queue: Joey Arhar <jarhar@chromium.org>
Cr-Commit-Position: refs/heads/master@{#636293}

Bug: 780163, 853068
Change-Id: I5cb0001fbbfc800d5c99ac761fa58f353a698823
Reviewed-on: https://chromium-review.googlesource.com/c/1471217Reviewed-by: Erik Luo <luoe@chromium.org>
Commit-Queue: Joey Arhar <jarhar@chromium.org>
Cr-Commit-Position: refs/heads/master@{#636292}

Remove the flag and all associated usage of it. This feature is now
enabled by default, so the flag is redundant and can be removed.

Also changed the 'touchstart' event listener to be passive to
suppress warning in DevTools (and follow best practice).

Bug: 934467
Change-Id: Ibac3a9ef267028a63ba8c04e21e2a4742e04c100
Reviewed-on: https://chromium-review.googlesource.com/c/1490354
Commit-Queue: Alex Danilo <adanilo@chromium.org>
Reviewed-by: Noel Gordon <noel@chromium.org>
Reviewed-by: Elly Fong-Jones <ellyjones@chromium.org>
Auto-Submit: Alex Danilo <adanilo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#636291}

This will now include plaintext, SVG, etc. It was previously limited to
HTML and XHTML.

Bug: 936496
Change-Id: I5fc05ac99361e391918d2b8bafdb25836a2f256a
Reviewed-on: https://chromium-review.googlesource.com/c/1492434
Commit-Queue: Ryan Sturm <ryansturm@chromium.org>
Reviewed-by: Tarun Bansal <tbansal@chromium.org>
Cr-Commit-Position: refs/heads/master@{#636290}

Add an |interop_backing_factory_| for Android and fix a typo in
SharedImageBackingFactoryAHB.

R=vikassoni

Change-Id: I8759ab8a54cb9bf3ff19c3a225c3f4dbf7e3dde5
Reviewed-on: https://chromium-review.googlesource.com/c/1493380
Auto-Submit: Eric Karl <ericrk@chromium.org>
Reviewed-by: vikas soni <vikassoni@chromium.org>
Commit-Queue: Eric Karl <ericrk@chromium.org>
Cr-Commit-Position: refs/heads/master@{#636289}

There is currently synchronization between the transition from Vulkan to
OpenGL and vise versa. However, we also need to allow synchronization
between 2 separate OpenGL contexts, for example.

This CL allows this extra synchronization.

Bug: 930294
Change-Id: I48cfdbb6e1cd7a1d51090f701df7e8da0642f6a6
Reviewed-on: https://chromium-review.googlesource.com/c/1482552
Commit-Queue: Chris Blume <cblume@chromium.org>
Reviewed-by: Eric Karl <ericrk@chromium.org>
Cr-Commit-Position: refs/heads/master@{#636288}

This CL changes ChannelPosix::WriteNoLock() to send limited number
of handles at a time so that it won't overflow the |cmsg_buf| buffer
that is used at mojo::SendmsgWithHandles().

Bug: 935357
Change-Id: I9df239763d5976022564881b8da81acfa6d61f1c
Reviewed-on: https://chromium-review.googlesource.com/c/1489104
Commit-Queue: Jun Cai <juncai@chromium.org>
Reviewed-by: Ken Rockot <rockot@google.com>
Cr-Commit-Position: refs/heads/master@{#636287}

Oculus headers and OculusRenderLoop had to be updated.

This also Remove previous fix that changed warnings for device/vr.

Bug: 936459
Change-Id: I8869eb75969ec3845be2bba0f8d55c268943c92f
Reviewed-on: https://chromium-review.googlesource.com/c/1493437Reviewed-by: Nico Weber <thakis@chromium.org>
Commit-Queue: Bill Orr <billorr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#636286}

R=thestig@chromium.org
BUG=883049

Change-Id: I2dc81de46b816debcb8e31042c4078e91331e258
Reviewed-on: https://chromium-review.googlesource.com/c/1492977
Commit-Queue: Dan Beam <dbeam@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Auto-Submit: Dan Beam <dbeam@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#636285}

The crash occurs when trying to dereference a null pointer. This fix
simply returns early if debug information is not present.

Bug: 936635
Change-Id: I034ba93d2fb027dd379f684393c1368b11a73e7c
Reviewed-on: https://chromium-review.googlesource.com/c/1493513
Commit-Queue: Kyle Horimoto <khorimoto@chromium.org>
Commit-Queue: Jeremy Klein <jlklein@chromium.org>
Auto-Submit: Kyle Horimoto <khorimoto@chromium.org>
Reviewed-by: Jeremy Klein <jlklein@chromium.org>
Cr-Commit-Position: refs/heads/master@{#636284}

This change previously landed at crrev.com/c/1484495, but was
reverted at crrev.com/c/1491658 because of a test failure. This
relands the original CL with a fix for the test. Patch 4 is the
original CL, and Patch 5 is the fix.

Text of the original CL:

This is a necessary change now that Polymer 2 is enabled.

Previously, Multidevice and Smart Lock pages were being informed
of an authToken change by their child element passwordPrompt, but that
is no longer bubbling up to the parent. Now, explicitly bind to the
authToken of passwordPrompt as a property, and use it when the dialog
close event is fired. As a consequence of this, the authTokenChanged()
callbacks in both parents is unnecessary and has been removed.

Bug: 934987
Change-Id: Iae34ae9677fe555264c9a59b05f4b9f184fad324
Reviewed-on: https://chromium-review.googlesource.com/c/1492362
Commit-Queue: Ryan Hansberry <hansberry@chromium.org>
Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#636283}

Lite Page Server Previews over records data use when it attempts to
record data savings. Instead, only the savings should be recorded.

This also changes the data usage site breakdown code to use Virtual URL
(the one in the omnibox) instead of the actual host for the sake of
improving UI and tracking HTTPS Lite Page Previews more accurately.

Bug: 936577
Change-Id: Ib7dfe8afeea0b277ac065d58c02b2962a4ab6c94
Reviewed-on: https://chromium-review.googlesource.com/c/1492428
Commit-Queue: Ryan Sturm <ryansturm@chromium.org>
Reviewed-by: Robert Ogden <robertogden@chromium.org>
Cr-Commit-Position: refs/heads/master@{#636282}

R=haraken@chromium.org
CC=​blink-reviews-vendor@chromium.org

BUG=891908

Change-Id: Ibd1f71f7b7eaed5051b7a44abdae737ffd21b2e3
Reviewed-on: https://chromium-review.googlesource.com/c/1491833
Auto-Submit: Antonio Gomes <tonikitoo@igalia.com>
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Commit-Queue: Kentaro Hara <haraken@chromium.org>
Commit-Queue: Antonio Gomes <tonikitoo@igalia.com>
Cr-Commit-Position: refs/heads/master@{#636281}

Add role="group" to tree children so Chromevox reads the depth level
of each sub-tree correctly.

Fix cr.ui.TreeItem to set aria-expanded the same as expanded attribute,
for Files app we set expanded=true before setting hasChildren, which
was causing aria-expanded to be always false.

Add unittest for DirectoryTree to check for aria-expanded and
role=group.

Bug: 888671
Change-Id: I5b99a720a59f051d551655f1aab86effa15d5d89
Reviewed-on: https://chromium-review.googlesource.com/c/1490366Reviewed-by: Joel Hockey <joelhockey@chromium.org>
Reviewed-by: calamity <calamity@chromium.org>
Commit-Queue: Luciano Pacheco <lucmult@chromium.org>
Cr-Commit-Position: refs/heads/master@{#636280}

Previously the image annotation code only handled OCR results
from the server. Now that captions and labels are hooked up,
expose those image annotation strings too.

Bug: 905419
Change-Id: I88542054c49ba252d5bc13d0024054059b8f5123
Reviewed-on: https://chromium-review.googlesource.com/c/1492475Reviewed-by: Katie Dektar <katie@chromium.org>
Commit-Queue: Dominic Mazzoni <dmazzoni@chromium.org>
Cr-Commit-Position: refs/heads/master@{#636279}

- Adds Widget::SetFullscreenAuxiliary(), which sets
  NSWindowCollectionBehaviorFullScreenAuxiliary and lets the dragging
  window exist in another window's fullscreen space.

- Sets that flag when tab dragging starts, clears it when dragging ends, and
  makes the new window fullscreen if the source was fullscreen.

Bug: 883910
Change-Id: I8889135320a0fb26abff9b546c5f5444ba6f4486
Reviewed-on: https://chromium-review.googlesource.com/c/1484491
Commit-Queue: Sidney San Martín <sdy@chromium.org>
Auto-Submit: Sidney San Martín <sdy@chromium.org>
Reviewed-by: Avi Drissman <avi@chromium.org>
Reviewed-by: Robert Sesek <rsesek@chromium.org>
Cr-Commit-Position: refs/heads/master@{#636278}

See bug for screencast.

Bug: 934487
Change-Id: I091960d22f606d0b1a8ec92156f16ac5284f5cc7
Reviewed-on: https://chromium-review.googlesource.com/c/1490754Reviewed-by: Rebekah Potter <rbpotter@chromium.org>
Commit-Queue: Hector Carmona <hcarmona@chromium.org>
Cr-Commit-Position: refs/heads/master@{#636277}

It was originally reverted for failing on Mac10.10 and Mac10.11
Revert commit: 8c27018b

Original change's description:
> [AF] GoogleBlue50 as Autofill's field preview bg color
>
> This basically reverts the experimentation scaffolding introduced by
> crrev.com/1174710, and makes GoogleBlue50 the field preview bg color
> for Autofill and Autocomplete.
>
> Bug: 935991
> Change-Id: Id821f57c5a2954d502ca241e4414fd452cc501ce
> Reviewed-on: https://chromium-review.googlesource.com/c/1489173
> Commit-Queue: Fabio Tirelo <ftirelo@chromium.org>
> Reviewed-by: Kent Tamura <tkent@chromium.org>
> Reviewed-by: Tommy Martino <tmartino@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#636103}


Bug: 935991
Change-Id: Ie33344a4a3364eb3de0603de64876c1be579daf4
Reviewed-on: https://chromium-review.googlesource.com/c/1492734
Commit-Queue: Fabio Tirelo <ftirelo@chromium.org>
Commit-Queue: Kent Tamura <tkent@chromium.org>
Auto-Submit: Fabio Tirelo <ftirelo@chromium.org>
Reviewed-by: Kent Tamura <tkent@chromium.org>
Cr-Commit-Position: refs/heads/master@{#636276}

Bug: 915568
Change-Id: I917d801b38c8afd1ac29af67bdd9d704e53514d9
Reviewed-on: https://chromium-review.googlesource.com/c/1491739
Auto-Submit: Simon Que <sque@chromium.org>
Reviewed-by: smut <smut@google.com>
Commit-Queue: smut <smut@google.com>
Cr-Commit-Position: refs/heads/master@{#636275}

The CloseNewestToExitConcurrentPlayback histogram was not
being recorded because of a race condition between closing
the tab and becoming inaudible and the web contents being
destroyed. This changes the metrics to check if a web
contents was recently audible instead of whether it is
currently audible.

BUG=936196

Change-Id: Ie3c1d8bbb0e11b099acbc2c163aeedf4b1c9d58f
Reviewed-on: https://chromium-review.googlesource.com/c/1490494Reviewed-by: Frank Liberato <liberato@chromium.org>
Commit-Queue: Becca Hughes <beccahughes@chromium.org>
Cr-Commit-Position: refs/heads/master@{#636274}

This will help understand how frequently Shaka packager is used in
the wild. If usage is high enough we may add a UKM to figure out
whom it's most popular with.

BUG=927952

Change-Id: I144fa524fd2450e5fdd31f9baa24a9bc7b6bfbee
Reviewed-on: https://chromium-review.googlesource.com/c/1464921
Commit-Queue: Mark Pearson <mpearson@chromium.org>
Reviewed-by: Mark Pearson <mpearson@chromium.org>
Reviewed-by: Matthew Wolenetz <wolenetz@chromium.org>
Auto-Submit: Dale Curtis <dalecurtis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#636273}

Change-Id: I20b544417028bc2d4ab770329b1c5d8fd2b55b49
Reviewed-on: https://chromium-review.googlesource.com/c/1493333
Auto-Submit: Owen Rodley <orodley@chromium.org>
Reviewed-by: Ken Rockot <rockot@google.com>
Commit-Queue: Ken Rockot <rockot@google.com>
Cr-Commit-Position: refs/heads/master@{#636272}

Now that we correctly compute the "intrinsic" cross size (really the
unstretched cross size), we no longer need both versions of the
cross_size. The algorithm only needs the unstretched size, so
repurpose cross_axis_size for that purpose and remove the other one.

The fixes to the intrinsic cross size were made in https://crrev.com/c/1483946 and
https://crrev.com/c/1484582.

Also renames CrossAxisIntrinsicExtentForChild to
CrossAxisUnstretchedExtentForChild to more clearly reflect its purpose.

I removed the TODO in the ng flexbox implementation because the
difference between the two sizes only matters if we avoid a layout,
but we don't do that in NG yet. (The NG cross size is always pre-stretching)

Change-Id: Iec8f4b63b5d897373b8ccc0b1d9e4ee4d19cffbf
Reviewed-on: https://chromium-review.googlesource.com/c/1492832
Commit-Queue: Christian Biesinger <cbiesinger@chromium.org>
Reviewed-by: David Grogan <dgrogan@chromium.org>
Auto-Submit: Christian Biesinger <cbiesinger@chromium.org>
Cr-Commit-Position: refs/heads/master@{#636271}

Bug: b/121299293
Test: unit test
Change-Id: I92241ad40f16f11dadf92ef8d2bb5e848a05131f
Reviewed-on: https://chromium-review.googlesource.com/c/1460642
Commit-Queue: Eliot Courtney <edcourtney@chromium.org>
Reviewed-by: Jesse Doherty <jwd@chromium.org>
Reviewed-by: Mitsuru Oshima (Slow) <oshima@chromium.org>
Cr-Commit-Position: refs/heads/master@{#636270}

This CL replaces shelf_globe.icon by properly resized one.
Also, it turned out kTrayIconSize is 16, while the intended size here
was actually 20x20, so the new icon is 20x20.

TEST=manual
BUG=931107

Change-Id: Iea5fd4f5e1b51bacf0ce8927d60afb52daa6a93c
Reviewed-on: https://chromium-review.googlesource.com/c/1491231Reviewed-by: Evan Stade <estade@chromium.org>
Commit-Queue: Tetsui Ohkubo <tetsui@chromium.org>
Cr-Commit-Position: refs/heads/master@{#636269}

This CL removes HostedRendererType, in favor of using one CreateRenderer
method per media::Renderer type.

Follow up CLs will focus on removing the indirections that were
necessary to support HostedRendererType.

Bug: 936116
Change-Id: I570ddc8dd5b2c3a168a9cdd9bbbf97ff99ef0dd2
Reviewed-on: https://chromium-review.googlesource.com/c/1490211Reviewed-by: Xiaohan Wang <xhwang@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Commit-Queue: Thomas Guilbert <tguilbert@chromium.org>
Cr-Commit-Position: refs/heads/master@{#636268}

Summary of changes available at:
https://chromium.googlesource.com/v8/v8/+log/348ff0ae..d29dda9d

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=luci.chromium.try:linux-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,v8-waterfall-sheriff@grotations.appspotmail.com

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

Bug: 930970
Change-Id: I46e78e8639ce34f51afeeecafbaf4d1062e08bd3
Reviewed-on: https://chromium-review.googlesource.com/c/1492365Reviewed-by: Yusuf Ozuysal <yusufo@chromium.org>
Reviewed-by: Tommy Nyquist <nyquist@chromium.org>
Commit-Queue: Wei-Yin Chen (陳威尹) <wychen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#636266}

Bug: 911326
Test: ParentAccessViewTest
Change-Id: I1be9fe83b2902a8895cc5af87b51d675e8711166
Reviewed-on: https://chromium-review.googlesource.com/c/1471494
Commit-Queue: Aga Wronska <agawronska@chromium.org>
Reviewed-by: Michael Giuffrida <michaelpg@chromium.org>
Reviewed-by: Jacob Dufault <jdufault@chromium.org>
Cr-Commit-Position: refs/heads/master@{#636265}

Minor maintenance change.

sqlite 3.27.2 update changes: https://www.sqlite.org/releaselog/3_27_2.html

Bug: 936195
Change-Id: I99a5ad5c4b8d7d8fb1d8fe80b1a968c2200ba94b
Reviewed-on: https://chromium-review.googlesource.com/c/1492782Reviewed-by: Victor Costan <pwnall@chromium.org>
Commit-Queue: Victor Costan <pwnall@chromium.org>
Commit-Queue: Darwin Huang <huangdarwin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#636264}

These tests already work with the NetworkService enabled. The confusion
was because the test was previously broken (and a chromium change
exposed this), but the test has since been fixed (http://aosp/878513). I
ran these tests on an up-to-date copy of Android master to verify.

Bug: 933814
Test: build/android/adb_system_webview_command_line --enable-features=NetworkService,NetworkServiceInProcess
Test: cd /path/to/android/master/
Test: atest CtsWebkitTestCases:WebViewSslTest#testSecureServerRequiringClientCertDoesCancelRequest
Test: atest CtsWebkitTestCases:WebViewSslTest#testSecureServerRequestingClientCertDoesNotCancelRequest
Change-Id: Icfc11d9e164e05e4a2dafcb99206cb340cce336a
Reviewed-on: https://chromium-review.googlesource.com/c/1487956Reviewed-by: John Abd-El-Malek <jam@chromium.org>
Commit-Queue: Nate Fischer <ntfschr@chromium.org>
Auto-Submit: Nate Fischer <ntfschr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#636263}

* Only enable window wide gamut on Q+
* Add code to allow embedder to enable the window wide color gamut
  check which affects raster.
* Add code to actually use P3 color space when enabled and acitivty is
  wide color gamut.
* Add a webview feature to enable the control for webview.

Bug: 924588
Change-Id: I02f18457d6e8240438d9f80cc30b639953b9d23d
Reviewed-on: https://chromium-review.googlesource.com/c/1489852Reviewed-by: Eric Karl <ericrk@chromium.org>
Commit-Queue: Bo <boliu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#636262}

Bug: b:126587141
Test: locally build and run. See dir removed when disabled.
Change-Id: Ic67d30d9a786078e90aac67447cec0b5e8187f6f
Reviewed-on: https://chromium-review.googlesource.com/c/1492050Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Commit-Queue: Xiaohui Chen <xiaohuic@chromium.org>
Cr-Commit-Position: refs/heads/master@{#636261}

Without this the WebContents thinks it's visible, which results in a bunch
of stuff happening that shouldn't.

BUG=936488
TEST=none

Change-Id: Ie5b1aee8d4b9c71566a37d9fdc8e51718ddf516d
Reviewed-on: https://chromium-review.googlesource.com/c/1492293Reviewed-by: Darren Shen <shend@chromium.org>
Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Commit-Queue: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#636260}

Bug: 932175
Change-Id: I3b60a4338ff0cf31eea7b1aed8c8364c85fda79c
Reviewed-on: https://chromium-review.googlesource.com/c/1492093Reviewed-by: Ken Rockot <rockot@google.com>
Commit-Queue: Robert Sesek <rsesek@chromium.org>
Cr-Commit-Position: refs/heads/master@{#636259}

Renames InstallWebAppOrShortcutFromWebContents to Install.
We chose InstallWebAppOrShortcutFromWebContents because there used to be
a difference between a WebApp and Shortcut. Since both are currently
the same and we have no plans to make them different, the naming no
longer makes sense.

Bug: 877898
Change-Id: I8173d9616351e4c641ba463b8e6de91be97aa513
Reviewed-on: https://chromium-review.googlesource.com/c/1493331Reviewed-by: Alexey Baskakov <loyso@chromium.org>
Commit-Queue: Giovanni Ortuño Urquidi <ortuno@chromium.org>
Cr-Commit-Position: refs/heads/master@{#636258}

This records various individual Picture-in-picture metrics for ChromeOS.

Bug: b/121299293
Test: chrome://histograms - triggered each type of count
Test: unit test
Change-Id: I397bd5f2d7a17718bf10c1839492610a2eb88cdb
Reviewed-on: https://chromium-review.googlesource.com/c/1457811Reviewed-by: Jesse Doherty <jwd@chromium.org>
Reviewed-by: Mitsuru Oshima (Slow) <oshima@chromium.org>
Commit-Queue: Eliot Courtney <edcourtney@chromium.org>
Cr-Commit-Position: refs/heads/master@{#636257}

telemetry_unittests and telemetry_perf_unittests are consistently
failing on Mac10.10 Tests and Mac10.11 Tests. Due to a bug in recipes
code, the failures are not causing the builds to fail, so they are
consuming resources and not producing any useful signal.

Bug: 936540
Change-Id: I49c0cebcc3cf1963c0e2776975ea82b6aa0b0640
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/1493153
Auto-Submit: Garrett Beaty <gbeaty@chromium.org>
Reviewed-by: John Budorick <jbudorick@chromium.org>
Commit-Queue: John Budorick <jbudorick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#636256}

Contrib benchmarks are those that are not supported on the Chrome perf
waterfall but can be manually run by users. This change includes them
in the results of list_benchmarks if the --include-contrib option is
supplied.

Change-Id: Ie09c16888e3bb276dd1f2a9dfe421cf2fbd0e7aa
Reviewed-on: https://chromium-review.googlesource.com/c/1491854Reviewed-by: Caleb Rouleau <crouleau@chromium.org>
Commit-Queue: Caleb Rouleau <crouleau@chromium.org>
Auto-Submit: Madeleine Barowsky <mbarowsky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#636255}