GitLab

local-sdk.py used "gen.py" which was deprecated and removed from
Fuchsia.

Change-Id: I390c7458eb863e19167a6255db2aed6e9b8233c2
Reviewed-on: https://chromium-review.googlesource.com/1003077Reviewed-by: James Robinson <jamesr@chromium.org>
Commit-Queue: Kevin Marshall <kmarshall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#549247}

Bug:830600
Change-Id: If56f9e005014061483dcaa2bc4d39abf8314f09e

NOTRY=true
TBR=eyaich@chromium.org
CC=hablich@chromium.org

Change-Id: If56f9e005014061483dcaa2bc4d39abf8314f09e
Reviewed-on: https://chromium-review.googlesource.com/1002923Reviewed-by: Ashley Enstad <ashleymarie@chromium.org>
Commit-Queue: Ashley Enstad <ashleymarie@chromium.org>
Cr-Commit-Position: refs/heads/master@{#549246}

Following bot results are included.
4673 4677

5 lines were removed and 16 lines were deflaked by consecutive
results since 4639.

TBR=eae@chromium.org, mstensho@chromium.org
NOTRY=true

Bug: 591099
Cq-Include-Trybots: master.tryserver.chromium.linux:linux_layout_tests_layout_ng
Change-Id: I63b7b166f023cb31777ffa840b5844b83b3d92fb
Reviewed-on: https://chromium-review.googlesource.com/1002414
Commit-Queue: Koji Ishii <kojii@chromium.org>
Reviewed-by: Koji Ishii <kojii@chromium.org>
Cr-Commit-Position: refs/heads/master@{#549245}

Not clear why cold Chrome is receiving intents with voice search
results. I was not able to reproduce locally with initiating search and
then killing Chrome while voice overlay is in foreground. Going to just
load CTA in this scenario.

Bug: 829495
Change-Id: I63cb9bbce8b469be7370513d644565464261218c
Reviewed-on: https://chromium-review.googlesource.com/1000545Reviewed-by: Ted Choc <tedchoc@chromium.org>
Commit-Queue: Maria Khomenko <mariakhomenko@chromium.org>
Cr-Commit-Position: refs/heads/master@{#549244}

This CL updates the modern media controls VR CSS to have the correct
pixel values based on the 0.66875 conversion factor.

Bug: 809021
Change-Id: Icc7cfbd4b53b9af8cfa3707a21e8c36b278b2872
Reviewed-on: https://chromium-review.googlesource.com/999734
Commit-Queue: Tommy Steimel <steimel@chromium.org>
Reviewed-by: Mounir Lamouri <mlamouri@chromium.org>
Cr-Commit-Position: refs/heads/master@{#549243}

This adds an Engagement.IsHigh.Changed bit to the SessionFinished UKM
that will be true if the IsHigh bit changed during the lifetime of the
session.

BUG=814351

Change-Id: I48b296301a59d7f92ce6fd8ac7750c41ed2bbecd
Reviewed-on: https://chromium-review.googlesource.com/964181
Commit-Queue: Becca Hughes <beccahughes@chromium.org>
Reviewed-by: Mounir Lamouri <mlamouri@chromium.org>
Reviewed-by: Steven Holte <holte@chromium.org>
Cr-Commit-Position: refs/heads/master@{#549242}

This is another config update that is part of renaming
these builders (at the same time as LUCI migration)

Bug: 790378, 790311, 790308
Change-Id: Ia7229dbb7de2675c28b5cd5b425542ea2232c89d
Reviewed-on: https://chromium-review.googlesource.com/1001292Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Commit-Queue: Quinten Yearsley <qyearsley@chromium.org>
Cr-Commit-Position: refs/heads/master@{#549241}

Change-Id: I76a741668409664e5f94a13988d826025e99de83
Reviewed-on: https://chromium-review.googlesource.com/1003172
Commit-Queue: Tommy Martino <tmartino@chromium.org>
Commit-Queue: Fabio Tirelo <ftirelo@chromium.org>
Reviewed-by: Fabio Tirelo <ftirelo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#549240}

Cronet tests were recently enabled for desktop platforms, some
auto-generated code appears to call function pointers across module
boundaries. Blacklist these calls for now.

Change-Id: If3f7cf2ee84ca86f2d40b80773e5eea1c6e71716
Reviewed-on: https://chromium-review.googlesource.com/1003074Reviewed-by: Peter Collingbourne <pcc@chromium.org>
Commit-Queue: Peter Collingbourne <pcc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#549239}

The browser should not attach client hints to the
requests fetched from cross origins.

Bug: 817049
Change-Id: Ia7cedfbb6edaaf3616d6e2783965cc52f93c0cd9
Reviewed-on: https://chromium-review.googlesource.com/1000841
Commit-Queue: Tarun Bansal <tbansal@chromium.org>
Reviewed-by: Philip Jägenstedt <foolip@chromium.org>
Cr-Commit-Position: refs/heads/master@{#549238}

Bug: 828404
Change-Id: Ie327e93f391376fd77cae2df998a921b4a9f0002
Reviewed-on: https://chromium-review.googlesource.com/1002873Reviewed-by: Scott Graham <scottmg@chromium.org>
Commit-Queue: agrieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#549237}

This change allows the toolbar for EoC to have a default click
listener attached to it. If the close button click listener does not
intercept the tap, the default one will. The new behavior is to expand
the bottom sheet when the toolbar is tapped.

Bug: 827371
Change-Id: I6ffe9388ad989a8db7a8ce19cff1b7c65b24379f
Reviewed-on: https://chromium-review.googlesource.com/1002985
Commit-Queue: Matthew Jones <mdjones@chromium.org>
Reviewed-by: Theresa <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#549236}

TBR=mef@chromium.org

Bug: 830707
Cq-Include-Trybots: master.tryserver.chromium.android:android_cronet_tester
Change-Id: I455fb0013d65ca3d2c44d5e2b28dfd977ff61aa3
Reviewed-on: https://chromium-review.googlesource.com/1003114
Commit-Queue: Helen Li <xunjieli@chromium.org>
Reviewed-by: Helen Li <xunjieli@chromium.org>
Cr-Commit-Position: refs/heads/master@{#549235}

This src-internal directory contains proprietary icons for the Views
Cast dialog.

Bug: 826393

Change-Id: I5a23e2f9d813f8e5fa39eb0adb4a0177814b6b5c
Reviewed-on: https://chromium-review.googlesource.com/1003094
Commit-Queue: Takumi Fujimoto <takumif@chromium.org>
Commit-Queue: mark a. foltz <mfoltz@chromium.org>
Reviewed-by: mark a. foltz <mfoltz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#549234}

Problem: There are 2 issues with these tests:
1. When testing glCopySubTextureCHROMIUM() the test does not clear
the previous error, so it fails when it calls glGetError(), as
the previous call to glTexImage2D also reports an error,
GL_INVALID_ENUM for GL_RED and GL_RG. This only occurs with ES2
devices.
2. When testing glCopyTextureCHROMIUM(), the error that will get hit
first and then returned depends on whether the test is being run
on a device with OpenGL ES2 or ES3+ capabilities. On ES2, the error
being returned is "internalformat GL_INVALID_VALUE".

Solution:
1. Clear previous error when testing glCopySubTextureCHROMIUM for
GL_INVALID_OPERATION so we get the error we are testing for.
2. Check if we get either GL_INVALID_VALUE or GL_INVALID_OPERATION,
as either is possible depending on which ES stack (ES2 or ES3) is
being executed base on the devices capabilities.

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;master.tryserver.chromium.win:win_optional_gpu_tests_rel
Change-Id: Ia99ea8a82341bd58fb634ea7144e142268ec6ab7
Reviewed-on: https://chromium-review.googlesource.com/1003075Reviewed-by: Antoine Labour <piman@chromium.org>
Commit-Queue: Antoine Labour <piman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#549233}

There are three cases:
- metrics consent is not given
- consent is given but sampled-out
- consent is given and sampled-in

Bug: 760317
Change-Id: Ie262dfeaba161069b19b5d91659054b136571315
Reviewed-on: https://chromium-review.googlesource.com/996034
Commit-Queue: Brian White <bcwhite@chromium.org>
Reviewed-by: Alexei Svitkine <asvitkine@chromium.org>
Cr-Commit-Position: refs/heads/master@{#549232}

Bug: 829394
Change-Id: I40384bdd8adf9d11f8647c3c5d2dc4c8775525b4
Reviewed-on: https://chromium-review.googlesource.com/998012
Commit-Queue: Sigurður Ásgeirsson <siggi@chromium.org>
Reviewed-by: François Doray <fdoray@chromium.org>
Reviewed-by: Chris Hamilton <chrisha@chromium.org>
Cr-Commit-Position: refs/heads/master@{#549231}

This CL integrates the KeyboardLock feature into the Chrome UX layer.
Integrating in the ExclusiveAccessManager allows fine grained control
over when KeyboardLock is activated (for instance we want keyboard lock
activated in tab-initiated fullscreen, but not in browser or content
fullscreen.  The FullscreenController provides that nuanced level of
control for us.

Also, Keyboardlock should only be available to one
tab at a time which is conceptually the same as Fullscreen and
PointerLock.

Lastly, we need to integrate KeyboardLock logic into
the mechanism used for exiting fullscreen and displaying the exit
fullscreen instructions/bubble.  Future CLs will add an animated
exit UX which is tied to the press and hold gesture, and a rapid
tap 'panic' timer which will reshow the exit instructions (these
two behaviors were suggested as part of the UX design process).

I have some initial browsertests for this feature however I have
not added interactive browsertests yet as I would like to get
feedback on the implementation before adding additional tests.
I will add those in a follow-up CL if this impl looks good.

BUG=680809

Change-Id: I6588367875934b59ba979cef65a73707c3d85320
Reviewed-on: https://chromium-review.googlesource.com/989021Reviewed-by: Dominick Ng <dominickn@chromium.org>
Reviewed-by: Yuri Wiitala <miu@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Ilya Sherman <isherman@chromium.org>
Reviewed-by: Nick Carter <nick@chromium.org>
Commit-Queue: Joe Downing <joedow@chromium.org>
Cr-Commit-Position: refs/heads/master@{#549230}

https://codereview.chromium.org/2750673006 sets margin to 0 for <body>
in chrome://welcome to prevent vertical scroll bar from always showing,
but as a result, makes text look poor when window is shrunken. This CL
augments the old fix with padding and box-sizing, to solve both
problems.

Bug: 778202
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: I9480799be706e58fb27884f178b2652094a39394
Reviewed-on: https://chromium-review.googlesource.com/996856Reviewed-by: Demetrios Papadopoulos <dpapad@chromium.org>
Reviewed-by: Samuel Huang <huangs@chromium.org>
Commit-Queue: Samuel Huang <huangs@chromium.org>
Cr-Commit-Position: refs/heads/master@{#549229}

BUG=268984

Change-Id: I169b9811b695934e7b4ec9420c7efcd02175e2e5
Reviewed-on: https://chromium-review.googlesource.com/996014
Commit-Queue: Avi Drissman <avi@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#549228}

Android Things UpdateEngine has an API for retrieving the current update
channel. We now return this to sys_info as the release channel.

1. Separate Android Things sys_info from Android
2. Return correct release channel from AT UpdateEngine

BUG=72137029
TEST=Build, Check returned release channel

Change-Id: If60b698eb833c54cd4899b647a91b6073c60e071
Reviewed-on: https://chromium-review.googlesource.com/996916Reviewed-by: Luke Halliwell <halliwell@chromium.org>
Commit-Queue: Aidan Wolter <awolter@chromium.org>
Cr-Commit-Position: refs/heads/master@{#549227}

Specs are defined in https://wicg.github.io/background-fetch/#backgroundfetchsettledevent.

This is the first step in replacing the BackgroundFetched* API.

Bug: 822765
Change-Id: Ib725b0c389edc32563f45bd26d72621b7031ad31
Reviewed-on: https://chromium-review.googlesource.com/975549
Commit-Queue: Rayan Kanso <rayankans@chromium.org>
Reviewed-by: Mike West <mkwst@chromium.org>
Reviewed-by: Peter Beverloo <peter@chromium.org>
Cr-Commit-Position: refs/heads/master@{#549226}

https://chromium.googlesource.com/chromiumos/chromite.git/+log/f10b482799b3..02ef76b018ac

$ git log f10b48279..02ef76b01 --date=short --no-merges --format='%ad %ae %s'
2018-04-05 achuith cros_vm: Support for specifying cache directory.

Created with:
  roll-dep src/third_party/chromite
BUG=chromium:828589


The AutoRoll server is located here: https://chromite-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=chrome-os-gardeners@chromium.org

Change-Id: I19d919f4492b43e8ba784d67cab508848cc52eb3
Reviewed-on: https://chromium-review.googlesource.com/1002885Reviewed-by: Chromite Chromium Autoroll <chromite-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Commit-Queue: Chromite Chromium Autoroll <chromite-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Cr-Commit-Position: refs/heads/master@{#549225}

This CL adds support for Heap Profiling via an out-of-process service to
Android WebView. The architecture matches that of Chrome for Android and Desktop
platforms.

This is intended to help developers working on Android WebView trace down issues
in the implementation of Android WebView.

* This feature can only be enabled via command-line flags, set via adb.

adb shell 'echo "_ --memlog=browser" > /data/local/tmp/webview-command-line'

Other flags are also available, see
src/docs/memory/debugging_memory_issues.md#taking-a-heap-dump

* This CL only adds support for heap profiling the browser process.

* When the feature is enabled:
  * The browser process starts the Heap Profiling Service in a sandboxed utility
    process.
  * The browser process begins profiling itself via the HeapProfilingClient
    interface.
  * Heap dumps are availabe via memory-infra traces from chrome://tracing.

* Note: This feature requires the profiling service to be hosted in a separate
process than the one being profiled. This means that it only works on Android
O+, and N when multi-process WebView is enabled.

Bug: 827545
Change-Id: I96d4b42945ea81bae5b32bdea802fd788d963b8d
Reviewed-on: https://chromium-review.googlesource.com/999993Reviewed-by: Richard Coles <torne@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Reviewed-by: Avi Drissman <avi@chromium.org>
Reviewed-by: Robert Sesek <rsesek@chromium.org>
Reviewed-by: Ken Rockot <rockot@chromium.org>
Commit-Queue: Erik Chen <erikchen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#549224}

https://crrev.com/c/996757 left this builder. It is used by the
mac10.13_blink_rel try bot.

Bug: 828543
Change-Id: Ic6017a32994d43419bb16af039454bad1f42e0fc
Reviewed-on: https://chromium-review.googlesource.com/1002919Reviewed-by: John Budorick <jbudorick@chromium.org>
Commit-Queue: Robert Ma <robertma@chromium.org>
Cr-Commit-Position: refs/heads/master@{#549223}

Layer serves no purpose except keeping track of whether there are any
pending readback requests. It used to be used for actual readback
requests, but requests have been moved to surfaces when they were
introduced.

Remove it and replace it with a counter instead.

Change-Id: I37eafbe462672703805440001346de485a03c30e
Reviewed-on: https://chromium-review.googlesource.com/1001612Reviewed-by: Ted Choc <tedchoc@chromium.org>
Commit-Queue: Bo <boliu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#549222}

R=cmasso@chromium.org

Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation;master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:ios-simulator-full-configs
Change-Id: Idcb1dd567a7820a7b36abc3f7671059d39674671
Reviewed-on: https://chromium-review.googlesource.com/1003053Reviewed-by: Krishna Govind <govind@chromium.org>
Cr-Commit-Position: refs/heads/master@{#549221}

Renames "WebKit/source" to "blink/renderer" references in DevTools.
Skipping presubmit for protocol.json and CodeMirror (usually
requires words "roll CodeMirror" in description when making changes
in cm/ or cm_modes/).

NOPRESUBMIT=true

Bug: none
Change-Id: Iadb44142a5ae1058dae656b93e904c7636f1fa32
Reviewed-on: https://chromium-review.googlesource.com/1003033Reviewed-by: Dmitry Gozman <dgozman@chromium.org>
Commit-Queue: Erik Luo <luoe@chromium.org>
Cr-Commit-Position: refs/heads/master@{#549220}

ObjectTemplateBuilder (and Wrappable) allow setting functions that are
exposed in JS and then forwarded to the type in C++. If these are C++
member functions, the context object is retrieved by looking at the
this-object in JavaScript, and trying to convert that to the underlying
C++ type (which will succeed if it was called on the V8 object created
by the Wrappable).

However, these member functions will fail if the JS function is called
on an improper this-object (including null and undefined). This means
that doing things like:

var obj = getObj();  // Some object from a Wrappable
var doFoo = obj.doFoo;
doFoo();

will fail because it's applied on an invalid this-object (undefined),
and the conversion will fail. This makes sense, but unfortunatley the
error gin throws in this case is unhelpful:
"Uncaught TypeError: Error processing argument at index -1, conversion
failure from undefined"

Instead, allow Wrappables and ObjectTemplateBuilders to specify a type
name, which will be surfaced in these errors to provide guidance to
developers. Update the error message to either include the type name or
to match the error message used in similar circumstances in blink
("Illegal invocation").

The new error messages will only be shown for failures in converting to
the context object, not for failure to convert subsequent arguments.

Bug: <File One>

Change-Id: I515a17e92992bfcb709b97455b9167b350e931f2
Reviewed-on: https://chromium-review.googlesource.com/987304
Commit-Queue: Devlin <rdevlin.cronin@chromium.org>
Reviewed-by: Jeremy Roman <jbroman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#549219}

Add some additional trace methods for when mojo input is received.

Bug: None
Change-Id: I84e78ffaac21995894f20f6778e83ba1213c8d06
Reviewed-on: https://chromium-review.googlesource.com/998672Reviewed-by: David Bokan <bokan@chromium.org>
Commit-Queue: Dave Tapuska <dtapuska@chromium.org>
Cr-Commit-Position: refs/heads/master@{#549218}

USM accounts should be treated as child accounts in Chrome. Design doc:
go/usm-accounts-chrome (sorry, internal only).

Bug: 826299
Change-Id: I935a0de549d38674af8ce27a8a9a853ec1e8fa76
Reviewed-on: https://chromium-review.googlesource.com/998632Reviewed-by: Boris Sazonov <bsazonov@chromium.org>
Commit-Queue: Bruno Kim Medeiros Cesar <brunokim@chromium.org>
Cr-Commit-Position: refs/heads/master@{#549217}

Bug: none
Change-Id: Ic29c5c2938e3d395fec9f9eb9097128770f5dc9d
Reviewed-on: https://chromium-review.googlesource.com/1002990Reviewed-by: Erik Luo <luoe@chromium.org>
Commit-Queue: Dmitry Gozman <dgozman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#549216}

When the notification is
* in notification center (not popup)
* pinned
then, we should not show close button on mouse hover.

TEST=manual
BUG=829582

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

Also enable the test when the network service is enabled.

Content Shell sends a different content-encoding with the network
service enabled and disabled, due to Brotli only being enabled on one
path.  While I plan to enable Brotli in both cases, it also seems like
a good idea to remove this dependency.

Bug: 825687
Cq-Include-Trybots: master.tryserver.chromium.linux:linux_mojo
Change-Id: I9c768099dfd6a876f7650088118de4582ec1ca46
Reviewed-on: https://chromium-review.googlesource.com/998756Reviewed-by: Adam Rice <ricea@chromium.org>
Commit-Queue: Matt Menke <mmenke@chromium.org>
Cr-Commit-Position: refs/heads/master@{#549214}

R=thestig
TBR=thakis
BUG=800977

Change-Id: I1147d171fee32e8ce51c08449a1a50144d5e051b
Reviewed-on: https://chromium-review.googlesource.com/1002986Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#549213}

BUG=none
TEST=none

Change-Id: I387c43f58eaf7bf3a1f2dd01c40c9fd6974b3413
Reviewed-on: https://chromium-review.googlesource.com/1002953Reviewed-by: Michael Spang <spang@chromium.org>
Commit-Queue: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#549212}

This CL changes the distance between controls and UI edges.
Specs: https://goto.google.com/ios-chrome-download-manager-specs

Bug: 791806
Cq-Include-Trybots: master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:ios-simulator-full-configs
Change-Id: Ibabcc6f7b0626814ce15e8e3da67e3f630feb3c8
Reviewed-on: https://chromium-review.googlesource.com/999046
Commit-Queue: Eugene But <eugenebut@chromium.org>
Reviewed-by: edchin <edchin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#549211}

Updates the links used for the WebVR motion to photon latency tests to
be more similar to the ones used for the WebVR Telemetry tests.

Change-Id: I0830eaa9d2a5cd2f79fbed71fe013de3092cc815
Reviewed-on: https://chromium-review.googlesource.com/1000729Reviewed-by: Klaus Weidner <klausw@chromium.org>
Commit-Queue: Brian Sheedy <bsheedy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#549210}

Wait for the print ticket item change event before validating UI. We
already do this in the new system_dialog_browsertest.js tests. Try
doing this in the old tests also, to see if it will help with a test
flake.

Bug: 829265
Change-Id: I12062efa3e3fd29b4c2e000fd6e240fcdb140ca6
Reviewed-on: https://chromium-review.googlesource.com/998441Reviewed-by: Demetrios Papadopoulos <dpapad@chromium.org>
Commit-Queue: Rebekah Potter <rbpotter@chromium.org>
Cr-Commit-Position: refs/heads/master@{#549209}

The trigger now listens to page load events, suspicious site list
hits, and a report delay callback. A simple state model reconciles
these events and creates reports at the right time.

Also some basic unit tests.

This is a no-op since the trigger is disabled by default.
Next CL will add metrics to the trigger and more tests.

Bug: 817377
Change-Id: Ica12e87debf39fb4f2e47a4e92d1f9cf1d40491e
Reviewed-on: https://chromium-review.googlesource.com/998532
Commit-Queue: Luke Z <lpz@chromium.org>
Reviewed-by: Jialiu Lin <jialiul@chromium.org>
Cr-Commit-Position: refs/heads/master@{#549208}