GitLab

Remove remaining global javascript functions from the print preview
native layer and convert to sendWithPromise and web UI events.

BUG=717296
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation

Review-Url: https://codereview.chromium.org/2969383003
Cr-Commit-Position: refs/heads/master@{#485430}

Update from v1.0.15 by running third_party/polymer/v1_0/reproduce.sh.
This includes the fix for a bug in which the slider cannot be LTR on a RTL page.

Bug: 736954
Change-Id: I73f77fb0a053ec7f00b996a125f853848fbc56b6
Reviewed-on: https://chromium-review.googlesource.com/565067Reviewed-by: Demetrios Papadopoulos <dpapad@chromium.org>
Commit-Queue: Takumi Fujimoto <takumif@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485429}

metadata.  We don't *actually* need this information for anything
other than usage tracking, and having these printers actually *work*
is more important that getting good metadata about them.

BUG=

Review-Url: https://codereview.chromium.org/2974103002
Cr-Commit-Position: refs/heads/master@{#485428}

This CL plumbs the signal from the renderers through pipeline, ultiately
arriving at WebMediaPlayerImpl where it will later be used to start/stop
reporting of MediaCapabilities playback stats.

Note: OnVideoNaturalSizeChange is still not obsoleted by
OnVideoConfigChange because it possible to for natural size to change
outside of a config change.

Includes new unit and e2e tests.

Bug: 695264
Change-Id: Ib04e13e2e8ab6b6974f2a9059466d7a87986b4b2
Reviewed-on: https://chromium-review.googlesource.com/541721Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Reviewed-by: Dale Curtis <dalecurtis@chromium.org>
Commit-Queue: Chrome Cunningham <chcunningham@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485427}

https://pdfium.googlesource.com/pdfium.git/+log/1437643bfaca..92e2276a8be4

$ git log 1437643bf..92e2276a8 --date=short --no-merges --format='%ad %ae %s'
2017-07-10 dsinclair Move core/fxge/ge to core/fxge.

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: I2dce82ab97dc5fa07c957aea334da2889c69f005
Reviewed-on: https://chromium-review.googlesource.com/565885
Reviewed-by: <pdfium-deps-roller@chromium.org>
Commit-Queue: <pdfium-deps-roller@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485426}

linker_verbose_tracking.py is a useful script for understanding why
particular symbols and object files get pulled in to Chrome binaries
on Windows. Previously this script did its tracking purely by object
file name, which breaks down for things like mime_util.obj because there
are *four* object files with that name.

This change updates the script so that it tracks the chain of
dependencies using fully-specified object file names - basically
foo.lib(bar.obj) instead of just bar.obj. This avoids the dead-ends and
misleading information that occasionally happened with the previous
version.

In order to make this usable (specifying a fully-qualified object file
name to search for is unwieldy) the search string is now understood to
be any sub-string of the object file name. The set of matches is printed
so that the search can easily be refined. It works much better now.

This was made necessary by the investigation of the linked bug.

R=stanisc@chromium.org
BUG=717103

Change-Id: I25682e6d5b534c69d3743456918c60d42f746e10
Reviewed-on: https://chromium-review.googlesource.com/565221
Commit-Queue: Bruce Dawson <brucedawson@chromium.org>
Reviewed-by: Stanislav Chiknavaryan <stanisc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485425}

benchmark

TBR=ulan@chromium.org

Bug: 728464
Change-Id: I3eee89c2b34da5488da2d967119a232e1d3978bc
Reviewed-on: https://chromium-review.googlesource.com/565034
Commit-Queue: Ned Nguyen <nednguyen@google.com>
Reviewed-by: Ned Nguyen <nednguyen@google.com>
Cr-Commit-Position: refs/heads/master@{#485424}

Bug: 734363
Change-Id: I014249729a4606fdc422cfa92a4deb0f70474ec7
Reviewed-on: https://chromium-review.googlesource.com/565456Reviewed-by: Walter Korman <wkorman@chromium.org>
Commit-Queue: Chris Harrelson <chrishtr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485423}

The Superfish software causes certificate errors on every HTTPS page load
starting in M57, because it uses SHA-1 signatures. We've decided to blacklist
the root to prevent these errors from being bypassable and guide users into
cleaning up their machines. Blacklisting the root will also protect users who
may have uninstalled the software but not the root, or for whom SHA-1 is allowed
by policy.

BUG=734590

