GitLab

when decoding invalid UTF strings in chromedriver.

Web platform tests use ECMAScript strings which
aren't necessarily utf-16 characters.
This change will help us deal with that case.

More info: 
https://bugs.chromium.org/p/chromium/issues/detail?id=723592

To reproduce the error message from above, run:

./wptrun chrome url/url-constructor.html

on web platform tests.

Bug: 723592
Change-Id: Icf4b7de968ace81abba9f3020b9c123ab0791318
Reviewed-on: https://chromium-review.googlesource.com/565461
Commit-Queue: Jonathon Kereliuk <kereliuk@chromium.org>
Reviewed-by: John Budorick <jbudorick@chromium.org>
Reviewed-by: Robert Sesek <rsesek@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#487152}

https://chromium.googlesource.com/chromium/src/third_party/freetype2.git/+log/cf8d9b4ce3fa..38bdf22bfe68

$ git log cf8d9b4ce..38bdf22bf --date=short --no-merges --format='%ad %ae %s'
2017-07-13 wl [truetype] Improve code comment.
2017-07-13 wl [base] Fix memory leak.
2017-07-12 wl [base] Integer overflow.
2017-07-12 wl Document how to scale manually.
2017-07-12 wl CHANGES: Add information on global metrics rounding.
2017-07-12 wl * src/truetype/ttpload.c (tt_face_get_location): Off-by-one typo.
2017-07-11 htl10 Changelog: typo, chromium issue id is 2276 instead of 2278
2017-07-07 wl [cff] Integer overflow.
2017-07-06 apodtele Tweak suggested use of `lsb_delta' and `rsb_delta'.

Created with:
  roll-dep src/third_party/freetype/src
R=wangxianzhu@chromium.org,michaelbai@chromium.org,bungeman@chromium.org,drott@chromium.org

BUG=https://bugs.chromium.org/p/pdfium/issues/detail?id=812

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

In this CL:

 - Remove expectations for tests that are actually passing.
 - Sort recently-added lines.

