GitLab

As GURL is still used in content/public/browser/appcache_service.h,
and there are uses outside content/browser that needs updating,
Convertion is still needed for AppCacheInfoCollection::infos_by_origin.

Convertion is also needed for quota api(storage/browser/quota).

Bug: 598424
Change-Id: I51e8f308a5c12ed61168f68c0f94f1a1bfb8f48a
Reviewed-on: https://chromium-review.googlesource.com/977846Reviewed-by: Joshua Bell <jsbell@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Joshua Bell <jsbell@chromium.org>
Cr-Commit-Position: refs/heads/master@{#545872}

This reverts commit a5dfe3d8.

Reason for revert: Fails on Mac builders (instead of crashing).

Original change's description:
> Update expectations for video-rotation.html to Failure Pass
> 
> Because propriety codecs are not supported on some test
> configurations, video-rotation.html is updated to be
> Failure Pass instead of just Skipped, as it gives us better
> code coverage.
> 
> Bug: 750313
> Change-Id: Ia26c4cc0fdab21adb308b228a95c234577060af8
> Reviewed-on: https://chromium-review.googlesource.com/958262
> Reviewed-by: Mounir Lamouri <mlamouri@chromium.org>
> Commit-Queue: CJ DiMeglio <lethalantidote@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#545859}

TBR=wez@chromium.org,ccameron@chromium.org,mlamouri@chromium.org,liberato@chromium.org,lethalantidote@chromium.org

Change-Id: I2dd1a6ee472a215c7139510c0ec08f0aef1bd4fc
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 750313
Reviewed-on: https://chromium-review.googlesource.com/980755Reviewed-by: Dominic Battré <battre@chromium.org>
Commit-Queue: Dominic Battré <battre@chromium.org>
Cr-Commit-Position: refs/heads/master@{#545871}

Half the code used the SDK_VERSION_* constants when checking
Android version, half the code used hard coded numbers 19, 21,
22, ....

This changes the code to use SDK_VERSION_ everywhere.

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.android:android_arm64_dbg_recipe;master.tryserver.chromium.android:android_compile_x64_dbg;master.tryserver.chromium.android:android_compile_x86_dbg;master.tryserver.chromium.win:win_optional_gpu_tests_rel
Change-Id: Icb4e3183f0490b00d16039681548ccf469e9d236
Reviewed-on: https://chromium-review.googlesource.com/975841
Commit-Queue: Daniel Bratell <bratell@opera.com>
Reviewed-by: Robert Sesek <rsesek@chromium.org>
Reviewed-by: Bo <boliu@chromium.org>
Reviewed-by: Reilly Grant <reillyg@chromium.org>
Reviewed-by: David Benjamin <davidben@chromium.org>
Reviewed-by: Chrome Cunningham <chcunningham@chromium.org>
Cr-Commit-Position: refs/heads/master@{#545870}

In msan builds, V8 generates ARM code and runs it in a simulator. This means we
cannot support trap handlers in that configuration.

TBR=jam@chromium.org

Bug: chromium:824645
Change-Id: If0971148262297d5688efd559a1526295a869e07
Reviewed-on: https://chromium-review.googlesource.com/979033Reviewed-by: Dominic Battré <battre@chromium.org>
Commit-Queue: Dominic Battré <battre@chromium.org>
Cr-Commit-Position: refs/heads/master@{#545869}

Replace sending motion events to perform a long click with a direct call
to View#performLongClick. Locally this fixes the weird blue highlighting
after sending motion events.

BUG=813589

Change-Id: I36ebfa69eedbd169bab2a1625963e14cf822b99b
Reviewed-on: https://chromium-review.googlesource.com/976051Reviewed-by: Ted Choc <tedchoc@chromium.org>
Commit-Queue: Theresa <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#545868}

To prepare for immutable ComputedStyle objects.

Bug: 813068
Change-Id: Id5b4a57940712adfc9d353634856bc32e4ef2a0d
Reviewed-on: https://chromium-review.googlesource.com/979810Reviewed-by: Stefan Zager <szager@chromium.org>
Commit-Queue: Rune Lillesveen <futhark@chromium.org>
Cr-Commit-Position: refs/heads/master@{#545867}

* Fixes recently introduced -keep rule for @MainDex on methods:
  * <methods> works, whereas * sometimes doesn't
  * Teach jni_generator.py about @MainDex on methods
* Removes @MainDex from browser-process-only AnimationFrameTimeHistogram
* Removes @MainDex from browser-process-only MediaServerCrashListener
* Adds a missing @MainDex needed to play <video>
  (SurfaceTexturePlatformWrapper, MediaCodecBridgeBuilder)
* Outputs a new artifact from main_dex_list.py for seeing which classes
  are kept by ProGuard vs MainDexListBuilder
* Adds assertions for a few classes that should not appear in the main dex.

With this change, main dex method counts:
chrome_public_apk=7623
chrome_apk=11333
monochrome_apk=22086

NOTRY=true  # ios-simulator is unhappy.

Bug: 820570
Change-Id: I4ea925ed985a0daa5a4db54a9cf72744fa92aeca
Reviewed-on: https://chromium-review.googlesource.com/972641
Commit-Queue: agrieve <agrieve@chromium.org>
Reviewed-by: agrieve <agrieve@chromium.org>
Reviewed-by: Theresa <twellington@chromium.org>
Reviewed-by: Thomas Guilbert <tguilbert@chromium.org>
Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#545866}

For correctness, set the TabStripModel of a TabLifeycleUnit to nullptr
when it is detached.

Bug: 775644
Change-Id: Icf7ad8d1be8c130ae934f74f2855eab40d21207d
Reviewed-on: https://chromium-review.googlesource.com/980777
Commit-Queue: François Doray <fdoray@chromium.org>
Reviewed-by: Sébastien Marchand <sebmarchand@chromium.org>
Cr-Commit-Position: refs/heads/master@{#545865}

In this CL, we remove exit_prompt* classes and use prompt* instead.

Bug: 818182
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.linux:linux_vr;master.tryserver.chromium.win:win_optional_gpu_tests_rel
Change-Id: Ia75046518d06b1953db85fa59c240f58dcbb8350
Reviewed-on: https://chromium-review.googlesource.com/978618
Commit-Queue: Yash Malik <ymalik@chromium.org>
Reviewed-by: Christopher Grant <cjgrant@chromium.org>
Cr-Commit-Position: refs/heads/master@{#545864}

Rather than just documenting that the class should be bound to a mojo
pipe on a different thread than the main/worker threads, explicitly make
the API such that it creates its own task runner to bind on.

That same task runner is then also passed on to BlobBytesStreamer, to
replace its usage of SequencedTaskRunnerHandle::Get().

Bug: 786332
Change-Id: Ic2e38a53514bc612ffaf579c3eb1bc4a88b29efe
Reviewed-on: https://chromium-review.googlesource.com/976098Reviewed-by: Hajime Hoshi <hajimehoshi@chromium.org>
Reviewed-by: Alexander Timin <altimin@chromium.org>
Commit-Queue: Marijn Kruisselbrink <mek@chromium.org>
Cr-Commit-Position: refs/heads/master@{#545863}

Bug: 825880
Change-Id: I7c4e8abee53788e4c0f5fcd7857dde087b5ec6e3
TBR: ryansturm@chromium.org
Reviewed-on: https://chromium-review.googlesource.com/980919Reviewed-by: Tarun Bansal <tbansal@chromium.org>
Commit-Queue: Tarun Bansal <tbansal@chromium.org>
Cr-Commit-Position: refs/heads/master@{#545862}

RTL was missing from this particular part of MD downloads. This change:

1. Adds RTL support.

2. Changes the look slightly overall to match dragging on macOS: instead of a
   representation of the file appearing under the mouse pointer, dragging
   creates a copy of the icon and text seen in the shelf, which start off in
   their original spots. (I tried this while I was working on RTL).

Change-Id: I766d61227d04541f1beecf93adf87464da5a020b
Bug: 825849
Reviewed-on: https://chromium-review.googlesource.com/979195Reviewed-by: Leonard Grey <lgrey@chromium.org>
Commit-Queue: Sidney San Martín <sdy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#545861}

CL [1] disabled sandbox_ipc_fuzzer on Linux to fix a build error on a certain
configuration.  Though the code is Windows-based, the fuzzer runs on Linux.
Reenable the target on Linux and add a message not to disable it again.

[1] https://chromium.googlesource.com/chromium/src/+/1dd06808a27b6903d2dc8971a40abc465c5a346e%5E%21/#F10

BUG=825851
TBR=jorgelo
CC=​inferno,wfh

Change-Id: Ibb2b3bdd0bf25f80ec7bc2cd5cab3a8729b07cf7
Reviewed-on: https://chromium-review.googlesource.com/980917
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Reviewed-by: Will Harris <wfh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#545860}

Because propriety codecs are not supported on some test
configurations, video-rotation.html is updated to be
Failure Pass instead of just Skipped, as it gives us better
code coverage.

Bug: 750313
Change-Id: Ia26c4cc0fdab21adb308b228a95c234577060af8
Reviewed-on: https://chromium-review.googlesource.com/958262Reviewed-by: Mounir Lamouri <mlamouri@chromium.org>
Commit-Queue: CJ DiMeglio <lethalantidote@chromium.org>
Cr-Commit-Position: refs/heads/master@{#545859}

The non-const parameter was causing issues with ubsan because ANGLE is
compiled with lasted typedefs.

BUG=820848
TBR=piman@chromium.org

Cq-Include-Trybots: luci.chromium.try:linux_optional_gpu_tests_rel;master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
Change-Id: I366e101fb8c42edec1d381e27cb55a51283f4e09
Reviewed-on: https://chromium-review.googlesource.com/969083Reviewed-by: Zhenyao Mo <zmo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#545858}

Shrinks monochrome_apk dex by 53kb uncompressed, 17kb compressed.
Shrinks method_count by 1400.

Bug: 620323
Change-Id: Ie9f7c37a20895ecd1d3f1f17357a663252a1be36
Reviewed-on: https://chromium-review.googlesource.com/981052Reviewed-by: Eric Stevenson <estevenson@chromium.org>
Commit-Queue: agrieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#545857}

TBR=ashleymarie@chromium.org
NOTRY=true

Bug: 825224
Change-Id: Ifd87513095452f298ac9bf5ba5e44dd1f59c94df
Reviewed-on: https://chromium-review.googlesource.com/981128Reviewed-by: Emily Hanley <eyaich@chromium.org>
Commit-Queue: Emily Hanley <eyaich@chromium.org>
Cr-Commit-Position: refs/heads/master@{#545856}

Change-Id: I19d2d75acb589d0e1af6562cdd84ab3c75abd0bc
Reviewed-on: https://chromium-review.googlesource.com/979772Reviewed-by: Patrick Noland <pnoland@google.com>
Commit-Queue: Filip Gorski <fgorski@chromium.org>
Cr-Commit-Position: refs/heads/master@{#545855}

This DCHECK was made obsolete by
9b88406d, since it stopped using the
"pending resource" flag for <use>.

Bug: 825460
Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.linux:linux_layout_tests_slimming_paint_v2
Change-Id: Ie1202097eb2172ef9ed3866e3a6575fbe4aa09db
Reviewed-on: https://chromium-review.googlesource.com/980252Reviewed-by: Stephen Chenney <schenney@chromium.org>
Commit-Queue: Fredrik Söderquist <fs@opera.com>
Cr-Commit-Position: refs/heads/master@{#545854}

This CL migrates FirstRun and sign-in activities to support library
fragments (android.support.v4.app.Fragment instead of
android.app.Fragment).
Rationale for this migration:
1. Framework version of fragments are getting deprecated in Android P.
2. Enables use of getChildFragmentManager, getParentFragment, etc., on
all API versions.

Bug: 825789
Change-Id: I2079f211b03e4df1d169c1568d764763bb677bd1
Reviewed-on: https://chromium-review.googlesource.com/980335Reviewed-by: Ted Choc <tedchoc@chromium.org>
Commit-Queue: Boris Sazonov <bsazonov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#545853}

Fixes two VR test failures:
1. MockVrDaydreamApi not working properly.
2. DeepLinkedApp tests getting stuck in relaunch loops due to
    the relaunch logic not working properly with the DON flow
    skipped.

Bug: 825248

Change-Id: Iee43fc55f8160bb4fdbbc4f60de8b67f64a3d8e9
Reviewed-on: https://chromium-review.googlesource.com/978887
Commit-Queue: Brian Sheedy <bsheedy@chromium.org>
Reviewed-by: Michael Thiessen <mthiesse@chromium.org>
Cr-Commit-Position: refs/heads/master@{#545852}

We need a ProcessManager to exist in order to load background
pages but like everything extension-related it is lazy created

Bug: b/73768170
Test: load extension at start verify background script prints occur


Change-Id: I63ccc58ee819ec0435646c296ceb0d7678c433cc
Reviewed-on: https://chromium-review.googlesource.com/959343Reviewed-by: Kevin Schoedel <kpschoedel@chromium.org>
Reviewed-by: Luke Halliwell <halliwell@chromium.org>
Commit-Queue: Albert Chaulk <achaulk@chromium.org>
Cr-Commit-Position: refs/heads/master@{#545851}

This test is failing consistently on Android in addition to having been
flaky on Linux when the Network Service flag is enabled:

* ResourceDispatcherHostBrowserTest.PageTransitionClientRedirect

Bug: 818445
Change-Id: Icf555652a3c78126e28753bfc2e7b8878fe47460
Tbr: jam@chromium.org
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/981123Reviewed-by: Reilly Grant <reillyg@chromium.org>
Commit-Queue: Reilly Grant <reillyg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#545850}

Bug: None
Change-Id: I4bb6b63d8b47c281d644f24702100a23b33c029f
Reviewed-on: https://chromium-review.googlesource.com/979032
Commit-Queue: Toni Barzic <tbarzic@chromium.org>
Reviewed-by: Michael Giuffrida <michaelpg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#545849}

Otherwise, EXPECT_CALL macros tend to get ugly quickly.

Bug: None
Change-Id: I24584a7ea0d4ec324b84c7c55cf313a4407da419
Reviewed-on: https://chromium-review.googlesource.com/980533
Commit-Queue: Balazs Engedy <engedy@chromium.org>
Reviewed-by: Kim Paulhamus <kpaulhamus@chromium.org>
Cr-Commit-Position: refs/heads/master@{#545848}

Prior to this CL, both ui::Compositor and DelegatedFrameHost used the
same ParentLocalSurfaceIdAllocator to allocate LocalSurfaceIds. This is
technically not incorrect, but it's super confusing when debugging.
Each embedding should have a different embed_token (previously called nonce),
and this violated this (untested) assumption.

This CL fixes that. This CL also drops the class member variables that store
the LocalSurfaceId for ui::Compositor and DelegatedFrameHost because the
ParentLocalSurfaceIdAllocator instead tracks the last ID.

Bug: 672962
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel
Change-Id: I0c4f1810045272b52b037bd263c5dd906c983f8f
Reviewed-on: https://chromium-review.googlesource.com/976743
Commit-Queue: Fady Samuel <fsamuel@chromium.org>
Reviewed-by: Saman Sami <samans@chromium.org>
Cr-Commit-Position: refs/heads/master@{#545847}

While doing stylus button text selection, focus is mainly
on the stylus button press and text selection is anchored
by the stylus button. In that case touch handle has less
significance (same with touch long press drag selection).
So we can hide touch handles during stylus button selection
and can show after stylus button selection is concluded.

Bug: 771667
Change-Id: I9dccaabfd5fafccb68c1f0bce23bba36cea9061f
Reviewed-on: https://chromium-review.googlesource.com/685054Reviewed-by: Bo <boliu@chromium.org>
Commit-Queue: AJITH KUMAR V <ajith.v@samsung.com>
Cr-Commit-Position: refs/heads/master@{#545846}

This allows a LayoutChild to have layout performed on it, which will
return a Fragment - with the correct inline and block sizes.

These Fragments cannot be positioned yet, (next patch).

The LayoutChild will be laid out with an available inline/block size of
zero by default, and optionally can accept a fixed-inline/block size,
which it must respect.

Bug: 726125
Change-Id: Ie4386b8f6cd6ccec3f9e52ff332322101058836d
Reviewed-on: https://chromium-review.googlesource.com/962870
Commit-Queue: Ian Kilpatrick <ikilpatrick@chromium.org>
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Reviewed-by: Emil A Eklund <eae@chromium.org>
Reviewed-by: Morten Stenshorne <mstensho@chromium.org>
Cr-Commit-Position: refs/heads/master@{#545845}

This method just returns a member since r544824.

Bug: 813232
Change-Id: I7e8ee5e33b559f0fca0c5ee3f2cb7dc9837458a0
Reviewed-on: https://chromium-review.googlesource.com/980825Reviewed-by: Alex Moshchuk <alexmos@chromium.org>
Commit-Queue: Bo <boliu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#545844}

Adds Async TraceEvents to track the splashscreen and how long it is
visible.

Bug: 822816
Change-Id: I9a75001830d36cb7f0a35d0cb4d04511242d74fd
Reviewed-on: https://chromium-review.googlesource.com/978453Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
Reviewed-by: Dmitry Skiba <dskiba@chromium.org>
Commit-Queue: Mohamed Heikal <mheikal@chromium.org>
Cr-Commit-Position: refs/heads/master@{#545843}

CustomFrameViewAsh uses this mmode to turn on/off, enable/disable
buttons on caption.

Close button is always on for now. I'll have to investigate if this
has to be enabled for ARC++ apps.

BUG=822960, b/33693796
TEST=Covered by unit tests.

Change-Id: I67fe2278b255ecd81e800209c52d51f9b4a3eb78
Reviewed-on: https://chromium-review.googlesource.com/975422Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Ahmed Fakhry <afakhry@chromium.org>
Commit-Queue: Mitsuru Oshima <oshima@chromium.org>
Cr-Commit-Position: refs/heads/master@{#545842}

Chanes:
The entire tray_accessibility_browsertest.cc should be moved to ash/.
This CL is one step closer.

Bug: 594887
Test: trybot tests
Change-Id: I503065ce0f371260272b7da44541a83a8a89bdeb
Reviewed-on: https://chromium-review.googlesource.com/979705Reviewed-by: James Cook <jamescook@chromium.org>
Commit-Queue: Qiang Xu <warx@google.com>
Cr-Commit-Position: refs/heads/master@{#545841}

This CL makes the lightweight FRE use a DualControlLayout for the
buttons. This causes the buttons to stack vertically if there
is not enough room for the buttons to be side by side. The button
text in Ukranian is too long for the buttons to be side by side.

BUG=821051

Change-Id: I87fa04dc36f7efe74967723f5bc09f54c1caf8ec
Reviewed-on: https://chromium-review.googlesource.com/974294
Commit-Queue: Peter Kotwicz <pkotwicz@chromium.org>
Reviewed-by: Yusuf Ozuysal <yusufo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#545840}

The test NonBlockingEventBrowserTest is an overloaded term. The test actually blocks
the Renderer's Main Thread, via its own javascript event handlers. It does this
 in order to verify the compositor sending an INPUT_EVENT_ACK_STATE_SET_NON_BLOCKING.
As well as to force scrolling to be handled by the Compositor on the Impl thread.

This name is confusing, and makes debugging difficult. Especially as some test
utils rely on sending IPC::Messages to the Renderer from the Browser. These IPCs
are recieved by the Main thread. If that thread is blocked the testing utils
never get processed.

TEST=CompositorEventAckBrowserTest

Change-Id: Id498be917400373830b3661045f75bcdc29f26ae
Reviewed-on: https://chromium-review.googlesource.com/978789
Commit-Queue: Jonathan Ross <jonross@chromium.org>
Reviewed-by: Dave Tapuska <dtapuska@chromium.org>
Cr-Commit-Position: refs/heads/master@{#545839}

The scrim needs to obscure different views depending on which view
triggered it. In the case of the bottom sheet it needs to cover the
top toolbar, but it shouldn't cover the toolbar when the omnibox is
focused.

This change temporarily moved the scrim in the view hierarchy while
the bottom sheet is open so that it covers the top toolbar. When the
sheet is closed, it is moved back to its original position.

BUG=824432

Change-Id: Ic7e462b09aeb02eae51c725dc811eaf66f2d1c6f
Reviewed-on: https://chromium-review.googlesource.com/973889
Commit-Queue: Matthew Jones <mdjones@chromium.org>
Reviewed-by: Ted Choc <tedchoc@chromium.org>
Reviewed-by: Theresa <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#545838}

BUG=internal b/76197553

Change-Id: Ib8e564a8503b1a4941222c6e59584d632ba96264
Reviewed-on: https://chromium-review.googlesource.com/979292
Commit-Queue: Mike Klein <mtklein@chromium.org>
Reviewed-by: Florin Malita <fmalita@chromium.org>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Cr-Commit-Position: refs/heads/master@{#545837}

ResourceDispatcherHost pushes pending load state of all frames to the UI
thread once every 250 milliseconds when there's a pending load.  This
happens even when the UI thread is blocked.  Apparently it's causing an
OOM when the UI thread is blocked.  Whatever is blocking the UI thread
is another issue entirely, but we shouldn't use unbounded memory in the
browser process.  This CL prevents load state updates from being sent
until the previous set was ACKed by the UI thread.

This is a reland of https://chromium-review.googlesource.com/978383,
which was reverted in https://chromium-review.googlesource.com/979674
for causing crashes after the RDH was shut down (Which should now be
fixed).

Bug: 824869
Change-Id: I84e594baefa6b246898e7df77abddaaa1a66fa0c
TBR: jam@chromium.org
Reviewed-on: https://chromium-review.googlesource.com/980593
Commit-Queue: Matt Menke <mmenke@chromium.org>
Reviewed-by: Charlie Harrison <csharrison@chromium.org>
Cr-Commit-Position: refs/heads/master@{#545836}

The weekend canary branching failed, so it needs to be manually brought back in
sync for another run.

R=govind@google.com

Bug: 825555
Change-Id: Ifedb6c4a72bd58e3da9d855375a7563df343b52d
Reviewed-on: https://chromium-review.googlesource.com/981113Reviewed-by: Krishna Govind <govind@chromium.org>
Cr-Commit-Position: refs/heads/master@{#545835}

https://w3c.github.io/webauthn/#sec-assertion-privacy says that we
should be careful that sites can't probe information about
authenticators.

In this case the user has touched an authenticator for a registration
but denied consent to supply direct attestation information. Currently
we let the registration timeout. But with this change we'll return an
error to the site immediately.

Change-Id: Icccbdb4f3b56824d2ea5114e7edae4db988f36f9
Reviewed-on: https://chromium-review.googlesource.com/978951Reviewed-by: Balazs Engedy <engedy@chromium.org>
Commit-Queue: Adam Langley <agl@chromium.org>
Cr-Commit-Position: refs/heads/master@{#545834}

Bug: 734095
Change-Id: I936ce7cba93d5c0d3a895c287325167bb6b8f754
Reviewed-on: https://chromium-review.googlesource.com/978588Reviewed-by: Finnur Thorarinsson <finnur@chromium.org>
Commit-Queue: Xi Cheng <chengx@chromium.org>
Cr-Commit-Position: refs/heads/master@{#545833}