Change-Id: I99d38b0d8940d52dfc3355b9ca3aa619ddfec3ee
Reviewed-on: https://chromium-review.googlesource.com/565747
Commit-Queue: Emily Stark <estark@chromium.org>
Reviewed-by: Ryan Sleevi <rsleevi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485422}

Adds a benchmark runner for VR Telemetry tests that installs and configures
the necessary APKs before running the benchmark. VR benchmarks, pages,
actions, etc. will be added in follow-up CLs.

Bug: 738074, 726906
Change-Id: I88feccafbee51e83114ca0182e394d25a7c7f936
Reviewed-on: https://chromium-review.googlesource.com/563761
Commit-Queue: Brian Sheedy <bsheedy@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Ned Nguyen <nednguyen@google.com>
Cr-Commit-Position: refs/heads/master@{#485421}

Bug: none
Change-Id: I663dadcd4d34bcc0964b45dcbcc78621b5b213a2
Reviewed-on: https://chromium-review.googlesource.com/565263Reviewed-by: Stanislav Chiknavaryan <stanisc@chromium.org>
Commit-Queue: Stanislav Chiknavaryan <stanisc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485420}

This change is based on jsbell's crrev.com/2767673002.

When .any.js and .worker.js files are seen during MANIFEST generation
they are mapped to .any.html, .any.worker.html, and .worker.html files
as appropriate which WPTServe will generate on-the-fly. This allows
for easy testing of [Exposed=(Window,Worker)] APIs and tests that are
simply script with no boilerplate HTML. These are now supported in
run-webkit-tests.

When specifying tests to run, the source name should be specified, 
for example:

  $ run-webkit-test external/wpt/storage/interfaces.worker.js

But expectations will use the generated name, e.g.:

  external/wpt/storage/interfaces.worker-expected.txt

And failures will be reported under the generated name:

  external/wpt/storage/interfaces.worker.html

Bug: 653514
Change-Id: I2f531e142c4ca41b1f3223a69a1e6f61343464c2
Reviewed-on: https://chromium-review.googlesource.com/461722Reviewed-by: Quinten Yearsley <qyearsley@chromium.org>
Reviewed-by: Kent Tamura <tkent@chromium.org>
Commit-Queue: Jeff Carpenter <jeffcarp@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485419}

BUG=736375

Change-Id: I109fab5e41a40ba0d6f5f478c31070d7ef4ea9df
Reviewed-on: https://chromium-review.googlesource.com/565196
Commit-Queue: John Abd-El-Malek <jam@chromium.org>
Reviewed-by: Alexei Svitkine <asvitkine@chromium.org>
Reviewed-by: Eric Lawrence <elawrence@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485418}

Change-Id: I6ba620ef9b00af26c628269acec3d9bbdba0a093
Reviewed-on: https://chromium-review.googlesource.com/565447Reviewed-by: Zhongyi Shi <zhongyi@chromium.org>
Commit-Queue: Ryan Hamilton <rch@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485417}

This patch reworks PaintShader to store needed parameters, instead
of constructing an SkShader immediately. This allows the PaintShader
to be introspectible (for things like images), without relying on
SkShader::asAImage().

This patch also removes the sk_shader uses from outside of the flags in
order to restrict access and construction of the SkShader. 

This would also unblock the gif animations on the compositor for the
same reason (ie, it will be able to get a PaintImage directly from
PaintShader).

R=enne@chromium.org, chrishtr@chromium.org, khushalsagar@chromium.org
Bug:728359

Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel
Change-Id: I480195299205e8a7c01298095d5662b63980f80b
Reviewed-on: https://chromium-review.googlesource.com/544119
Commit-Queue: Vladimir Levin <vmpstr@chromium.org>
Reviewed-by: Chris Harrelson <chrishtr@chromium.org>
Reviewed-by: Philip Rogers <pdr@chromium.org>
Reviewed-by: enne <enne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485416}

https://chromium.googlesource.com/webm/libvpx.git/+log/ec4afbf74a4b..4e16f7070354

