GitLab

When RenderFrameProxy::CreateFrameProxy() is called, it will
1) Make a RenderFrameProxy
2) Make a WebRemoteFrame
3) Swap out the RenderWidget on the RenderView
4) Give the WebRemoteFrame to the RenderFrameProxy

This is called from RenderViewImpl::Initialize, or from an IPC from
the browser via Mojo to RenderThreadImpl::CreateFrameProxy.

In the latter case, it doesn't appear to remove the local main frame
from the RenderViewImpl/RenderWidget. This is done by the
browser destroying/detaching the main frame separately. But since
detaching sets the LocalFrame to nullptr but does not SwapOut the
RenderWidget, this call is required in RenderFrameProxy to do the
SwapOut. At that time we should also stop the compositor.

R=piman@chromium.org

Change-Id: I24da561e14eea0e23e7e16d0af38f95279a27ed2
Bug: 896836
Reviewed-on: https://chromium-review.googlesource.com/c/1335661Reviewed-by: Antoine Labour <piman@chromium.org>
Commit-Queue: danakj <danakj@chromium.org>
Cr-Commit-Position: refs/heads/master@{#608445}

TBR=alemate@chromium.org

Bug: 905109
Change-Id: I7be1cccec0a18ee7d6a664d736aa0ab55512911b
Reviewed-on: https://chromium-review.googlesource.com/c/1338219Reviewed-by: Jacob Dufault <jdufault@chromium.org>
Commit-Queue: Jacob Dufault <jdufault@chromium.org>
Cr-Commit-Position: refs/heads/master@{#608444}

Also, do not allow negative sizes.

Bug: 881076
Change-Id: I254d52258f5902d5d8740e74be35012cdf2b43e4
Reviewed-on: https://chromium-review.googlesource.com/c/1336524Reviewed-by: Joshua Pawlicki <waffles@chromium.org>
Commit-Queue: Sorin Jianu <sorin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#608443}

Set the gesture event as handled if it can not be used to drag the window
during window drag. Browser window is special since it has its own logic
to handle the drag.

Bug: 900959, 877976
Change-Id: I6a9416505da7fc92306ad5c364f4be04213dd992
Reviewed-on: https://chromium-review.googlesource.com/c/1332289
Commit-Queue: Min Chen <minch@chromium.org>
Reviewed-by: Mitsuru Oshima <oshima@chromium.org>
Cr-Commit-Position: refs/heads/master@{#608442}

RefreshThrottlerTest tests broke on the day daylight savings time
ended. To fix this, set a TestClock's time to a specific date so the
real date will never affect tests going forward. Removed all unittest
usage of Time::Now in Feed code.

Bug: 901698
Change-Id: I76b0b092aa12b7c4fef65a353caa317a381f32c1
Reviewed-on: https://chromium-review.googlesource.com/c/1324414
Commit-Queue: Sky Malice <skym@chromium.org>
Reviewed-by: Yuri Wiitala <miu@chromium.org>
Reviewed-by: Filip Gorski <fgorski@chromium.org>
Cr-Commit-Position: refs/heads/master@{#608441}

- When the dropdown is shown we record if password generation is available.
- The type of the chosen suggestion is recorded.

Bug: 883319
Change-Id: I69ac20b4022707cbcb57164b8718feecf85ab83a
Reviewed-on: https://chromium-review.googlesource.com/c/1335605
Commit-Queue: Vasilii Sukhanov <vasilii@chromium.org>
Reviewed-by: Ioana Pandele <ioanap@chromium.org>
Reviewed-by: Ilya Sherman <isherman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#608440}

Move keyboard extension out of server.cc
This CL only moves code around.

Bug: 896710
Test: Built on ChromeOS
Change-Id: I15ea4ac7f9c5cabf9470d0478cd91a409c0b5e6a
Reviewed-on: https://chromium-review.googlesource.com/c/1320028
Commit-Queue: Shawn Gallea <sagallea@google.com>
Reviewed-by: Daniele Castagna <dcastagna@chromium.org>
Reviewed-by: Daniel Nicoara <dnicoara@chromium.org>
Cr-Commit-Position: refs/heads/master@{#608439}

Bug: chromedriver:2655
Change-Id: I8afab41743acd2d98e53b19e0bc11835c2025590
Reviewed-on: https://chromium-review.googlesource.com/c/1330837
Commit-Queue: Tatiana Buldina <buldina@chromium.org>
Reviewed-by: John Chen <johnchen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#608438}

https://swiftshader.googlesource.com/SwiftShader.git/+log/1147fc2..8f20452

BUG=

TBR=kbr@chromium.org

TEST=bots

CQ_INCLUDE_TRYBOTS=luci.chromium.try:win_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:android_optional_gpu_tests_rel

Change-Id: Ic5665d363a86d8e381b8c244af830951636025fe
Reviewed-on: https://chromium-review.googlesource.com/c/1338166Reviewed-by: Alexis Hétu <sugoi@chromium.org>
Commit-Queue: Alexis Hétu <sugoi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#608437}

Fix bug where all custom ErrorProne checks were not running.
Introduced by:
https://chromium-review.googlesource.com/c/chromium/src/+/1252006/

Changing the jar wildcard from * to *.class excluded metadata
files generated by Autoservice which were needed to load
the custom ErrorProne checks.

This CL reverts that pattern change.

Bug: 904524
Change-Id: Id452f2d797872eb306fcd52be433128c8835e015
Reviewed-on: https://chromium-review.googlesource.com/c/1331877Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
Reviewed-by: Eric Stevenson <estevenson@chromium.org>
Commit-Queue: Aiden Benner <abenner@google.com>
Cr-Commit-Position: refs/heads/master@{#608436}

On Desktop, with Query in Omnibox, the URL would flicker in for a second
while the search page was loading and before it got its security state.

This CL fixes that by ignoring the security state while the page is
loading. This is the same solution that the Android implementation has.

This CL also changes the ignore_security_state flag from a member
variable the caller toggles on and off to an additional parameter that's
passed in when the caller retrieves the query terms.

Bug: 874592
Change-Id: Ic5b8c78798b0119a63b5934c956a6395e4e6d769
Reviewed-on: https://chromium-review.googlesource.com/c/1274896Reviewed-by: Adrienne Porter Felt <felt@chromium.org>
Reviewed-by: Christopher Thompson <cthomp@chromium.org>
Reviewed-by: Ted Choc <tedchoc@chromium.org>
Reviewed-by: Troy Hildebrandt <thildebr@chromium.org>
Reviewed-by: Justin Donnelly <jdonnelly@chromium.org>
Commit-Queue: Tommy Li <tommycli@chromium.org>
Cr-Commit-Position: refs/heads/master@{#608435}

To investigate a crash on ChromeOS, fail safe code and reporting are
added to EventRouter dispatcher and ChromeExtensionsBrowserClient.

Bug: 870838
Change-Id: I8da1a56f80e247d68f26c8d8027f1eb36cea272f
Reviewed-on: https://chromium-review.googlesource.com/c/1335594
Commit-Queue: Ramin Halavati <rhalavati@chromium.org>
Reviewed-by: Devlin <rdevlin.cronin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#608434}

Remove any knowledge of AccountTrackerService, FakeSiginManager[Base],
FakeProfileOAuth2TokenService and FakeGaiaCookieManagerService from
ProfileSyncServiceBundle, and depend solely on IdentityTestEnvironment.

Bug: 886600
Change-Id: I268bc85d70c164efa3b9650565b9de13c98f4b4b
Reviewed-on: https://chromium-review.googlesource.com/c/1337618Reviewed-by: Marc Treib <treib@chromium.org>
Reviewed-by: Colin Blundell <blundell@chromium.org>
Commit-Queue: Mario Sanchez Prada <mario@igalia.com>
Cr-Commit-Position: refs/heads/master@{#608433}

Bug: 881076
Change-Id: I9f9739197c903cce7b0814b54df4314d2917b6eb
Reviewed-on: https://chromium-review.googlesource.com/c/1334969Reviewed-by: Joshua Pawlicki <waffles@chromium.org>
Reviewed-by: Robert Kaplow <rkaplow@chromium.org>
Commit-Queue: Sorin Jianu <sorin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#608432}

Bug: webrtc:9890
Change-Id: If468bc7001228c55c8c610d1d88444da98365be1
Reviewed-on: https://chromium-review.googlesource.com/c/1338083Reviewed-by: Emircan Uysaler <emircan@chromium.org>
Commit-Queue: Erik Språng <sprang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#608431}

The server never sees it, so it can't be part of a reflected XSS. It
may be part of a DOM XSS, but XSSAuditor doesn't handle these, except
for a few document.write() cases that aren't likely to manifest in
the wild (but are hit by tests).

Bug: 877347
Change-Id: I6835c7702d0a8db829f5fde17be15015112a5e13
Reviewed-on: https://chromium-review.googlesource.com/c/1336368Reviewed-by: Mike West <mkwst@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#608430}

  Before this CL, when autofilling addresses, the company name was always
filled in if it was specified as part of a country's address fields.

  However, we want to remove the company field from autofill. This is being
rolled out via a Flag and finch config.

  The initial CL that addressed this in https://crrev.com/c/1315536 did not
make any changes to the Android platform, but this CL updates the
bridge between C++ and Java code to filter out the company field if applicable.

Bug: 890972
Change-Id: I449603a1d6e8610bcab031c31807c39e7bea9cd1
Reviewed-on: https://chromium-review.googlesource.com/c/1330791
Commit-Queue: Jeffrey Cohen <jeffreycohen@chromium.org>
Reviewed-by: Tommy Nyquist <nyquist@chromium.org>
Cr-Commit-Position: refs/heads/master@{#608429}

It is marked for deletion and has no callers.

Change-Id: Iceb00f843a300c7dcb1d6925423227e9c17d49a3
Reviewed-on: https://chromium-review.googlesource.com/c/1337010Reviewed-by: Gabriel Charette <gab@chromium.org>
Reviewed-by: Jochen Eisinger <jochen@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#608428}

- Inline DidFailProvisionalLoadInternal to the callsites,
and carefully avoid the logic which is only needed in one place.

- Move EnableViewSourceMode(false) to the most inner method
which is used for error page loading, since we were missing it in
some call paths.

- When committing failed navigation, we use the newly constructed
"failed_request" instead of taking one from the provisional loader.
At some point, there will be no provisional loader to take the
request from, so we might as well switch right now.

Bug: 855189
Change-Id: Idf9eba3c3014c1e68a860ceff6051f1ff576062c
Reviewed-on: https://chromium-review.googlesource.com/c/1332700Reviewed-by: Arthur Sonzogni <arthursonzogni@chromium.org>
Reviewed-by: Charlie Reis <creis@chromium.org>
Commit-Queue: Dmitry Gozman <dgozman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#608427}

Clean up old fashion code in find_in_page.js to make it easier to fix the bug.

Bug: 228585
Change-Id: If19a58773bb3d054116afd935bfc0a72942ea4a5
Reviewed-on: https://chromium-review.googlesource.com/c/1327206Reviewed-by: Peter Lee <pkl@chromium.org>
Reviewed-by: Rohit Rao <rohitrao@chromium.org>
Commit-Queue: Yi Su <mrsuyi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#608426}

https://skia.googlesource.com/skia.git/+log/1315333b6bfb..abaffd85abb7


git log 1315333b6bfb..abaffd85abb7 --date=short --no-merges --format='%ad %ae %s'
2018-11-15 caryclark@skia.org bookmaker does deprecated
2018-11-15 mtklein@google.com lookup received factories directly


Created with:
  gclient setdep -r src/third_party/skia@abaffd85abb7

The AutoRoll server is located here: https://autoroll.skia.org/r/skia-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.

CQ_INCLUDE_TRYBOTS=luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux-chromeos-compile-dbg;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.blink:linux_trusty_blink_rel
TBR=rmistry@chromium.org

Change-Id: Idb2583e5d7a10f1b2ddadf62c1eeb690e15410e7
Reviewed-on: https://chromium-review.googlesource.com/c/1337480Reviewed-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@{#608425}

Replace usage of PO2TS APIs with calls to IdentityManager's methods.

Bug: 904412
Change-Id: I0543f8e4c78a5b19915933082f9f9074dcb4d7d8
Reviewed-on: https://chromium-review.googlesource.com/c/1338082Reviewed-by: David Roger <droger@chromium.org>
Commit-Queue: Mario Sanchez Prada <mario@igalia.com>
Cr-Commit-Position: refs/heads/master@{#608424}

Extend the prohibition of logging PII to user data in general and add
some examples.

Bug: none
Change-Id: I6fc97b2e3aaf404ba5e5622037a6c748a4e470ca
Reviewed-on: https://chromium-review.googlesource.com/c/1335571Reviewed-by: Richard Coles <torne@chromium.org>
Commit-Queue: Thiemo Nagel <tnagel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#608423}

This patch changes |StartOfSentence()| to utilize |TextSegments|
class to make it work with LayoutNG.

Bug: 778507
Change-Id: I462e99f3a3c5cf84dfeab67cc324d985478ed570
Reviewed-on: https://chromium-review.googlesource.com/c/1335959
Commit-Queue: Xiaocheng Hu <xiaochengh@chromium.org>
Reviewed-by: Yoshifumi Inoue <yosin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#608422}

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

This makes blacklisting work even when the URL is well formed but not
canonical, for example if the trailing slash is missing.

Bug: 902626
Change-Id: Ibced76fd3ad19248d50fc088cc3e54f7ee5ef9af
Reviewed-on: https://chromium-review.googlesource.com/c/1336511Reviewed-by: Peter Williamson <petewil@chromium.org>
Commit-Queue: Justin DeWitt <dewittj@chromium.org>
Cr-Commit-Position: refs/heads/master@{#608420}

This patch adds IsEmptyLineBox() function that returns
whethe the line box is "empty", or "certain zero-height
line box" as defined in CSS2[1] or not, and change where
we used to determine it by checking if the number of children
is 0.

[1] https://drafts.csswg.org/css2/visuren.html#phantom-line-box

Bug: 636993, 903578
Change-Id: I2b9961e1ecb743063238b39a3a5be53f15ffce8c
Reviewed-on: https://chromium-review.googlesource.com/c/1332972Reviewed-by: Aleks Totic <atotic@chromium.org>
Commit-Queue: Koji Ishii <kojii@chromium.org>
Cr-Commit-Position: refs/heads/master@{#608419}

R=csharp@chromium.org

Bug: 830892
Change-Id: I13ef01f4194bc747b4c9ea28537a188aa9315c49
Reviewed-on: https://chromium-review.googlesource.com/c/1336067
Commit-Queue: Joe Mason <joenotcharles@google.com>
Reviewed-by: Chris Sharp <csharp@chromium.org>
Cr-Commit-Position: refs/heads/master@{#608418}

The transform-post-multiplication testis very sensitive to changes in 2D matrix interpolation. This patch addresses the following:

* Use a prefix that guarantees that matrix and pairwise interpolation product different transforms.
  Previously relying on subtle numerical precision discrepancies.
  With the new prefix, pairwise will scale and transform will rotate.
* Fix matrix comparison to consider the full floating point value and not just the mantissa.
  Previously small non-zero values would be perceived as a matrix mismatch.

Bug: 797472

Change-Id: I9120f2f92195cf2559ff2eb4294e1341195c277e
Reviewed-on: https://chromium-review.googlesource.com/c/1337639Reviewed-by: Stephen McGruer <smcgruer@chromium.org>
Commit-Queue: Kevin Ellis <kevers@chromium.org>
Cr-Commit-Position: refs/heads/master@{#608417}

Flaky on linux bot

https://ci.chromium.org/p/chromium/builders/luci.chromium.ci/Linux%20Tests%20%28dbg%29%281%29

TBR=sahel@chromium.org

Bug: 905694
Change-Id: I749d9795251c53c651b7000d0bedfa7d09d6e040
Reviewed-on: https://chromium-review.googlesource.com/c/1338164Reviewed-by: Ella Ge <eirage@chromium.org>
Commit-Queue: Ella Ge <eirage@chromium.org>
Cr-Commit-Position: refs/heads/master@{#608416}

TBR=dtseng@chromium.org

Bug: 899777
Change-Id: Id56ad8bb68c95b4412fbc9ebacef7921216fe9ce
Reviewed-on: https://chromium-review.googlesource.com/c/1317924
Commit-Queue: Jacob Dufault <jdufault@chromium.org>
Reviewed-by: Alexander Alekseev <alemate@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#608415}

We cannot assume that when we push a line to the next fragmentainer
(because it doesn't fit in the current one), the line is going to fit
there. If the next fragmentainer has a float that nothing fits beside
and the float is too tall to fit the line below it, we need to jump to
yet another fragmentainer in order to find room for the line.

Bug: 902762
Change-Id: Ied14694ed1ad4fc25d28527edd1ca7389f00664c
Reviewed-on: https://chromium-review.googlesource.com/c/1335580
Commit-Queue: Morten Stenshorne <mstensho@chromium.org>
Reviewed-by: Koji Ishii <kojii@chromium.org>
Cr-Commit-Position: refs/heads/master@{#608414}

LibFuzzer runtime on Windows was accidentally removed, add it back.

Bug: 905664,903078
Change-Id: Ie6343d02c6d13e18c71dee11b5219c0bb4e81dd0
Reviewed-on: https://chromium-review.googlesource.com/c/1337809
Commit-Queue: Jonathan Metzman <metzman@chromium.org>
Reviewed-by: Max Moroz <mmoroz@chromium.org>
Reviewed-by: Hans Wennborg <hans@chromium.org>
Cr-Commit-Position: refs/heads/master@{#608413}

On the current implementation, on a navigation error, the
error_retry_state_machine expect a second navigation after any error to
load the error page.
When displaying an offline page, this second navigation displayes a
native content and DidFinishNavigation is never called, so the
navigation is not cleaned.
On reload, this causes a DCHECK and a navigation failure.

This CL report a success on native navigation.

Note:
While this fix gives the expected result, there is still a bug in the
error_retry_state_maching as the state will be put in
kDisplayingWebErrorForFailedNavigation instead of success state.
Fixing this behavior is not in the scope of this CL and can be fixed in
the future by ErrorRetryStateMachine owners.

Bug: 904784
Change-Id: Ic4efe212f933e8631f1b97dbf1a5633dd8a8cc54
Reviewed-on: https://chromium-review.googlesource.com/c/1335932
Commit-Queue: Olivier Robin <olivierrobin@chromium.org>
Reviewed-by: Eugene But <eugenebut@chromium.org>
Reviewed-by: Danyao Wang <danyao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#608412}

This re-adds the previously approved and committed browsertest, but this
time with a fix for the flakiness.

The body of the test remains the same, but with an extra call to:
PluginTestUtils::WaitForPlaceholderReady(GetActiveWebContents(),
                                         "pdf_embed");

There is also an update the command line flags and an extra include.

This is patch 3/3 for this objective.

Bug: 887752, 879149, 878871
Change-Id: Ie8c70d68fb3e3ebf9e70e5d9f2f1aa2f37b190f4
Reviewed-on: https://chromium-review.googlesource.com/c/1336086Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tommy Li <tommycli@chromium.org>
Cr-Commit-Position: refs/heads/master@{#608411}

Bug: 807068
Change-Id: I00d910ee1fc84c08d1bbab4638d70dd2df7848e4
Reviewed-on: https://chromium-review.googlesource.com/c/1336131Reviewed-by: Sergey Poromov <poromov@chromium.org>
Reviewed-by: Mattias Nissler <mnissler@chromium.org>
Commit-Queue: Nikita Podguzov <nikitapodguzov@google.com>
Cr-Commit-Position: refs/heads/master@{#608410}

https://android.googlesource.com/platform/external/perfetto.git/+log/c17c1dc0e795..1ff7a8e7e55f


git log c17c1dc0e795..1ff7a8e7e55f --date=short --no-merges --format='%ad %ae %s'
2018-11-15 fmayer@google.com Merge "profiling: Do not install hook if Client init fails."


Created with:
  gclient setdep -r src/third_party/perfetto@1ff7a8e7e55f

The AutoRoll server is located here: https://autoroll.skia.org/r/perfetto-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=perfetto-bugs@google.com

Change-Id: I6a28d820fa9bea095da70e4ad7c9e81e5db22373
Reviewed-on: https://chromium-review.googlesource.com/c/1337532Reviewed-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@{#608409}

Summary of changes available at:
https://chromium.googlesource.com/v8/v8/+log/14d42672..144f1014

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=master.tryserver.blink:linux_trusty_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: If404436bccc2f14ca6d015170f60342eff8d621e
Reviewed-on: https://chromium-review.googlesource.com/c/1337636Reviewed-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@{#608408}

The static method is only used in one special case for tests,
where it can be eliminated using a fake match instance.

Change-Id: Idb2d24ac0b457d7fcc13b519f78ed218bcd06d00
Reviewed-on: https://chromium-review.googlesource.com/c/1336849Reviewed-by: Justin Donnelly <jdonnelly@chromium.org>
Commit-Queue: Orin Jaworski <orinj@chromium.org>
Cr-Commit-Position: refs/heads/master@{#608407}

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