GitLab

Bug: 766904
Change-Id: I06be2da65f7072e782cd1ba30824f6a9497572eb
Reviewed-on: https://chromium-review.googlesource.com/678258Reviewed-by: Yury Khmel <khmel@chromium.org>
Commit-Queue: min c <minch@chromium.org>
Cr-Commit-Position: refs/heads/master@{#504421}

https://pdfium.googlesource.com/pdfium.git/+log/a7caeb529121..15dffdf6bd8d

$ git log a7caeb529..15dffdf6b --date=short --no-merges --format='%ad %ae %s'
2017-09-26 dsinclair Remove fx_text_int.h
2017-09-26 dsinclair Remove font default params

Created with:
  roll-dep src/third_party/pdfium


Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, see:
http://www.chromium.org/developers/tree-sheriffs/sheriff-details-chromium#TOC-Failures-due-to-DEPS-rolls


TBR=dsinclair@chromium.org

Change-Id: I8b2ec63ed7274f6f03235ab6abcb46360afff32a
Reviewed-on: https://chromium-review.googlesource.com/684957
Reviewed-by: <pdfium-deps-roller@chromium.org>
Commit-Queue: <pdfium-deps-roller@chromium.org>
Cr-Commit-Position: refs/heads/master@{#504420}

This should prevent metalayer triggering when a user is
writing/sketching while accidentally holding down the stylus button.

Bug: 767440
Test: ash_unittests --gtest_filter=PaletteTrayTest*
Change-Id: I98a1dc4be2bb888c6cc06e3e93a60b73b56c6a8d
Reviewed-on: https://chromium-review.googlesource.com/683254
Commit-Queue: Vladislav Kaznacheev <kaznacheev@chromium.org>
Reviewed-by: James Cook <jamescook@chromium.org>
Reviewed-by: Jacob Dufault <jdufault@chromium.org>
Cr-Commit-Position: refs/heads/master@{#504419}

the bottom left of and non-overlapping with a hovered UIElement.

In Chrome UI Devtools, users enter the inspection mode and pin an
element by left-clicking on a window/widget or view on the Chrome UI.
When user moves the cursor outside of the current UIElement, if the
pinned UIElement is at the bottom left of and doesn't overlap with the
hovered UIElement rectangle, the layout will display horizontal and
vertical distances between the pinned UIElement and the UIElement under
cursor as shown in picture below. This case refers to
R1_BOTTOM_FULL_LEFT_R2.

Bug: 750096
Change-Id: Ibdfed83e240f85e5557bb32c52b5f7168f493205
Reviewed-on: https://chromium-review.googlesource.com/591770Reviewed-by: Sadrul Chowdhury <sadrul@chromium.org>
Commit-Queue: Thanh Pham <thanhph@chromium.org>
Cr-Commit-Position: refs/heads/master@{#504418}

https://skia.googlesource.com/skia.git/+log/f6f7cf60985d..90f28ec3da53

$ git log f6f7cf609..90f28ec3d --date=short --no-merges --format='%ad %ae %s'
2017-09-25 egdaniel Add some asserts and explict setting of fIsMipMapped
2017-09-25 benjaminwagner Specify more specific CPU dimensions.
2017-09-26 reed Revert "Revert "migrate to sk_sp for SkFontMgr API""

Created with:
  roll-dep src/third_party/skia


Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, see:
http://www.chromium.org/developers/tree-sheriffs/sheriff-details-chromium#TOC-Failures-due-to-DEPS-rolls


CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel;master.tryserver.chromium.android:android_optional_gpu_tests_rel
TBR=jvanverth@chromium.org

Change-Id: I6b3cb56ecbfa52b476a14ee5e4d42c556c8e0d0a
Reviewed-on: https://chromium-review.googlesource.com/684955Reviewed-by: Skia Deps Roller <skia-deps-roller@chromium.org>
Commit-Queue: Skia Deps Roller <skia-deps-roller@chromium.org>
Cr-Commit-Position: refs/heads/master@{#504417}

This broke in 223326c1.

Bug: 763398, 768630
Change-Id: Ie5e7eb7a7d3ea01a30b8a262db22931c2ed7d4d9
Reviewed-on: https://chromium-review.googlesource.com/684616Reviewed-by: Matt Menke <mmenke@chromium.org>
Commit-Queue: Mark Mentovai <mark@chromium.org>
Cr-Commit-Position: refs/heads/master@{#504416}

Bug: None
Change-Id: I2c9ec29d8559ad1afb61fddafbf27af320b4f8e5
Reviewed-on: https://chromium-review.googlesource.com/683003Reviewed-by: Marijn Kruisselbrink <mek@chromium.org>
Reviewed-by: Ken Buchanan <kenrb@chromium.org>
Commit-Queue: Chris Mumford <cmumford@chromium.org>
Cr-Commit-Position: refs/heads/master@{#504415}

In chromium-review.googlesource.com/670519 SkImage objects without color space
info are tagged as sRGB by drawin the image onto a sRGB canvas. This is not
needed anymore as makeColorSpace() assumes the no-color-space images as sRGB.

Bug: 754713, 740197, 767275
Change-Id: Ic6a9461919bf49d3bf316d93ca6a5e10bc6f3d7c
Reviewed-on: https://chromium-review.googlesource.com/672023Reviewed-by: Justin Novosad <junov@chromium.org>
Commit-Queue: Mohammad Reza Zakerinasab <zakerinasab@chromium.org>
Cr-Commit-Position: refs/heads/master@{#504414}

Plumbs the oilpan hooks to the out-of-process memory allocation log.

Change two loops in ChromeContentRendererClient to use C++11.

Bug: 763173
Change-Id: I7fc2b27fcc84c6f1298130096e584936042b9763
Reviewed-on: https://chromium-review.googlesource.com/671418Reviewed-by: John Abd-El-Malek <jam@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Commit-Queue: Brett Wilson <brettw@chromium.org>
Cr-Commit-Position: refs/heads/master@{#504413}

This is in preparation of completely removing paper-toolbar from
third_party/polymer.

Bug: None
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: Idf8a0733f751f1e3cd2269682ed9bbf5856cc149
Reviewed-on: https://chromium-review.googlesource.com/683297Reviewed-by: Naoki Fukino <fukino@chromium.org>
Commit-Queue: Demetrios Papadopoulos <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#504412}

Bug: 767589
Change-Id: If3127d75eb4b7645979e478c0e5ce82916a27feb
Reviewed-on: https://chromium-review.googlesource.com/677958
Commit-Queue: Michael Thiessen <mthiesse@chromium.org>
Reviewed-by: Bo <boliu@chromium.org>
Reviewed-by: Brandon Jones <bajones@chromium.org>
Cr-Commit-Position: refs/heads/master@{#504411}

Before this change setting

use_system_freetype = true
use_system_harfbuzz = false

will cause Chromium to crash due to the built-in HarfBuzz pulling in the
small bootstrap FreeType. This small bootstrap FreeType will then be used
for calls it exports, but other calls would go to the system FreeType,
creating a very confused state. This change causes the built-in HarfBuzz
to build against the system FreeType instead of the bootstrap FreeType
when use_system_freetype is true.

BUG=http://lists.gnu.org/archive/html/freetype-devel/2017-09/msg00125.html

Change-Id: Iba11baf834df43b290b7b81fcdff36c502d0ee76
Reviewed-on: https://chromium-review.googlesource.com/684975Reviewed-by: Dominik Röttsches <drott@chromium.org>
Commit-Queue: Ben Wagner <bungeman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#504410}

ReleaseCallbacks aren't part of CompositorFrames, they are for resource
management in-process, so move them to resources/.

CopyOutputRequests can be in a CompositorFrame atm, but also go to
frame sinks in other ways too, so move them up a level to frame_sinks,
along with the CopyOutputResults which are not part of a
CompositorFrame at all.

TBR=jam
NOTRY=true

Bug: 722935
Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel
Change-Id: Iab8d8268b13d8eb81568dbf4a0222135c4a12d57
Reviewed-on: https://chromium-review.googlesource.com/682760
Commit-Queue: danakj <danakj@chromium.org>
Reviewed-by: David Reveman <reveman@chromium.org>
Reviewed-by: danakj <danakj@chromium.org>
Reviewed-by: enne <enne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#504409}

The script stopped working with more recent versions of Fuchsia.
packages/gn/gen.py now expects full path for --modules argument. Updated
the script to pass full path for packages/gn/sdk.

Change-Id: I32c511cae73075a7b37c26035e8bea764605a332
Reviewed-on: https://chromium-review.googlesource.com/683342Reviewed-by: Scott Graham <scottmg@chromium.org>
Commit-Queue: Sergey Ulanov <sergeyu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#504408}

Preview: https://photos.app.goo.gl/2NJzRQ31Js9ltKeC3
Bug: 762932
Change-Id: I47d47928cf4f1708bfc1ea96689e81362e166ca8
Reviewed-on: https://chromium-review.googlesource.com/664578Reviewed-by: Bernhard Bauer <bauerb@chromium.org>
Reviewed-by: Jan Krcal <jkrcal@chromium.org>
Commit-Queue: Nicolas Dossou-Gbété <dgn@chromium.org>
Cr-Commit-Position: refs/heads/master@{#504407}

Before this patch, calling PaymentRequest.show() would bring the
background window to the foreground, which allows a page to open a
pop-under.

This patch adds a check for the browser window being active (in
foreground) in PaymentRequest.show(). If the window is not active (in
background), then PaymentRequest.show() promise is rejected with
"AbortError: User cancelled request." No UI is shown in that case.

After this patch, calling PaymentRequest.show() does not bring the
background window to the foreground, thus preventing opening a pop-under.

Bug: 768230
Change-Id: I2b90f9086ceca5ed7b7bdf8045e44d7e99d566d0
Reviewed-on: https://chromium-review.googlesource.com/681843Reviewed-by: anthonyvd <anthonyvd@chromium.org>
Commit-Queue: Rouslan Solomakhin <rouslan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#504406}

http/tests/devtools/service-workers/service-workers-navigation-preload.html was failing and now it's crashing.

TBR=yzshen@chromium.org
NOTRY=true

Change-Id: I46478782f0be345957d06f89d19365876fae9fbb
Reviewed-on: https://chromium-review.googlesource.com/685294Reviewed-by: John Abd-El-Malek <jam@chromium.org>
Commit-Queue: John Abd-El-Malek <jam@chromium.org>
Cr-Commit-Position: refs/heads/master@{#504405}

- This reverts commit 2f873e14,
  "cros:Enable PlaystoreSearch and AnswerCards by Default on Eve Only".
- Full-screen is already ON, blur is ON on selected devices.
  Enabling for Answer Cards and Play Store app searching.

This will be landed when prod server is 100%.

Bug: 766784
Change-Id: Ie4c685a82c6e6f2e89ec082480f33e4ecc57039f
Reviewed-on: https://chromium-review.googlesource.com/678735Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Reviewed-by: Vadim Tryshev <vadimt@chromium.org>
Commit-Queue: Jiaquan He <hejq@google.com>
Cr-Commit-Position: refs/heads/master@{#504404}

//ios/web_view would like to be able to sign in to chrome to sync data
like autofill and passwords. This change sets up some initial services
that are needed to implement //components/signin.

Change-Id: I91229229767447f0c33f25f217d6b8c426cc5437
Bug: 753659
Reviewed-on: https://chromium-review.googlesource.com/606811
Commit-Queue: John Wu <jzw@chromium.org>
Reviewed-by: Bernhard Bauer <bauerb@chromium.org>
Reviewed-by: Mihai Sardarescu <msarda@chromium.org>
Reviewed-by: Eugene But <eugenebut@chromium.org>
Reviewed-by: Hiroshi Ichikawa <ichikawa@chromium.org>
Cr-Commit-Position: refs/heads/master@{#504403}

The issue is that call to AndroidSyncSettings.ctor in setUp() posts asynchronous
task that can take a while to complete and run well into actual test causing
unexpected calls to getIsSyncable.

The change adds a callback to AndroidSyncSettings.overrideForTests that allows
test to block waiting for the flow to complete before proceeding with the test.

BUG=737862
R=bsazonov@chromium.org

Change-Id: Id33137d791954a3558fbe8dd76c33719c4fcf428
Reviewed-on: https://chromium-review.googlesource.com/679462Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
Reviewed-by: Boris Sazonov <bsazonov@chromium.org>
Commit-Queue: Pavel Yatsuk <pavely@chromium.org>
Cr-Commit-Position: refs/heads/master@{#504402}

This version:
 - Fixes getaddrinfo().
 - Adds media_client library.

TBR=yzshen@chromium.org
NOTRY=true

Bug: 707030, 737802, 731302
Change-Id: I271d9681194d81d2979635784b3f0ca2c0a946d0
Reviewed-on: https://chromium-review.googlesource.com/683311
Commit-Queue: Sergey Ulanov <sergeyu@chromium.org>
Reviewed-by: Scott Graham <scottmg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#504401}

Bug: 760618
Change-Id: I9670fc2f4ab36e080d67ed41d8503d5ca2a17b73
Reviewed-on: https://chromium-review.googlesource.com/684734Reviewed-by: Bernhard Bauer <bauerb@chromium.org>
Commit-Queue: Michael van Ouwerkerk <mvanouwerkerk@chromium.org>
Cr-Commit-Position: refs/heads/master@{#504400}

This is a reland of bbd7b898
Original change's description:
> Add browser_tests for WebAssembly out-of-bounds behavior
> 
> Trap-based bounds checking requires interaction with the crash reporter
> to catch out of bounds accesses. These browser tests make sure this
> behavior is working in the context of a full Chrome browser.
> 
> Bug: chromium:722585
> Change-Id: I1993540f85f5d3500681cd3fbd7a9af817fe4ce8
> Reviewed-on: https://chromium-review.googlesource.com/648363
> Commit-Queue: Eric Holk <eholk@chromium.org>
> Reviewed-by: Scott Violet <sky@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#503907}

Bug: chromium:722585
Change-Id: Ic76c769af88134be215127c190706f8ae4fb6ed1
Reviewed-on: https://chromium-review.googlesource.com/682114Reviewed-by: Jochen Eisinger <jochen@chromium.org>
Commit-Queue: Eric Holk <eholk@chromium.org>
Cr-Commit-Position: refs/heads/master@{#504399}

https://boringssl.googlesource.com/boringssl/+log/c03c2181901fe44e0eec700aaf645769ea2d240a..42e93b6cf5e0a5c958b6b59cf4842b3dc275561a

BUG=none

Change-Id: I343451f157a2172227b3223919690d8ae7269c77
Reviewed-on: https://chromium-review.googlesource.com/682835Reviewed-by: David Benjamin <davidben@chromium.org>
Commit-Queue: Steven Valdez <svaldez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#504398}

Most of the lines of change in this patch are just from splitting 
the declaration and definition for ConstrainedWebDialogDelegateViewViews.
This entire file is a painful morass of similarly named classes that are
all defined inline.

Bug: 766774
Change-Id: I4ebfece91d9398571232cf350a2dd27f117d88f4
Reviewed-on: https://chromium-review.googlesource.com/674179Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Evan Stade <estade@chromium.org>
Cr-Commit-Position: refs/heads/master@{#504397}

In 328d3bee InitWithOptions was modified to no longer require
a SharedReadCache parameter. A few leftover forward declarations
of leveldb_env::SharedReadCache were not removed.

TBR=johnme@chromium.org,qinmin@chromium.org,nyquist@chromium.org,jkrcal@chromium.org

TBRing reviewers:
johnme@chromium.org: chrome/browser/budget_service/budget_database.cc
qinmin@chromium.org: components/download/internal/download_store.cc
nyquist@chromium.org: components/leveldb_proto/proto_database_impl_unittest.cc
jkrcal@chromium.org: components/ntp_snippets/remote/remote_suggestions_database.cc

Bug: 762587
Change-Id: Ib0b515b0d6bf7b11bbee05fcabc60c59d0981d1a
Reviewed-on: https://chromium-review.googlesource.com/683002Reviewed-by: Chris Mumford <cmumford@chromium.org>
Commit-Queue: Chris Mumford <cmumford@chromium.org>
Cr-Commit-Position: refs/heads/master@{#504396}

Bug: 763380
Change-Id: Ic039c88bb2faf28dc43244a01ade177712a0b55d
Reviewed-on: https://chromium-review.googlesource.com/684875Reviewed-by: Xi Han <hanxi@chromium.org>
Commit-Queue: Ran Ji <ranj@chromium.org>
Cr-Commit-Position: refs/heads/master@{#504395}

This target really needs to get into the CQ party.

BUG=
R=bshe

Change-Id: Ie276f66f7db7f09b019226c90a2ea0570c558a37
Reviewed-on: https://chromium-review.googlesource.com/684694Reviewed-by: Biao She <bshe@chromium.org>
Commit-Queue: Christopher Grant <cjgrant@chromium.org>
Cr-Commit-Position: refs/heads/master@{#504394}

Bug: 728776
Change-Id: Id135e60fb228a664fe456d74ce1b60752d6eb7dc
Reviewed-on: https://chromium-review.googlesource.com/682015Reviewed-by: David Roger <droger@chromium.org>
Reviewed-by: Robert Sesek <rsesek@chromium.org>
Commit-Queue: Eugene But <eugenebut@chromium.org>
Cr-Commit-Position: refs/heads/master@{#504393}

Title for Recent Tabs' sections should be title cased.

Bug: 426576
Change-Id: I6aadca930ad8925e11cb221d508c926c2e2c83a7
Reviewed-on: https://chromium-review.googlesource.com/684841Reviewed-by: Jean-François Geyelin <jif@chromium.org>
Commit-Queue: Gauthier Ambard <gambard@chromium.org>
Cr-Commit-Position: refs/heads/master@{#504392}

- Make AuthSyncObserver observe SigninErrorController in addition
  to sync service so that auth errors caused by other services
  are caught as well.
- Fix an edge case that OAuth2LoginManager marks valid oauth2
  token when it thinks /MergeSession succeeds regardless of
  whether there is any auth error;

Bug: 760610
Test: OAuth2Test.SetInvalidTokenStatus

Change-Id: Idbaee9f7faa1aa2aff939a1540bfcfdd9f49c96c
Reviewed-on: https://chromium-review.googlesource.com/658378
Commit-Queue: Xiyuan Xia <xiyuan@chromium.org>
Reviewed-by: Achuith Bhandarkar <achuith@chromium.org>
Cr-Commit-Position: refs/heads/master@{#504391}

The title of the site settings / content settings section depends on the
value of switches::kEnableSiteSettings, so the option in Clear Browsing
Data should use the same logic to decide which title to show.

Bug: 725401
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: I0cdd9642759f9cc321ec9a591445a4c17606c2ef
Reviewed-on: https://chromium-review.googlesource.com/681215
Commit-Queue: Christian Dullweber <dullweber@chromium.org>
Reviewed-by: Dave Schuyler <dschuyler@chromium.org>
Cr-Commit-Position: refs/heads/master@{#504390}

It's commonly assumed that GUIDs generated by base::GenerateGUID are
unguessable and will not collide, and this is in practice true since
it's backed by base::RandBytes.

The header for base::RandBytes did not guarantee being secure, but the
implementations were all required to be cryptographically strong random
number generators since crypto::RandBytes and base::UnguessableToken
already both depend on base::RandBytes (see https://crbug.com/140076).

This patch:

- Marks base::GenerateGUID as secure in the code comments.

- Migrates base::GenerateGUID from base::RandUint64 which is not
  guaranteed to be secure to base::RandBytes which is - see above.
  (It's not possible to migrate to crypto::RandBytes since that would
  introduce a circular dependency between base and crypto - see
  UnguessableToken::Create for a similar case).

- Marks base::RandBytes as secure random in its header, but clarifying
  that code outside base/ that depends on it being secure should
  continue to use the crypto/ wrapper.

- Cleans up some duplicated code in the implementations of
  base/rand_util_*.cc

Bug: none
Change-Id: I282bbd7d1883ba120c01280b941b9d7ecbef404c
Reviewed-on: https://chromium-review.googlesource.com/678731Reviewed-by: Mark Mentovai <mark@chromium.org>
Commit-Queue: John Mellor <johnme@chromium.org>
Cr-Commit-Position: refs/heads/master@{#504389}

Change-Id: Id3e0139beeca89444f4100de67c21da579c49047
Reviewed-on: https://chromium-review.googlesource.com/684739Reviewed-by: Mohsen Izadi <mohsen@chromium.org>
Commit-Queue: Daniel Bratell <bratell@opera.com>
Cr-Commit-Position: refs/heads/master@{#504388}

After crrev.com/c/678719, the debug log isn't populated anymore (and
even before that, the logged events weren't particularly meaningful
anymore).

Bug: 627747
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: Iff770ddb5f7867ae36b3e8cacbac480707654aeb
Reviewed-on: https://chromium-review.googlesource.com/678721Reviewed-by: Bernhard Bauer <bauerb@chromium.org>
Commit-Queue: Marc Treib <treib@chromium.org>
Cr-Commit-Position: refs/heads/master@{#504387}

Bug: 759904
Change-Id: I1a66f126cc2c47b76e1fdb2acbf9eeec61d96ea9
Reviewed-on: https://chromium-review.googlesource.com/677985
Commit-Queue: Moe Ahmadi <mahmadi@chromium.org>
Reviewed-by: edchin <edchin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#504386}

THis benchmark doesn't use our supported harnesses

Bug: 717539
Change-Id: Id90301a5d8632d81edab30d815fb15479b7d2fe2
Reviewed-on: https://chromium-review.googlesource.com/684416Reviewed-by: Ned Nguyen <nednguyen@google.com>
Reviewed-by: Annie Sullivan <sullivan@chromium.org>
Commit-Queue: Ned Nguyen <nednguyen@google.com>
Cr-Commit-Position: refs/heads/master@{#504385}

This patch turns on crash reporting in headless mode by default. This
helps us diagnose headless-only crashes. Crash reporting can be disabled
with the --disable-crash-reporter command line flag.

Note that this only affects Headless Shell and --headless; C++ embedders
of headless are not affected.

BUG=691507

Change-Id: I5f100908a9fdaf6ddeac0c3bd13d07ba50e89402
Reviewed-on: https://chromium-review.googlesource.com/684020
Commit-Queue: Sami Kyöstilä <skyostil@chromium.org>
Reviewed-by: Eric Seckler <eseckler@chromium.org>
Cr-Commit-Position: refs/heads/master@{#504384}

Bug: 55776
Change-Id: I4eb37792a2c6ec4e04ab0f43b3eddd75ca31c98c
Reviewed-on: https://chromium-review.googlesource.com/675707Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Henrique Nakashima <hnakashima@chromium.org>
Cr-Commit-Position: refs/heads/master@{#504383}

With this CL, a number of conditions that were glommed together and
checked with one EXPECT_TRUE are not separated to make test failures
easier to understand.

Bug: None
Change-Id: I849bb26befc52b89a61422a4ff63059c376cd60d
Reviewed-on: https://chromium-review.googlesource.com/684538Reviewed-by: Christopher Grant <cjgrant@chromium.org>
Commit-Queue: Ian Vollick <vollick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#504382}