$ git log ec4afbf74..4e16f7070 --date=short --no-merges --format='%ad %ae %s'
2017-07-06 johannkoenig sad neon: avg for 64x[32,64]
2017-07-06 johannkoenig sad neon: macroize 64xN definitions
2017-07-06 johannkoenig sad neon: avg for 32x[16,32,64]
2017-07-06 johannkoenig sad neon: macroize 32xN definitions
2017-07-06 johannkoenig sad neon: avg for 16x[8,16,32]
2017-07-06 johannkoenig sad neon: macroize 16xN definitions
2017-06-30 jzern cosmetics,vp9/: normalize inv/fwd_txfm naming
2017-07-06 jzern vp8cx,cosmetics: correct VP9_SET_TILE_COLUMNS docs
2017-07-06 marpan vp9: Nonrd mode: use content_state_sb for high motion.
2017-07-06 jzern vp8cx,cosmetics: correct VP9_SET_FRAME_PARALLEL_DECODING docs
2017-07-06 johannkoenig sad neon: macroize 8xN definitions
2017-06-28 johannkoenig sad neon: avg for 8x[4,8,16]
2017-06-28 johannkoenig sad neon: avg for 4x4 and 4x8
2017-06-29 johannkoenig fdct neon: 32x32_rd
2017-06-29 jzern vp9: remove FrameWorkerData & vp9_dthread.h
2017-06-27 jzern vp9: remove (un)lock_buffer_pool
2017-07-01 jzern dct_partial_test: cover vpx_fdct8x8_1_msa in hbd
2017-07-05 johannkoenig test/buffer.h: move range checking to compiler
2017-05-19 paulwilkins Further refactoring of mod error calculation.
2017-07-04 paulwilkins Fix incorrect index test in GF group rate assignment.
(...)

Created with:
  roll-dep src/third_party/libvpx/source/libvpx
R=johannkoenig@google.com

Bug: 
Change-Id: I7f8db8c21c295b12f31ffcdafdc028b6f84bff53
Reviewed-on: https://chromium-review.googlesource.com/565749Reviewed-by: Johann Koenig <johannkoenig@google.com>
Commit-Queue: Marco Paniconi <marpan@google.com>
Cr-Commit-Position: refs/heads/master@{#485415}

Bug: 731182
Change-Id: Iebe8ada3bfd78cad3127e351b05703da258de6be
Reviewed-on: https://chromium-review.googlesource.com/565103Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Commit-Queue: Quinten Yearsley <qyearsley@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485414}

Bug: 740321
TEST: covered by tests and the issue in crbug.com/740321 can be solved.
Change-Id: I9ff64cde700bc280efda6f27fdf8dc6acac4faa7
Reviewed-on: https://chromium-review.googlesource.com/564317Reviewed-by: Sadrul Chowdhury <sadrul@chromium.org>
Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Commit-Queue: Qiang(Joe) Xu <warx@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485413}

Make secure proxy check URL as a data reduction proxy param instead of
a config value. This further cuts down on the functionality provided
by data_reduction_proxy_config_values class.

Also, remove unused flags for carrier testing, and for setting warmup url.

BUG=597768

Review-Url: https://codereview.chromium.org/2967993002
Cr-Commit-Position: refs/heads/master@{#485412}

Bug: 669240
Change-Id: I34b33ec646ba7ab6c57af052bfe78380b15dcc48
Reviewed-on: https://chromium-review.googlesource.com/565443Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Commit-Queue: Erik Chen <erikchen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485411}

The current implementation of the password detail view in iOS settings tries to
display the password value, which federated credentials have none. Instead,
they have a web origin identifying the federated identity provider associated
with the stored credential. This origin is currently not displayed.

Therefore this CL changes the password detail view for federated credentials by
replacing the password section with a federation section. The federation origin
is very likely to be just a short hostname which fits on one line so there is
no copy button for it as in the case of the other meta data.

Desktop settings already do something similar: they replace the password field
with a "with <federation origin>" string.

Screenshot at https://crbug.com/740384#c2.

Bug: 740384
Change-Id: Ibf4ff13a864fab450b3558246d8b26e04182b804
Reviewed-on: https://chromium-review.googlesource.com/563623
Commit-Queue: Vaclav Brozek <vabr@chromium.org>
Reviewed-by: Louis Romero <lpromero@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485410}

The ChildProcessLauncherTest.testPendingSpawnQueue test accesses a
service without waiting for it to be bound.
In some cases it seemed it would be accessed before it was bound, the
IBinder interface was not set and we would get a NPE calling
crashServiceForTesting on it.

Bug: 740644
Change-Id: If099fde3042cc0307366384ef8adf0af003ce1cf
Reviewed-on: https://chromium-review.googlesource.com/565009Reviewed-by: Bo Liu <boliu@chromium.org>
Commit-Queue: Jay Civelli <jcivelli@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485409}

TBR=pfeldman@chromium.org

Bug: chromium:739965
Change-Id: Id0a4e0b9e336c78107c0fee82ec764d842c1f2f8
Reviewed-on: https://chromium-review.googlesource.com/565195Reviewed-by: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
Commit-Queue: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485408}

