GitLab

We currently have one `console.log` in bluetooth-helpers.js.  This isn't
strictly needed and it's also disallowed by the presubmit check for
wpt/.

This change also rejects unexpected messages from iframes in
getHealthThermometerDeviceWithServicesDiscovered.

BUG=509038

Change-Id: I06dceb20ada4b0123ed7a4af3e25641fc019a338
Reviewed-on: https://chromium-review.googlesource.com/691414Reviewed-by: Vincent Scheib <scheib@chromium.org>
Commit-Queue: Conley Owens <cco3@chromium.org>
Cr-Commit-Position: refs/heads/master@{#505827}

This issue was uncovered by a libFuzzer test, apparently the video
config read from the input stream might be invalid.

Bug: 763023
Change-Id: I83b181ad2ce0a9f0e1cbae27497252b339381f51
Reviewed-on: https://chromium-review.googlesource.com/695386Reviewed-by: Matthew Wolenetz <wolenetz@chromium.org>
Commit-Queue: Sergey Volk <servolk@chromium.org>
Cr-Commit-Position: refs/heads/master@{#505826}

Adds the ability for devtools to know where a file was saved on disk
when a save dialog was saved. This will allow us to serve files from
disk for interception.

R=pfeldman,dgozman
BUG=760316

Change-Id: Ic4477032219c66d00439bc7adecdb4783512a418
Reviewed-on: https://chromium-review.googlesource.com/690625Reviewed-by: Andrey Kosyakov <caseq@chromium.org>
Reviewed-by: Pavel Feldman <pfeldman@chromium.org>
Commit-Queue: Blaise Bruer <allada@chromium.org>
Cr-Commit-Position: refs/heads/master@{#505825}

ManagedDisplayInfo does not need to know about input devices. The reason
input devices were introduced to this class was to work with stylus. But
even then, the stylus appears like a touchscreen that generates touch
events for ManagedDisplayInfo.This means that ManagedDisplayInfo does
not need to know about the stylus and should only care about
touchscreens. This patch removes the concept of arbitrary input devices
from ManagedDisplayInfo and instead replaces it with touch devices only.

This patch also migrates from using input device ids, which are
dynamically generated at runtime, to using a persistent input device
identifier that stays the same across every system shutdown. This is a
stronger association that is necessary if we want to store touch
calibration and touch association preferences across system shutdown
or device dis/connections.

Bug: 599985
Change-Id: Ia5da98a587402d37b06b5f46a10a2bb7e861cb81
Component: ChromeOS, Touch device, ManagedDisplayInfo, Touch Calibration
Reviewed-on: https://chromium-review.googlesource.com/691514
Commit-Queue: Malay Keshav <malaykeshav@chromium.org>
Reviewed-by: Mitsuru Oshima <oshima@chromium.org>
Reviewed-by: Jacob Dufault <jdufault@chromium.org>
Cr-Commit-Position: refs/heads/master@{#505824}

Since it is possible to have a PPS (Picture Parameter Set)
before a SPS (Sequence Parameter Set) in a stream.
In this case, any PPSes that comes before the SPS will be
ignored.

Bug: b/64957546
Test: run media_unittests
Test: manual
Change-Id: I53f7d8252f5205655e139e4f955947dd0ed13a5e
Reviewed-on: https://chromium-review.googlesource.com/673833Reviewed-by: Kongqun Yang <kqyang@chromium.org>
Reviewed-by: Dan Sanders <sandersd@chromium.org>
Commit-Queue: Peter Qiu <zqiu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#505823}

WebContents::GetRenderProcessHost is an API that doesn't behave as
expected with out-of-process iframes, as multiple processes can be
associated with a single WebContents.  This CL replaces callers of this
API, so that they go through an equivalent API that explicitly selects
which frame's process is needed.

This CL was started by using an ad-hoc clang-plugin that replaced
existing callsites of WebContents::GetRenderProcessHost() with a call to
something like wc->GetMainFrame()->GetProcess().  This was followed-up
by manually adding an include of render_frame_host.h and git cl format
and git cl lint and then a self-review with small tweaks (e.g. sometimes
using a wc->GetRenderViewHost()->GetProcess() is more appropriate).

This CL was uploaded by git cl split.

R=wjmaclean@chromium.org

Bug: 666525
Change-Id: I2adf34e7e6d72b4e8391fa3b1e141cddaf0c9288
Reviewed-on: https://chromium-review.googlesource.com/688769Reviewed-by: James MacLean <wjmaclean@chromium.org>
Commit-Queue: Łukasz Anforowicz <lukasza@chromium.org>
Cr-Commit-Position: refs/heads/master@{#505822}

Needed to build DRM ozone on jessie.

Bug: 
Change-Id: I58634440075d49b873e55951cb97c11da51c8047
Tbr: adlr@chromium.org
Reviewed-on: https://chromium-review.googlesource.com/693160Reviewed-by: David Reveman <reveman@chromium.org>
Commit-Queue: David Reveman <reveman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#505821}

This CL adds missing MIPSEL support for creating .deb/.rpm packages.
Also fixes issue with crosscompile and calling "install -s".

BUG=758654

Change-Id: I1fee33fab48db644e3ff9870bd315e9c8f134877
Reviewed-on: https://chromium-review.googlesource.com/674872Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#505820}

Sandbox policy extensions can be issued for resources in a trusted process,
which generates a token that may be passed over Mojo IPC. The receiving process
can then consume the token to be granted access to the resource. Currently only
file-read extensions are permitted.

Bug: 510604
Change-Id: Iaa92c48c120e051c5df72602d09329ebe84ea317
Reviewed-on: https://chromium-review.googlesource.com/685583Reviewed-by: Greg Kerr <kerrnel@chromium.org>
Reviewed-by: Ken Rockot <rockot@chromium.org>
Reviewed-by: Justin Schuh <jschuh@chromium.org>
Commit-Queue: Robert Sesek <rsesek@chromium.org>
Commit-Queue: Justin Schuh <jschuh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#505819}

This change was accidentally removed from CL 685694 before landing and was already 
reviewed by dmazzoni in that CL.

It listens to the events for the passed-in process and uses out-of-context mode to capture 
the MSAA/IA2 events for general listening when not linked against the browser itself.

Bug: 768984
Change-Id: Ied391e3bcf8718b5ca09b9e657a5317444f5f1a4
Reviewed-on: https://chromium-review.googlesource.com/695727Reviewed-by: David Tseng <dtseng@chromium.org>
Commit-Queue: Aaron Leventhal <aleventhal@chromium.org>
Cr-Commit-Position: refs/heads/master@{#505818}

In Android O "ps" only returns the user's processes (generally just the "ps"
command itself). Run both the bare "ps" command and with the flag "-A" to
handle Android O.

Move to using ps && ps -A for chromedriver process inspection

Bug: chromedriver:2013
Change-Id: I1cc667f2ec6ff9ac5363ad7f8d34614a16badf3b
Reviewed-on: https://chromium-review.googlesource.com/696163Reviewed-by: John Chen <johnchen@chromium.org>
Commit-Queue: John Chen <johnchen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#505817}

Also refines the client-side criteria for when the menu header is
showing. If the toolbar is not showing, the menu header shouldn't show
since there is nothing to for the IPH bubble to point to.

BUG=756473,767794

Change-Id: I3343dcf768611133753a0a38badef46863765086
Reviewed-on: https://chromium-review.googlesource.com/690447
Commit-Queue: Theresa <twellington@chromium.org>
Reviewed-by: Tommy Nyquist <nyquist@chromium.org>
Reviewed-by: Steven Holte <holte@chromium.org>
Reviewed-by: Matthew Jones <mdjones@chromium.org>
Cr-Commit-Position: refs/heads/master@{#505816}

This histogram records how much, in bytes, of the response body has been read
from network by a URLLoader before it pauses reading, when it receives a
PauseReadingBodyFromNet() call. If there are multiple calls to
PauseReadingBodyFromNet(), only a single value is recorded for the last call.
This histogram is recorded by URLLoader implementations that fetch from network.
When SafeBrowsing indicates that a resource may be unsafe and therefore a more
time-consuming check is required to classify it, reading response body from
network is paused in order to reduce the chance of writing unsafe contents into
cache. This histogram is useful to evaluate how much data is cached during this
window.

BUG=715673

Change-Id: I4e0878b10f4622ce48113b25a107df6248f16126
Reviewed-on: https://chromium-review.googlesource.com/685747
Commit-Queue: Yuzhu Shen <yzshen@chromium.org>
Reviewed-by: Randy Smith <rdsmith@chromium.org>
Reviewed-by: Ilya Sherman <isherman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#505815}

This is used for the "manage people" bubble accessible from the avatar
menu. It doesn't compile on Chrome OS so the USE_ASH blocks are
obsolete.

The JS is shared with the Chrome OS login screen, which still uses
kKeyCanRemove, so we can't delete the flag altogether.

Bug: 770866
Change-Id: I55f63800f98e28ebd9358812c3b634b65041a904
Reviewed-on: https://chromium-review.googlesource.com/695944Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Commit-Queue: Evan Stade <estade@chromium.org>
Cr-Commit-Position: refs/heads/master@{#505814}

Adds a warning triangle if request interception is currently active.

R=pfeldman,dgozman
BUG=760316

Change-Id: I7ad10215bc20885fd78b13c5d870c3c9f0745e6f
Reviewed-on: https://chromium-review.googlesource.com/690954
Commit-Queue: Blaise Bruer <allada@chromium.org>
Reviewed-by: Dmitry Gozman <dgozman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#505813}

This cleans up several call-sites in the new test framework that's just
copy-and-paste code.

Bug: 667560
Change-Id: I7da98a1d25f4103f7e1789067f6f0ed3651830d1
Reviewed-on: https://chromium-review.googlesource.com/693144Reviewed-by: Will Chen <chenwilliam@chromium.org>
Reviewed-by: Dmitry Gozman <dgozman@chromium.org>
Commit-Queue: Will Chen <chenwilliam@chromium.org>
Cr-Commit-Position: refs/heads/master@{#505812}

This increases the number of samples used in the primary framebuffer.

Bug: 752085
Change-Id: I869ae41943db925aff845b3d1da15e8130b14e45
Reviewed-on: https://chromium-review.googlesource.com/680374Reviewed-by: Michael Thiessen <mthiesse@chromium.org>
Reviewed-by: Tibor Goldschwendt <tiborg@chromium.org>
Commit-Queue: Ian Vollick <vollick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#505811}

Bug: 768167
Test: fast/loader/navigate-during-javascript-url-commit.html
Change-Id: I4d02d38faeb877febd84b5ba800276c8be95d7ca
Reviewed-on: https://chromium-review.googlesource.com/671462
Commit-Queue: Nate Chapin <japhet@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#505810}

This CL suports generating code coverage report for multiple targets.

Bug: 757515
Change-Id: Ic74dfab8fd33f8f9b93cad647405effad49fb1ba
Reviewed-on: https://chromium-review.googlesource.com/692572
Commit-Queue: Yuke Liao <liaoyuke@chromium.org>
Reviewed-by: Eugene But <eugenebut@chromium.org>
Cr-Commit-Position: refs/heads/master@{#505809}

The documentation only gave examples of calling base::Passed
with a pointer.

Change-Id: I86c516546b55e6dcd62f8c83cdff859cba64578d
Reviewed-on: https://chromium-review.googlesource.com/688685
Commit-Queue: Albert J. Wong <ajwong@chromium.org>
Reviewed-by: Albert J. Wong <ajwong@chromium.org>
Cr-Commit-Position: refs/heads/master@{#505808}

Forcing the structure of the handlers to be like this will help avoid
TOCTOU errors.

BUG=602688

Change-Id: I50626770f3f123c40f45680661d97ca9e1416129
Reviewed-on: https://chromium-review.googlesource.com/695842Reviewed-by: Antoine Labour <piman@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#505807}

https://pdfium.googlesource.com/pdfium.git/+log/1cfdb58521aa..951b1119d4c7

$ git log 1cfdb5852..951b1119d --date=short --no-merges --format='%ad %ae %s'
2017-10-02 dsinclair More define cleanup
2017-10-02 dsinclair Remove extraneous ;s
2017-10-02 art-snake Remove useless code.

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

This CL changes AutofillQueryResponseContents proto in order to support
multiple field predictions. A field may have several server-side
predictions. For example, for the same field we can have two different
classifications: |EMAIL_ADDRESS| and |USERNAME| and both are important.
This CL also updates how the response proto is parsed and the process of
choosing the autofill predictions which are useful for password manager.

The CL was almost done by Madalina (https://chromium-review.googlesource.com/c/chromium/src/+/664704). 
Here I applied a couple of comments from reviewer when Madalina's internship finished.

Bug: 699530
Change-Id: I65b3ca8683e03b5d85049f3180971bcdeb1a1309
Reviewed-on: https://chromium-review.googlesource.com/677298Reviewed-by: Maxim Kolosovskiy <kolos@chromium.org>
Reviewed-by: Roger McFarlane <rogerm@chromium.org>
Reviewed-by: Mathieu Perreault <mathp@chromium.org>
Commit-Queue: Maxim Kolosovskiy <kolos@chromium.org>
Cr-Commit-Position: refs/heads/master@{#505805}

BUG=761655

Change-Id: Ib3bde429ea024b97a8713daa1d870f10de69daff
Reviewed-on: https://chromium-review.googlesource.com/692852Reviewed-by: Andrey Kosyakov <caseq@chromium.org>
Commit-Queue: Dmitry Gozman <dgozman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#505804}

This seems to have been missed when these sources moved to
the service_manager directory tree.

Change-Id: I4443527ca72086bfacfa15b1593c514e669c7567
Reviewed-on: https://chromium-review.googlesource.com/695823Reviewed-by: Ken Rockot <rockot@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#505803}

This is a very old testing tool that's no longer used by DevTools

TBR=pfeldman@chromium.org

Bug: 667560
Change-Id: Id25542b2fbf6a213546943a2ef86e1270e05e025
Reviewed-on: https://chromium-review.googlesource.com/692597Reviewed-by: Will Chen <chenwilliam@chromium.org>
Commit-Queue: Will Chen <chenwilliam@chromium.org>
Cr-Commit-Position: refs/heads/master@{#505802}

Bug: 746953
Change-Id: Id2bf0dbb4c4c67a5905586c3cee28290dfc00da2
Reviewed-on: https://chromium-review.googlesource.com/696082Reviewed-by: Bill Budge <bbudge@chromium.org>
Commit-Queue: Mostyn Bramley-Moore <mostynb@vewd.com>
Cr-Commit-Position: refs/heads/master@{#505801}

Bug: 770009
Change-Id: I898ea3017e5a2bfff311026dee773810e92e9281
Reviewed-on: https://chromium-review.googlesource.com/691043Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Commit-Queue: David Tu <dtu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#505800}

A mock call warning is interesting despite the fact that the test output
says it's uninteresting.

BUG=

Change-Id: I34e2b2ca98685886f08f3adf411ea3252cd025f7
Reviewed-on: https://chromium-review.googlesource.com/695820Reviewed-by: Tibor Goldschwendt <tiborg@chromium.org>
Commit-Queue: Christopher Grant <cjgrant@chromium.org>
Cr-Commit-Position: refs/heads/master@{#505799}

The attribute check is the slowest check in that if statement, and it's
likely for some of the other checks to fail first.

Bug: 764618
Change-Id: I6dd694f9ace8fc5e9461a51f6eab8abdec32580b
Reviewed-on: https://chromium-review.googlesource.com/695982Reviewed-by: Jeremy Roman <jbroman@chromium.org>
Commit-Queue: Adithya Srinivasan <adithyas@chromium.org>
Cr-Commit-Position: refs/heads/master@{#505798}

This reverts commit b243824e.

Reason for revert: Looks like this really is responsible.  Once it landed in https://build.chromium.org/p/chromium.win/builders/Win7%20Tests%20%28dbg%29%281%29/builds/63607, both BrowserTest.WindowOpenClose and
ExtensionLoadingTest.RuntimeValidWhileDevToolsOpen started failing immediately.

Original change's description:
> Field trial testing config for StabilityDebugging
> 
> This enables testing for the "record, collect on crash, process
> postmortem without sending postmortem reports" configuration.
> 
> This is a reland attempt. The previous attempt was reverted, but I don't
> think it was the true culprit. See:
> https://chromium-review.googlesource.com/q/Iba7b79d153a52fca73e4e943697ebcdf5332a500
> 
> Bug: 620813
> Change-Id: I5d9d38fdf4e97fb95d73e1db06c4f6d40d18ce17
> Reviewed-on: https://chromium-review.googlesource.com/695445
> Reviewed-by: Jesse Doherty <jwd@chromium.org>
> Commit-Queue: Pierre-Antoine Manzagol (departed) <manzagop@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#505714}

TBR=jwd@chromium.org,manzagop@chromium.org

Change-Id: I62b586df4361de3f7e20cfb6ede180fff665cf5e
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 620813
Reviewed-on: https://chromium-review.googlesource.com/696126Reviewed-by: Devlin <rdevlin.cronin@chromium.org>
Commit-Queue: Devlin <rdevlin.cronin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#505797}

This change replaces the use of ChromeAnimation in ToolbarSwipeLayout
with a CompositorAnimator.

BUG=750381

Change-Id: I8c2f5cdfc9ca8f8e13960219cf39abd4e5d2218f
Reviewed-on: https://chromium-review.googlesource.com/691282
Commit-Queue: Matthew Jones <mdjones@chromium.org>
Reviewed-by: David Trainor <dtrainor@chromium.org>
Cr-Commit-Position: refs/heads/master@{#505796}

It's a temporary solution while pending integration on LLVM side.

An example of usage:
  ./coverage.py --command "out/coverage/zlib_uncompress_fuzzer \
    -runs=0 $HOME/corpus/zlib_uncompress_fuzzer" --source "$PWD" \
    --output "cov"
  <...>
  Done. The next steps would be:
  1. cd cov && python -m SimpleHTTPServer
  2. open http://127.0.0.1:8000/report.html


Examples of reports:
- small test target: http://go/cov-sample-1
- v8_script_parser_fuzzer: http://go/cov-sample-2


Bug: 759794
Change-Id: I57b8ffc7ff70d2415dc0d3796508e85f7c1f048b
Reviewed-on: https://chromium-review.googlesource.com/677138Reviewed-by: Max Moroz <mmoroz@chromium.org>
Reviewed-by: Oliver Chang <ochang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#505795}

TBR=abdulsyed@chromium.org

Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: Ifdf02cedc56bfe25736200e58de9aa0be7bf367f
Reviewed-on: https://chromium-review.googlesource.com/695915Reviewed-by: Krishna Govind <govind@chromium.org>
Commit-Queue: Krishna Govind <govind@chromium.org>
Cr-Commit-Position: refs/heads/master@{#505794}

This reverts commit 8adb9990.

Reason for revert: breaking PolyGerrit

Original change's description:
> offsetParent fails to consider continuations when searching for parent.
> 
> Block-level objects can have inline parents, but this triggers the
> insertion of anonymous boxes and continuations, which offsetParent()
> currently doesn't understand.
> 
> This change lets offsetParent() understand continuations better.
> If an anonymous continuation is encountered when finding ancestors,
> it will use the split inline as the ancestor, and continue searching
> from there.
> 
> BUG=638177
> 
> Change-Id: I8850f9b5dacaffaa26b5f1c414f4f351709d7088
> Reviewed-on: https://chromium-review.googlesource.com/674875
> Reviewed-by: Emil A Eklund <eae@chromium.org>
> Commit-Queue: Karl Anders Øygard <karlo@opera.com>
> Cr-Commit-Position: refs/heads/master@{#503704}

TBR=kochi@chromium.org,eae@chromium.org,karlo@opera.com

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 638177
Change-Id: I6e59c060ca0f290fbfabb7662f233424baab6564
Reviewed-on: https://chromium-review.googlesource.com/695843Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Reviewed-by: Emil A Eklund <eae@chromium.org>
Commit-Queue: Emil A Eklund <eae@chromium.org>
Commit-Queue: Daniel Cheng <dcheng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#505793}

This CL uses os.extsep to append extensions for the sake of cross
platform compatability.

Bug: 
Change-Id: Ic12d98df9c19d5114029dba3dde35b14216d6005
Reviewed-on: https://chromium-review.googlesource.com/695925Reviewed-by: Eugene But <eugenebut@chromium.org>
Commit-Queue: Yuke Liao <liaoyuke@chromium.org>
Cr-Commit-Position: refs/heads/master@{#505792}

Added an UploadLogToURL function to NetMetricsLogUploader, this
contains all the logic that was in the existing UploadLog function,
with the exception that it takes a URL as a parameter and uploads the
log to that URL instead of the one passed in the constructor. The
UploadLog function was modified so it now calls UploadLogToURL with the
URL set to server_url (So UploadLog keeps the same functionality it had
before this change).

R=estark@chromium.org

Bug: 769142
Change-Id: I0d1b40d76c1d2fcb8528f301fe488d5d10e268b7
Reviewed-on: https://chromium-review.googlesource.com/692510Reviewed-by: Steven Holte <holte@chromium.org>
Reviewed-by: Emily Stark <estark@chromium.org>
Commit-Queue: Carlos IL <carlosil@chromium.org>
Cr-Commit-Position: refs/heads/master@{#505791}

ExtensionService unittests construct a bunch of ExternalInstallInfos,
but for some reason choose smart pointers over stack allocation (even
though they aren't passed anywhere). Use stack allocation instead.

Bug: 770007
Change-Id: Ic5a2ee425581b7f887b95a49d9409a5238d2394d
Reviewed-on: https://chromium-review.googlesource.com/693396Reviewed-by: Karan Bhatia <karandeepb@chromium.org>
Commit-Queue: Devlin <rdevlin.cronin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#505790}

This patch removed the cache (notification_views_map) from MessageCenterView. Instead, it refers MessageListView directly.

As the investigation (see crbug.com/737858#3), the cache and the list view are sometimes inconsistent. To remove the inconsistency, this patch removes the cache. Then, the Issue 737858 should be fixed by this patch.

Bug: 737858
Test: manual
Change-Id: I7740e282018c2e964947296b53539ce8d91c432d
Reviewed-on: https://chromium-review.googlesource.com/686214
Commit-Queue: Yoshiki Iguchi <yoshiki@chromium.org>
Reviewed-by: Mitsuru Oshima <oshima@chromium.org>
Reviewed-by: Eliot Courtney <edcourtney@chromium.org>
Reviewed-by: Naoki Fukino <fukino@chromium.org>
Cr-Commit-Position: refs/heads/master@{#505789}

Bug: 766846, 769353
Change-Id: I48a8b72f787c4e96f517ee2ed60be32bc977f550
Reviewed-on: https://chromium-review.googlesource.com/689743
Commit-Queue: Evan Stade <estade@chromium.org>
Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#505788}