Change-Id: Idaabc01aef52789a062214aaff6569b8f54ed27b
Reviewed-on: https://chromium-review.googlesource.com/572261Reviewed-by: Jeff Carpenter <jeffcarp@chromium.org>
Commit-Queue: Quinten Yearsley <qyearsley@chromium.org>
Cr-Commit-Position: refs/heads/master@{#487150}

The set of valid FrameSinkIds is a concept used for SurfaceSequences
which are deprecated. We cannot remove SurfaceSequence code just yet
but GetValidFrameSinkIds is a publicly exposed method that is used
by FrameSinkManager for some DCHECKs. These DCHECKs are not really
necessary and removing them allows us to delete a public method
in SurfaceManager, simplifying its interface.

Bug: 722935
TBR: piman@chromium.org
Change-Id: I220a591d26e5bcd366eaa9a24404179f7439f49c
Reviewed-on: https://chromium-review.googlesource.com/574575
Commit-Queue: Fady Samuel <fsamuel@chromium.org>
Reviewed-by: Saman Sami <samans@chromium.org>
Cr-Commit-Position: refs/heads/master@{#487149}

https://chromium.googlesource.com/external/github.com/catapult-project/catapult.git/+log/af47a939971b..6e3bfad0debc

$ git log af47a9399..6e3bfad0d --date=short --no-merges --format='%ad %ae %s'
2017-07-17 ashleymarie Fixing a line break

Created with:
  roll-dep src/third_party/catapult
BUG=717394


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.chromium.android:android_optional_gpu_tests_rel
TBR=sullivan@chromium.org

Change-Id: I6002720bd981d8cd871563762578a3eab5e3ddc3
Reviewed-on: https://chromium-review.googlesource.com/574747
Reviewed-by: <catapult-deps-roller@chromium.org>
Commit-Queue: <catapult-deps-roller@chromium.org>
Cr-Commit-Position: refs/heads/master@{#487148}

Summary of changes available at:
https://chromium.googlesource.com/v8/v8/+log/c6e2620a..2937ab85

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;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=hablich@chromium.org,machenbach@chromium.org,kozyatinskiy@chromium.org

Change-Id: If5938caf262e2da6c0e3831a9b30f2f338172fa3
Reviewed-on: https://chromium-review.googlesource.com/574653Reviewed-by: v8 autoroll <v8-autoroll@chromium.org>
Commit-Queue: v8 autoroll <v8-autoroll@chromium.org>
Cr-Commit-Position: refs/heads/master@{#487147}

This CL migrates ArcPolicyBridge.

BUG=672829
TEST=Ran try.

Change-Id: Ie649513dede52ff28c0eb54713b1e29cc2e37857
Reviewed-on: https://chromium-review.googlesource.com/572483
Commit-Queue: Hidehiko Abe <hidehiko@chromium.org>
Reviewed-by: Luis Hector Chavez <lhchavez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#487146}

Bug: 602666
Change-Id: I37f55fd5405456125824b8c4a798fbd8969a5bcb
Reviewed-on: https://chromium-review.googlesource.com/570824
Commit-Queue: mahmadi <mahmadi@chromium.org>
Reviewed-by: Mathieu Perreault <mathp@chromium.org>
Cr-Commit-Position: refs/heads/master@{#487145}

Bug: 661774
Change-Id: I7af30f80306fc506ab3b0b0b3eeed5b79fbbd845
Reviewed-on: https://chromium-review.googlesource.com/574632
Commit-Queue: Fernando Serboncini <fserb@chromium.org>
Reviewed-by: Fernando Serboncini <fserb@chromium.org>
Reviewed-by: Justin Novosad <junov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#487144}

Switch to CheckForFirstPartyApps() instead of
GetNativeAppWhitelistManager().

Since this is the last use of the latter, it is removed from
ChromeBrowserProvider API as well.

Note that this depends on
https://chromereviews.googleplex.com/602627013/

Bug: 742617
Change-Id: I2df0461cdcc42b9729e7ae646b0a2fc26557133c
Reviewed-on: https://chromium-review.googlesource.com/570810Reviewed-by: Rohit Rao <rohitrao@chromium.org>
Commit-Queue: Peter Lee <pkl@chromium.org>
Cr-Commit-Position: refs/heads/master@{#487143}

An upload for sign-in form comes from Password Manager and password value is not set. Without this patch profile.GetMatchingTypes adds EMPTY type in |matching_types| that is not correct and moreover it causes DCHECK failure in https://cs.chromium.org/chromium/src/components/autofill/core/browser/autofill_metrics.cc?q=autofill_metrics.cc&sq=package:chromium&dr&l=335 and in other places.   

Bug: 742464
Change-Id: Iece3caa40337c15828ab76fcb2ff3e68e659599d
Reviewed-on: https://chromium-review.googlesource.com/570167
Commit-Queue: Vadym Doroshenko <dvadym@chromium.org>
Reviewed-by: Roger McFarlane <rogerm@chromium.org>
Cr-Commit-Position: refs/heads/master@{#487142}

Removes content::BrowserThread::FILE usage in favor of TaskScheduler
interfaces.

Bug: 689520
Change-Id: Icd77c188320f57e4b8a1810c55bb6172d3093ae1
Reviewed-on: https://chromium-review.googlesource.com/567418Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tommy Li <tommycli@chromium.org>
Cr-Commit-Position: refs/heads/master@{#487141}

Both FrameFetchContextTest and MixedContentCheckerTest deckare a class
named MockLocalFrameClient. That is normally no big deal
but in jumbo builds they can be compiled in the same translation unit
and then the functions will collide. This patch adds a prefix to
the class names to make them more unique.

R=fs@opera.com

Change-Id: I215f7edafa2fa0b229dc5847a1e158df825e8c27
Reviewed-on: https://chromium-review.googlesource.com/574708Reviewed-by: Fredrik Söderquist <fs@opera.com>
Commit-Queue: Daniel Bratell <bratell@opera.com>
Cr-Commit-Position: refs/heads/master@{#487140}

It is used only by CompositorFrameSinkSupport so I'm moving it to
components/viz/service/frame_sinks where CompositorFrameSinkSupport is.
This CL also updates all includes, forward declarations and namespaces
as appropriate.

TBR=piman@chromium.org

Bug: 722935
Change-Id: Ibd3548c8a2aada8346c48e7a58b8fd9b35d63c16
Reviewed-on: https://chromium-review.googlesource.com/572589Reviewed-by: Robert Kroeger <rjkroege@chromium.org>
Commit-Queue: Fady Samuel <fsamuel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#487139}

Bug: 
Change-Id: I2d45ac2eafaf6c838056e6070b4830f05a25f1cc
Reviewed-on: https://chromium-review.googlesource.com/569846Reviewed-by: calamity <calamity@chromium.org>
Commit-Queue: Sky Malice <skym@chromium.org>
Cr-Commit-Position: refs/heads/master@{#487138}

Bug: 732792
TEST: views_unittests --gtest_filter=*InkDrop*
Change-Id: I44fa192b3c47a611dedf9978f12aed130b871f69
Reviewed-on: https://chromium-review.googlesource.com/558513
Commit-Queue: Ben Ruthig <bruthig@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#487137}

By default the view pager only keeps one page to either
side of the current page, which results in the FRE pages
being regenerated.  This causes the search promo to become
invalid as it has been shown and the user successfully choose
an option.  As a two step mitigation, we up the number of pages
kept to be able to support the current FRE.  Then we also add
additional logic that will just skip the page if it is somehow
able to get into the invalid state again.

BUG=740897

Change-Id: I889900ce20d06248ca95765c54dbc84a60be4f5e
Reviewed-on: https://chromium-review.googlesource.com/567420Reviewed-by: Yusuf Ozuysal <yusufo@chromium.org>
Commit-Queue: Ted Choc <tedchoc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#487136}

Normally when grit actions are defined during `gn gen`, we don't
include all of the files that the .grd file depends on as inputs,
because we don't need to; grit generates a .d file for dependencies
so that rebuilds will happen correctly. And, computing the 
dependencies is slow (it's equivalent to calling grit).

However, if we don't include the dependencies in the gn build graph,
then `analyze` doesn't know about them, and hence a change to a file
that grit dependencies on will be ignored.

This CL changes things such that when `gn gen` is being run as part
of the `analyze` step, we do set the extra flag to compute the
dependencies. This'll slow GN down, but that's better than 
misreporting dependencies.

In some cases, the .grd files try to include generated files
(which may not exist at GN time). To work around this, you can
mark the grit targets as `source_is_generated = true`; the
downside of that is that that target will be skipped just as if
compute_grit_inputs_for_analyze=False, however, this is still an
improvement over not checking *any* of the grit targets. A better
fix would be to have grit_info ignore any paths in the generated
directory if they don't exist, and I'll try to do that in a 
follow-up patch.

R=brettw@chromium.org
BUG=639328

Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: I9f6702b06f8a41a159e4599bf192db0abf9e77eb
Reviewed-on: https://chromium-review.googlesource.com/545150
Commit-Queue: Dirk Pranke <dpranke@chromium.org>
Reviewed-by: Brett Wilson <brettw@chromium.org>
Cr-Commit-Position: refs/heads/master@{#487135}

Added the Safe Browsing Preferences as part of the chrome://safe-browsing page.
Added the respective webui messages/functions.

Bug: 734667
Change-Id: I481a9c930ed1859c2a93ff32670e009fb148ae02
Reviewed-on: https://chromium-review.googlesource.com/566383
Commit-Queue: Kamila Hasanbega <hkamila@google.com>
Reviewed-by: Jialiu Lin <jialiul@chromium.org>
Reviewed-by: Varun Khaneja <vakh@chromium.org>
Reviewed-by: Dominic Battré <battre@chromium.org>
Cr-Commit-Position: refs/heads/master@{#487134}

Add posted_from metadata when enqueuing event for more precise
attribution and easier debugging.

R=haraken@chromium.org

Change-Id: Ib1180d1ea87595159b0fb8aade9a03eae5ffde6d
Reviewed-on: https://chromium-review.googlesource.com/574602Reviewed-by: Kentaro Hara <haraken@chromium.org>
Commit-Queue: Alexander Timin <altimin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#487133}

Need a board name for Widevine's CDM.

BUG=internal 62721854
TEST=

Change-Id: I79850985dd11f29dc60f911f7bb5070d47e8efa5
Reviewed-on: https://chromium-review.googlesource.com/572225
Commit-Queue: Thoren Paulson <thoren@chromium.org>
Reviewed-by: Luke Halliwell <halliwell@chromium.org>
Cr-Commit-Position: refs/heads/master@{#487132}

Adds two VR instrumentation tests to check that pressing the Daydream
controller's "app" button causes the browser to exit WebVR presentation
and fullscreen.

Bug: 742569, 728779
Change-Id: I11b92d876875e6224b30b0d5eab498786f698fbf
Reviewed-on: https://chromium-review.googlesource.com/571387Reviewed-by: Michael Thiessen <mthiesse@chromium.org>
Commit-Queue: Brian Sheedy <bsheedy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#487131}

Should use Cast EME with PlayReady or Widevine+CMA.

BUG=internal 62721854
TEST=

Change-Id: Ide4de9e3dea6a1286415569bff68147caeb1cdc6
Reviewed-on: https://chromium-review.googlesource.com/570981Reviewed-by: Luke Halliwell <halliwell@chromium.org>
Reviewed-by: Stephen Lanham <slan@chromium.org>
Commit-Queue: Thoren Paulson <thoren@chromium.org>
Cr-Commit-Position: refs/heads/master@{#487130}

This reverts commit 95ebf5a5.

Reason for revert: Weekend is over, and the tot bots are red while this is in (https://crbug.com/727447)

Original change's description:
> Test changing default Windows compiler to VS2017
> 
> Doing another VS2017 test over the week end now with the newly packaged
> VS 2017 Update 3 Preview 4 (was Preview 2 last time).
> 
> This CL is currently purely for testing purposes and will be reverted by
> the end of the weekend.
> 
> R=​dpranke@chromium.org
> BUG=683729
> 
> Change-Id: Ie5c2e92b789b1dcbd51d4e0028230b5b72ce9eb9
> Reviewed-on: https://chromium-review.googlesource.com/572500
> Reviewed-by: Dirk Pranke <dpranke@chromium.org>
> Commit-Queue: Bruce Dawson <brucedawson@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#486999}

TBR=dpranke@chromium.org,brucedawson@chromium.org

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

Bug: 683729
Change-Id: I95eba007031776caacf6595485ecc47d131def45
Reviewed-on: https://chromium-review.googlesource.com/574434Reviewed-by: Nico Weber <thakis@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#487129}

BUG=b:35624617
TEST=build and flash locally, saw the new animation

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

https://pdfium.googlesource.com/pdfium.git/+log/f768baf129fc..185312303814

$ git log f768baf12..185312303 --date=short --no-merges --format='%ad %ae %s'
2017-07-14 npm Simplify CJBig2_Context::huffman_assign_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: Ifce70100befc5ba275a7347dfb2fa84ec2b8d0a4
Reviewed-on: https://chromium-review.googlesource.com/574671
Reviewed-by: <pdfium-deps-roller@chromium.org>
Commit-Queue: <pdfium-deps-roller@chromium.org>
Cr-Commit-Position: refs/heads/master@{#487127}

Make renderer scheduler aware of a completed task. This will enable
us to record per-task metrics.

R=alexclarke@chromium.org
BUG=702318

Change-Id: Iaff9ca2c8f8398847c854dfc569db90176cdb7c6
Reviewed-on: https://chromium-review.googlesource.com/574538Reviewed-by: Alex Clarke <alexclarke@chromium.org>
Commit-Queue: Alexander Timin <altimin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#487126}

This updates the Settings layout to match the new UX design.
(New images will be introduced in a followup, behind a flag)

Bug: 730031
Change-Id: I023e58aca969eb2aaa9ccbf5f7ad4a787c5c3fff
Reviewed-on: https://chromium-review.googlesource.com/571309
Commit-Queue: Steven Bennetts <stevenjb@chromium.org>
Reviewed-by: Tommy Li <tommycli@chromium.org>
Cr-Commit-Position: refs/heads/master@{#487125}

Bug: 642059
Change-Id: I249936e2a03a47f1533ce0e3fea040680a32f4f3
Reviewed-on: https://chromium-review.googlesource.com/568797Reviewed-by: Tommy Li <tommycli@chromium.org>
Commit-Queue: Owen Min <zmin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#487124}

One side effect of this is that we will begin collecting data on API usage
from views (on the APIs we've migrated to platform node).

BUG=703369

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

ElementVisibilityObserverTest, HTMLMediaElementEventListenersTest and
VideoPainterTest all use a local StubLocalFrameClient class for
testing. That is normally no big deal but in jumbo builds they
can be compiled in the same translation unit and then the classes
will collide. This patch gives the classes unique prefixes.

R=fs@opera.com

Change-Id: I47c7088486456e22ca776419a836f4e5d18be39c
Reviewed-on: https://chromium-review.googlesource.com/574605Reviewed-by: Fredrik Söderquist <fs@opera.com>
Commit-Queue: Daniel Bratell <bratell@opera.com>
Cr-Commit-Position: refs/heads/master@{#487122}

Adding match_in_subdomain and match_after_host to support Omnibox UI
experiments.

We have UI experiments that elide parts of the subdomain and the path,
query, and ref. These shouldn't be elided if they are part of the
match to the user-typed terms.

This CL has no immediate effect, but adds the match_in_subdomain and
match_after_host fields to be later integrated into the Omnibox UI
experiments.

Bug: 732582
Change-Id: I870d0192eabeae17c79f842bb51928646a3c504e
Reviewed-on: https://chromium-review.googlesource.com/568636Reviewed-by: Justin Donnelly <jdonnelly@chromium.org>
Reviewed-by: Sylvain Defresne <sdefresne@chromium.org>
Commit-Queue: Tommy Li <tommycli@chromium.org>
Cr-Commit-Position: refs/heads/master@{#487121}

Previously, omnibox suggestions could be scrolled down, but when
scrolling back up, the bottom sheet would intercept the scroll and
defocus the omnibox. This change adds a special case to the bottom
sheet event handler. If the suggestions are showing and scrolled
any amount, the sheet will not take the scroll event (unless it is
in the toolbar area). This allows the suggestions to be freely
scrolled and only when they reach the top can the sheet be pulled
down.

BUG=735319

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

Moved the rarely used Blend() overload to a new file ColorBlend.h,
since it requires heavy stuff to be included.

This change caused Image.h to lose its inclusion of FloatSize.h. Removed the
default value from a FloatSize parameter.

Change-Id: I9b32e425c86b237b4c3a69ec53e601faa713f56f
Reviewed-on: https://chromium-review.googlesource.com/553139
Commit-Queue: Morten Stenshorne <mstensho@opera.com>
Reviewed-by: Philip Rogers <pdr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#487119}

With all the media controls code moved the modules, there is no need to
cast from the MediaControls interface to the its modules' implementation.
The few remaining static_cast<> are from code calling the GetMediaControls()
method defined on the HTMLMediaElement.

Bug: 662761
Change-Id: Ic72baca68f1c54d6117ea47efdf9a808b3d02aea
Reviewed-on: https://chromium-review.googlesource.com/571820Reviewed-by: Jennifer Apacible <apacible@chromium.org>
Commit-Queue: Mounir Lamouri <mlamouri@chromium.org>
Cr-Commit-Position: refs/heads/master@{#487118}

This CL migrates ArcImeService.

BUG=672829
TEST=Ran try.

Change-Id: I88a3e2bcf2e5ffa4ba2cb4a96a9c1dbcf26ab0ec
Reviewed-on: https://chromium-review.googlesource.com/572470
Commit-Queue: Hidehiko Abe <hidehiko@chromium.org>
Reviewed-by: Luis Hector Chavez <lhchavez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#487117}

This should let us confirm our URL behavior on NTP and friends.
It also provides a convenient place to do more testing of
native UI in VR.

Bug: 738583
Change-Id: I983016bdcef62ab83e0265929e7b00230a1a661f
Reviewed-on: https://chromium-review.googlesource.com/571948
Commit-Queue: Ian Vollick <vollick@chromium.org>
Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
Reviewed-by: Tibor Goldschwendt <tiborg@chromium.org>
Reviewed-by: Michael Thiessen <mthiesse@chromium.org>
Cr-Commit-Position: refs/heads/master@{#487116}

SurfaceIds are large and so they should always be passed by const-ref.

Bug: none
Change-Id: I0836c43fe782ac925a070e650a9a1680afa6a2d8
Reviewed-on: https://chromium-review.googlesource.com/574649Reviewed-by: Robert Kroeger <rjkroege@chromium.org>
Commit-Queue: Fady Samuel <fsamuel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#487115}

It is fairly common to have a help struct with test data and a fair
portion of the code call that struct TestCase and put it in a fairly
global namespace. In jumbo builds those structs will collide so this
patch renames them to more specific names such as
MediaQuerySetTestCase or SizesCalcTestCase.

R=fs@opera.com

Change-Id: Ic02ef5062782a0ec3862ad3bffdc462574ca8a61
Reviewed-on: https://chromium-review.googlesource.com/574600Reviewed-by: Fredrik Söderquist <fs@opera.com>
Commit-Queue: Daniel Bratell <bratell@opera.com>
Cr-Commit-Position: refs/heads/master@{#487114}

This fixes the flake.

BUG=740207

Change-Id: I68fd807c8bb9effc1c0e9e15e744146c4b1f15c0
Reviewed-on: https://chromium-review.googlesource.com/574571Reviewed-by: Misha Efimov <mef@chromium.org>
Commit-Queue: Miriam Gershenson <mgersh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#487113}