Rename RoundedInnerRectClipper::layout_object_ to display_item_.

TBR=pdr@chromium.org

Change-Id: I43353f7e2ecafdbfc4f3f1e19f88705b90273ed5
Reviewed-on: https://chromium-review.googlesource.com/565758Reviewed-by: Emil A Eklund <eae@chromium.org>
Commit-Queue: Emil A Eklund <eae@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485407}

See https://skia-review.googlesource.com/c/21739/

NOTRY=True

Bug: 
Change-Id: I070f26e88d0ad3b4925c082b84ef1f9a148212cf
Reviewed-on: https://chromium-review.googlesource.com/565767Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Mike Reed <reed@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485406}

Since support for the CDM_9 interface is behind a flag, provide the
flag when testing.

BUG=740265
TEST=ExternalClearKey browser_tests pass

Change-Id: I9d4975430909d6887942cbb14803b845488566a1
Reviewed-on: https://chromium-review.googlesource.com/564182
Commit-Queue: John Rummell <jrummell@chromium.org>
Reviewed-by: Xiaohan Wang <xhwang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485405}

This is passing after:
https://chromium.googlesource.com/chromium/src.git/+/602f4cdf9e0944a68fe91d12ead5b2ece186b8e3

Bug: 723788
Change-Id: I1a322e8bd4641c33566794e287ae28d2c96a9f71
Reviewed-on: https://chromium-review.googlesource.com/565525
Commit-Queue: Philip Rogers <pdr@chromium.org>
Commit-Queue: Chris Harrelson <chrishtr@chromium.org>
Reviewed-by: Chris Harrelson <chrishtr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485404}

Create the download service instance to build the correct dependency
tree for keyed services.


Bug: 
Change-Id: Ia29bf896acca7c387698cd9b35269e3c6caf2591
Reviewed-on: https://chromium-review.googlesource.com/544760Reviewed-by: Elliot Glaysher <erg@chromium.org>
Reviewed-by: David Trainor <dtrainor@chromium.org>
Commit-Queue: Xing Liu <xingliu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485403}

- Tightening access to ServerConnectionManager members
- Removing redindant functions in url_translator
- raw pointer => unique_ptr in commit.h
- Iterators => range-based loop in ProcessDownloadedUpdates

BUG=
R=pnoland@chromium.org

Change-Id: I11775719ee08d901bc2568e8298af396f417b751
Reviewed-on: https://chromium-review.googlesource.com/565650Reviewed-by: Patrick Noland <pnoland@chromium.org>
Commit-Queue: Pavel Yatsuk <pavely@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485402}

We only have one release bot for network service so far, so turn on dchecks there to get coverage. This avoids the optional trybot failing while the FYI bot is passing.

BUG=713857

Change-Id: I9fffe65c8cca6fb05994e9a88a42bd497f879ee1
Reviewed-on: https://chromium-review.googlesource.com/565188Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Commit-Queue: John Abd-El-Malek <jam@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485401}

The mash_service is not available/used when running chrome --mus
The mus_browser_tests were still trying to launch the service, leading to spammy
logs of the failure to launch the service.

This updates MojoTestState to only launch the service in --run-in-mash mode.

TBR=sky@chromium.org
TEST=mash_browser_tests, mus_browser_tests

Bug: 740655
Change-Id: I1f7618f5db5106b6f92e34647b6b79f5395dc857
Reviewed-on: https://chromium-review.googlesource.com/565171Reviewed-by: Jonathan Ross <jonross@chromium.org>
Commit-Queue: Jonathan Ross <jonross@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485400}

TBR=charliea@chromium.org

Bug: 713222
Change-Id: I284c50323936661406074429869fdb990dae99d0
Reviewed-on: https://chromium-review.googlesource.com/562319Reviewed-by: rnephew <rnephew@chromium.org>
Commit-Queue: rnephew <rnephew@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485399}

Test video:
https://drive.google.com/file/d/0B4yF5XJG4VQAMGF1enZReC1VSzA/view?usp=sharing

Bug: 707346
Change-Id: I2b503ab789e736e9f6da5646be9e339a9ccb8c61
Reviewed-on: https://chromium-review.googlesource.com/565030Reviewed-by: Mathieu Perreault <mathp@chromium.org>
Commit-Queue: Ganggui Tang <gogerald@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485398}

This CL:

1. Moves ResourceSettings to components/viz/common/resources.
2. Moves BufferToTextureTargetMap to components/viz/common/resources.

The rest of the changes are mechanical updates to includes, namespaces, and
deps.

TBR=sadrul@chromium.org

Bug: 722935
Change-Id: I323c3e2a75b7a7048aa6a5a8c091ac51e359ef2d
Reviewed-on: https://chromium-review.googlesource.com/565638Reviewed-by: Sadrul Chowdhury <sadrul@chromium.org>
Reviewed-by: Antoine Labour <piman@chromium.org>
Commit-Queue: Fady Samuel <fsamuel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485397}

The context menu only appears when there is no text selected
and is used by the user to force autofill

- when the autofill service could not detect how to autofill a form,
- when an app disabled autofill.
- when user wrongly select the autofill suggestion at first time.

BUG=739980

Change-Id: Ie50cac5d79b00e585e567a89b758149b07af3295
Reviewed-on: https://chromium-review.googlesource.com/562512
Commit-Queue: Tao Bai <michaelbai@chromium.org>
Reviewed-by: Roger McFarlane <rogerm@chromium.org>
Reviewed-by: Selim Gurun <sgurun@chromium.org>
Reviewed-by: Bo Liu <boliu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485396}

An upcoming version of clang removes the ability to suppress
availability warnings by redeclaring functions. The new way
to suppress warnings is to either annotate the caller with an
availability attribute or enclose the function reference in an "if
(@available)" block.

This patch changes service_process_util_mac.mm to use the
SDK's definition of the getRelationship function instead of a
redeclaration and protect the call with an @available check instead
of respondsToSelector.

Bug: 735328
Change-Id: I2097b2343f63b74cbc198e7cf7bcaabea2e45735
Reviewed-on: https://chromium-review.googlesource.com/564308Reviewed-by: Nico Weber <thakis@chromium.org>
Commit-Queue: Peter Collingbourne <pcc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485395}

BUG=519587

Change-Id: Ia6d7f199e8d09c20ae4a54e7b9c0055a1a9d0982
Reviewed-on: https://chromium-review.googlesource.com/552962Reviewed-by: Dongseong Hwang <dongseong.hwang@intel.com>
Reviewed-by: Daniel Nicoara <dnicoara@chromium.org>
Reviewed-by: Robert Kroeger <rjkroege@chromium.org>
Commit-Queue: Dongseong Hwang <dongseong.hwang@intel.com>
Cr-Commit-Position: refs/heads/master@{#485394}

The current mechanism for inline autocomplete is based on selection
highlight, and it does not work with OEM keyboards, nor does it work with
major third-party keyboards because text composition gets broken when
selection changes and on Android, keyboard apps tend to use text
composition heavily.

This CL introduces a new mechanism to present inline autocomplete
on Android using SpannableString, allowing us to show inline
autocomplete even when text composition is used.

The biggest hurdle with this approach is deletion behavior, and because
of this we apply it only to English, European texts, and URLs for now.

The new mechanism is currently implemented behind a flag, and robolectric
tests and instrumentation tests have been parameterized to be run with
and without the flag. In doing so, some test cases have been fixed or
adapted.

Design doc:
https://docs.google.com/document/d/1PQQbCrC_Z9FnB7RUJh6_nkhkWgE87JzgT1oWxYpSDxs/edit

BUG=539536

Change-Id: I55c1e2791fe2cdbe645ab4eeb7b0b248e7709343
Reviewed-on: https://chromium-review.googlesource.com/543307
Commit-Queue: Changwan Ryu <changwan@chromium.org>
Reviewed-by: Ted Choc <tedchoc@chromium.org>
Reviewed-by: Alexandre Elias <aelias@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485393}

Had to refactor browser states to be global instances and force off the record
browser state to use an in-memory store instead of a json file persisted on disk.

BUG=739987

Review-Url: https://codereview.chromium.org/2965303002
Cr-Commit-Position: refs/heads/master@{#485392}

Due to loadTimeData inconsistencies between refreshes, it's possible for
"chromeCleanupEnabled" to become true while no ChromeCleanupHandler is
present. 
To avoid showing a blank card or crashing in debug mode for edge cases,
always install the handler.

Also added some documentation to load_time_data.js to hopefully help
other developers avoid this issue.

Bug: 690020
Change-Id: Ifa8e0c0e78c2d6202e11fd378c74781b24401918
Reviewed-on: https://chromium-review.googlesource.com/565327Reviewed-by: Tommy Li <tommycli@chromium.org>
Reviewed-by: Michael Giuffrida <michaelpg@chromium.org>
Commit-Queue: proberge <proberge@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485391}