GitLab

This reverts commit 6c1f5306.

Reason for revert:
Speculative revert for build failures on the Mac bot
https://build.chromium.org/p/chromium/builders/Mac/builds/33456

Original change's description:
> egl: Use khronos version of __APPLE__ section in eglplatform.h
> 
> Bug: 769415
> Change-Id: I8e16a2a35286144eaa2d97b4d5f7cf239a00a8e5
> Reviewed-on: https://chromium-review.googlesource.com/703739
> Reviewed-by: Corentin Wallez <cwallez@chromium.org>
> Reviewed-by: Kenneth Russell <kbr@chromium.org>
> Commit-Queue: Brian Anderson <brianderson@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#506957}

TBR=brianderson@chromium.org,kbr@chromium.org,cwallez@chromium.org

Change-Id: Ia96b247a9080be24a8c53dca6a7033aed43eb40f
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 769415
Reviewed-on: https://chromium-review.googlesource.com/704334Reviewed-by: Hiroki Nakagawa <nhiroki@chromium.org>
Commit-Queue: Hiroki Nakagawa <nhiroki@chromium.org>
Cr-Commit-Position: refs/heads/master@{#506958}

Bug: 769415
Change-Id: I8e16a2a35286144eaa2d97b4d5f7cf239a00a8e5
Reviewed-on: https://chromium-review.googlesource.com/703739Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Commit-Queue: Brian Anderson <brianderson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#506957}

Our PM wants to make the font color of the non-selected language
finch-able to figure out a path forward with making the font darker.
Group 1 will be the default color and group 2 will be the 87% black.

I created the params with our feature TranslateCompactUI and tested by
'--force-fieldtrials=TranslateCompactUI/Enabled --force-fieldtrial-params
=TranslateCompactUI.Enabled:translate_tab_default_text_color/1'

Bug: 771835
Change-Id: I0d2d4eea3707685b45b83e5d7d4079fa855deecd
Reviewed-on: https://chromium-review.googlesource.com/701994Reviewed-by: Matthew Jones <mdjones@chromium.org>
Commit-Queue: Leo Zhang <googleo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#506956}

In this case, we don't want to serve a preview.

Bug: 772175
Change-Id: I320d6ad26cb7cf51dba9797447e388816115df91
Reviewed-on: https://chromium-review.googlesource.com/703859Reviewed-by: Scott Little <sclittle@chromium.org>
Commit-Queue: Ryan Sturm <ryansturm@chromium.org>
Cr-Commit-Position: refs/heads/master@{#506955}

Bug: 769415
Test: Trace events that use this extension look good.
Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_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
Change-Id: I3f051d4f86894f9029774e73b1327262c514fd53
Reviewed-on: https://chromium-review.googlesource.com/685402
Commit-Queue: Brian Anderson <brianderson@chromium.org>
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#506954}

TBR=wjmaclean

Bug: 772196
Change-Id: I4ea0411a8ab5a5e88ac1098cabe4103a0761ceb0
Reviewed-on: https://chromium-review.googlesource.com/703860Reviewed-by: Quinten Yearsley <qyearsley@chromium.org>
Commit-Queue: Hiroki Nakagawa <nhiroki@chromium.org>
Cr-Commit-Position: refs/heads/master@{#506953}

This should increase coverage by allowing the fuzz to produce test
cases in quirks mode too. HTMLQuirksMode has it's own issues in our
code base and getting fuzzer to run these tests would be great.

Change-Id: I0ea188d480d7bc605e0ddf62b665ba88ffde9b45
Reviewed-on: https://chromium-review.googlesource.com/701855Reviewed-by: Max Moroz <mmoroz@chromium.org>
Reviewed-by: Darren Shen <shend@chromium.org>
Commit-Queue: nainar <nainar@chromium.org>
Cr-Commit-Position: refs/heads/master@{#506952}

for snake_case.

Bug: 770603
Change-Id: Id07cbd58c190cac0ccbc9fcbf92747d83705be64
Reviewed-on: https://chromium-review.googlesource.com/701879Reviewed-by: Hitoshi Yoshida <peria@chromium.org>
Commit-Queue: Kent Tamura <tkent@chromium.org>
Cr-Commit-Position: refs/heads/master@{#506951}

for snake_case.

Bug: 770603
Change-Id: Ic158606ea9eb5f6cdf78e1fed72fefaa3ec613c5
Reviewed-on: https://chromium-review.googlesource.com/702200Reviewed-by: Hitoshi Yoshida <peria@chromium.org>
Commit-Queue: Kent Tamura <tkent@chromium.org>
Cr-Commit-Position: refs/heads/master@{#506950}

This patch removes obsolete values from InfoBarIdentifier, and labels
all removed values with "(Obsolete)" in enums.xml so it's more obvious
when looking at UMA data.

Change-Id: I4f463462d52954066a5ce38726d4694ed0f2f924
Reviewed-on: https://chromium-review.googlesource.com/702177Reviewed-by: Evan Stade <estade@chromium.org>
Reviewed-by: Ilya Sherman <isherman@chromium.org>
Commit-Queue: Timothy Loh <timloh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#506949}

Bug: 737802
Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_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
Change-Id: I19a1edacd4cda27c06f4df631bea9a0b2f9e6a2c
Reviewed-on: https://chromium-review.googlesource.com/690626
Commit-Queue: Sergey Ulanov <sergeyu@chromium.org>
Reviewed-by: Dale Curtis <dalecurtis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#506948}

IsErrored() and HasInstantiated() are to be removed because they are
removed from the HTML spec in
https://github.com/whatwg/html/pull/2991.

This CL
- Replaces IsErrored() calls in unit tests with checks for Instantiate()
  results or with HasEmptyRecord(), depending on whether instantiation errors
  or parse errors are tested, and
- Removes EXPECT_FALSE(HasInstantiated()) from ModuleMapTest.cpp, because
  instantiation is already prohibited by NOTREACHED() in
  DummyModulator::InstantiateModule().

Bug: 763597
Change-Id: I272a03f3d5ce8ddf6ea645a3d0d1a1ae7543f2be
Reviewed-on: https://chromium-review.googlesource.com/703483Reviewed-by: Kouhei Ueno <kouhei@chromium.org>
Commit-Queue: Kouhei Ueno <kouhei@chromium.org>
Cr-Commit-Position: refs/heads/master@{#506947}

Right now the MakeSubset and MakeStatic are the only mutating PaintImage
functions. This patch moves those to the PaintImageBuilder and allows
users to use either the full copy or just the properties of a given
PaintImage. This also makes it simpler to add mutations to the PaintImage
via the builder if no builder is initially available.

R=khushalsagar@chromium.org, chrishtr@chromium.org
TBR=dalecurtis@chromium.org

Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel
Change-Id: Ic766cef20e77dcd3b34fc5abc9373177e5b94eba
Reviewed-on: https://chromium-review.googlesource.com/702646
Commit-Queue: vmpstr <vmpstr@chromium.org>
Reviewed-by: Antoine Labour <piman@chromium.org>
Reviewed-by: Chris Harrelson <chrishtr@chromium.org>
Reviewed-by: danakj <danakj@chromium.org>
Reviewed-by: Khushal <khushalsagar@chromium.org>
Cr-Commit-Position: refs/heads/master@{#506946}

This patch gets rid of redundant argument |VP_DEFAULT_AFFINITY| for
|CreateVisiblePosition()| for improving code health.

This patch is a preparation of renaming |VP_DEFAULT_AFFINITY| to
|TextAffinity::kDefault|.

Bug: 657237
Change-Id: I16e8af4d874afc5059c09f2401cb1f1dc9c98f67
Reviewed-on: https://chromium-review.googlesource.com/701902Reviewed-by: Xiaocheng Hu <xiaochengh@chromium.org>
Commit-Queue: Yoshifumi Inoue <yosin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#506945}

This patch makes |LayoutSelectionTest.CommitAppearanceIfNeededNotCrash| simpler
for improving code health.

Change-Id: I3f0c930c31870968432c326207ec930a15eecbb1
Reviewed-on: https://chromium-review.googlesource.com/702118Reviewed-by: Yoichi Osato <yoichio@chromium.org>
Commit-Queue: Yoshifumi Inoue <yosin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#506944}

This patch gets rid of unused parameter |TextAffinity| from
|TrailingWhitespacePosition()| for improving code health.

This patch is a preparation of renaming |VP_DEFAULT_AFFINITY| to
|TextAffinity::kDefault|.

Bug: 657237
Change-Id: I0c354cbbbe09afc757d23c23db0c8df244c6b09a
Reviewed-on: https://chromium-review.googlesource.com/701904Reviewed-by: Xiaocheng Hu <xiaochengh@chromium.org>
Commit-Queue: Yoshifumi Inoue <yosin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#506943}

changes:
(1) Since |tablet_controller_| is created OnAccelerometerUpdate, itself
is enough to represent ShouldHandlePowerButtonEvents().
(2) Remove IsTabletModeSupported() in PowerButtonDisplayController. It
is used on stylus removed. Nowadays, stylus is configured on convertible
only. Even for clamshell device with stylus, SetDisplayForcedOff(false)
should be OK since it will be a no-op because of early return.

TEST=covered by tests

Bug: none
Change-Id: I0dd883d9bf97e1c24c1b9acd5e1856b630f97fec
Reviewed-on: https://chromium-review.googlesource.com/702919Reviewed-by: Dan Erat <derat@chromium.org>
Commit-Queue: Qiang(Joe) Xu <warx@chromium.org>
Cr-Commit-Position: refs/heads/master@{#506942}

Previously the FeatureState was recorded as Tether was being
destroyed. However, this was failing to reach the metrics 
dashboard, likely because there are no guarantees that the
metrics pipeline can persist a log when the machine is 
shutting down. There's no need to do this recording at tear 
down, so this CL simply moves when the call is made. 

Bug: 772078
Change-Id: Ib002fb41ae1c5df814fc9cefc6772c1141df8307
Reviewed-on: https://chromium-review.googlesource.com/703915Reviewed-by: Steven Holte <holte@chromium.org>
Reviewed-by: Jeremy Klein <jlklein@chromium.org>
Commit-Queue: Jeremy Klein <jlklein@chromium.org>
Cr-Commit-Position: refs/heads/master@{#506941}

This is a follow-up to https://chromium-review.googlesource.com/c/chromium/src/+/692554
which disabled extension content verification from tests inheriting from
ExtensionBrowserTest. For pref hash browsertests, there seems to be a time window 
between the PRE_ tests and their normal counterpart during which which extension
content verification is enabled. During this time window, the good.crx extension
installed by PrefHashBrowserTestUnchangedCustom is disabled.

This should fix the failures described in
https://bugs.chromium.org/p/chromium/issues/detail?id=770001#c8 and allow
us to re-land https://chromium-review.googlesource.com/c/chromium/src/+/698985

Bug: 766806
Change-Id: I261eaef5eae9cf192a6f514092c3b5ad4feafc8e
Reviewed-on: https://chromium-review.googlesource.com/703508Reviewed-by: Devlin <rdevlin.cronin@chromium.org>
Commit-Queue: proberge <proberge@chromium.org>
Cr-Commit-Position: refs/heads/master@{#506940}

When SetLoFiModeActiveOnMainFrame is called with false it takes no
action. This patch replaces this method with SetLoFiUsedThisSession
which unconditionally performs the action taken when this method was
called with true and removes all instances where it was called with
false.

Bug: None
Change-Id: Ic3e624ea2e74a1a01f9be4d4efb825f52f5558ed
Reviewed-on: https://chromium-review.googlesource.com/704016Reviewed-by: Scott Little <sclittle@chromium.org>
Commit-Queue: Reilly Grant <reillyg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#506939}

The experiment value obtained from the field trial will be sent in a
custom header X-Offline-Prefetch-Experiment in all requests sent to
the Offline Prefetch Server. This value will help the server decide
how to process the request.

Bug: 701939
Change-Id: I94366d6162dffcaf3988f4cb1d042c3f3d2db265
Reviewed-on: https://chromium-review.googlesource.com/699736
Commit-Queue: Jian Li <jianli@chromium.org>
Reviewed-by: Justin DeWitt <dewittj@chromium.org>
Cr-Commit-Position: refs/heads/master@{#506938}

This reverts commit 95ae7232.

Reason for revert: Breaking windows compile, e.g. https://build.chromium.org/p/chromium/builders/Win/builds/59641

Original change's description:
> Make CQ run vr_common_unittests on Windows
> 
> There were a few clang-specific C++ extensions in use, and some warnings that hit only on MSVC.
> gltf tests had to be disabled because url->path parsing is not correct on Windows.
> 
> BUG=744675
> 
> Change-Id: Ica976477da4b5009a68d738e71ee995af871d1f7
> Reviewed-on: https://chromium-review.googlesource.com/695807
> Commit-Queue: Bill Orr <billorr@chromium.org>
> Reviewed-by: Jochen Eisinger <jochen@chromium.org>
> Reviewed-by: Christopher Grant <cjgrant@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#506866}

TBR=cjgrant@chromium.org,bsheedy@chromium.org,billorr@google.com,jochen@chromium.org,billorr@chromium.org

Change-Id: I0047a3d865fc7ee4eadc9bbaf1ff5942366daa53
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 744675
Reviewed-on: https://chromium-review.googlesource.com/704056Reviewed-by: Ken Rockot <rockot@chromium.org>
Commit-Queue: Ken Rockot <rockot@chromium.org>
Cr-Commit-Position: refs/heads/master@{#506937}

BUG=728223

Change-Id: I4241852401000b5d68b9547dbd23a3d405838020
Reviewed-on: https://chromium-review.googlesource.com/701324
Commit-Queue: Ke He <ke.he@intel.com>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Reilly Grant <reillyg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#506936}

This is a preparation CL for SPv175 raster invalidation which will use
CompositedLayerRasterInvalidator in GraphicsLayer. To reduce differences
between SPv1 and SPv175, in this CL we also let SPv1 use
CompositedLayerRasterInvalidator but only use its raster invalidation
tracking functionality.

1. RasterInvalidationTracking is converted from a struct to a class.
2. Now each GraphicsLayer is associated with a RasterInvalidator instead
   of a RasterInvalidationTracking. Previously the association was
   implemented by a hash map, now is directly owned using unique_ptr.
3. Empty invalidation rect is no longer reported in SPv2.

Bug: 771643
Cq-Include-Trybots: master.tryserver.chromium.linux:linux_layout_tests_slimming_paint_v2
Change-Id: I125ffc2e6cdff8931eabdaf7e4630d17135a5189
Reviewed-on: https://chromium-review.googlesource.com/701663
Commit-Queue: Xianzhu Wang <wangxianzhu@chromium.org>
Reviewed-by: Tien-Ren Chen <trchen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#506935}

account_info_ is initialized when ChromePasswordProtectionService is
created (browser startup time).So if user changed their signin state
afterward, CPPS cannot capture it. We should in fact get AccountInfo
struct from SigninManager whenever it is being used.

Bug: 772041
Change-Id: Idedbcc71c444d84446662d2b9ed595901ac25ae8
Reviewed-on: https://chromium-review.googlesource.com/702915
Commit-Queue: Jialiu Lin <jialiul@chromium.org>
Reviewed-by: Varun Khaneja <vakh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#506934}

Bug: 756270
Change-Id: I68e4b762f3324c19fe8a20e8d5a180adb6a30305
Reviewed-on: https://chromium-review.googlesource.com/703889Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org>
Cr-Commit-Position: refs/heads/master@{#506933}

Add a OneTimeMessagingHandler to handle sending one-time messages (such
as those from chrome.runtime.sendMessage) with native bindings. These
messages open a message channel, similar to the long-lived connections
of chrome.runtime.connect(), but the channel is only open for a single
message-and-response cycle.

The OneTimeMessagingHandler is responsible for creating and maintaining
these message channels, and cleaning them up when complete.

Add tests for the same.

Note: currently, these constructs are still only used in tests. A later
CL will hook them up to the bindings system.

Bug: 653596
Change-Id: Ibeae3bda73b66306a85b13749f1cab1a1edfb33b
Reviewed-on: https://chromium-review.googlesource.com/675305
Commit-Queue: Devlin <rdevlin.cronin@chromium.org>
Reviewed-by: Istiaque Ahmed <lazyboy@chromium.org>
Reviewed-by: Jeremy Roman <jbroman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#506932}

Use a single map with a struct to keep track of incoming requests,
instead of two separate maps.

Change-Id: If5dbb806de2b42f95bbe2697512beaedd39c80df
Reviewed-on: https://chromium-review.googlesource.com/703493Reviewed-by: Rebekah Potter <rbpotter@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#506931}

BUG=772159
R=mark@chromium.org

Change-Id: I596b085a93b0dde4717f03db2e5d2cd4cd2fec82
Reviewed-on: https://chromium-review.googlesource.com/703919Reviewed-by: Mark Mentovai <mark@chromium.org>
Commit-Queue: Ilya Sherman <isherman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#506930}

Bug: 700812
Change-Id: I4ab2534057debd0d1c94b20e6c8b8844fd364d87
Reviewed-on: https://chromium-review.googlesource.com/666059Reviewed-by: Julian Pastarmov <pastarmovj@chromium.org>
Reviewed-by: Roger McFarlane <rogerm@chromium.org>
Reviewed-by: Jesse Doherty <jwd@chromium.org>
Commit-Queue: Roger McFarlane <rogerm@chromium.org>
Commit-Queue: Cait Phillips <caitkp@chromium.org>
Cr-Commit-Position: refs/heads/master@{#506929}

Currently, a pingback report will only contain LoFi as a preview if a
server LoFi image was served. However, there are experiments that only
show Client LoFi instead of server LoFi, and it is possible in any case
to have HTTPS images on an HTTP page that are served via client LoFi.

Because the server decides LoFi in this case, we should count the page
as LoFi as long as an modified images were served (or at least
requested with range headers).

Bug: 772170
Change-Id: I791494624bed715a7da6b84f6a6d27624d5ab858
Reviewed-on: https://chromium-review.googlesource.com/704018Reviewed-by: Tarun Bansal <tbansal@chromium.org>
Commit-Queue: Ryan Sturm <ryansturm@chromium.org>
Cr-Commit-Position: refs/heads/master@{#506928}

If two downloads have the same scheduling criteria and the same cancel
time, have the one that was created first be a better candidate to
start.

Bug: 772152
Change-Id: Ib1459a95a6703685b34d712cf5d00e188e5d5ccb
Reviewed-on: https://chromium-review.googlesource.com/703735Reviewed-by: Xing Liu <xingliu@chromium.org>
Commit-Queue: David Trainor <dtrainor@chromium.org>
Cr-Commit-Position: refs/heads/master@{#506927}

Should fix anything that explicitly passes use_debug_fission=true (or
use_lld=true, which can imply use_debug_fission=true).

Bug: 607968
Change-Id: I22cd532c12e1fa334c7273b09f566d5168f5b260
Reviewed-on: https://chromium-review.googlesource.com/703688Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Commit-Queue: Peter Collingbourne <pcc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#506926}

MSAA is too expensive on these GPUs. At least for the time being, use
the CMAA extension wherever it's supported.

BUG=535198, 768400

Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_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
Change-Id: I3e5da867cbfcfdc08113949e7d93c5662e4ad115
Reviewed-on: https://chromium-review.googlesource.com/701922
Commit-Queue: Kenneth Russell <kbr@chromium.org>
Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#506925}

Removes build files and json files no longer needed.

BUG=763529
TEST=none

Change-Id: I2926af9e461e1178ec63b0f0c1e1368d4dc26d51
Reviewed-on: https://chromium-review.googlesource.com/701258
Commit-Queue: Scott Violet <sky@chromium.org>
Reviewed-by: Ken Rockot <rockot@chromium.org>
Cr-Commit-Position: refs/heads/master@{#506924}

This change replaces most of the mappings required for package name to
tree source translations. It results in a lot of cleanup namely:
- removal of all package name specifics
- removal of various observations for task id creation/activeness
- removal of current task id state
- removal of fallback tree

work (e.g. actions, browsing, etc).

Test: open many apps. Verify touch explore, ChromeVox interactions
Bug: 768532
Change-Id: Ic6f679fc8bb3f649334a29f98e86a34b52e5cfbc
Reviewed-on: https://chromium-review.googlesource.com/688023
Commit-Queue: David Tseng <dtseng@chromium.org>
Reviewed-by: Yuki Awano <yawano@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Reviewed-by: Jorge Lucangeli Obes <jorgelo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#506923}

makesdk.go now expects aarch64 builds, but local-sdk.py wasn't building
it. Updated it to build both i86-64 and aarch64

Change-Id: I6598010205bd6dbe1da522dcd0455a0df267a73d
Reviewed-on: https://chromium-review.googlesource.com/703997Reviewed-by: Wez <wez@chromium.org>
Commit-Queue: Sergey Ulanov <sergeyu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#506922}

This is in preparation of using optimizing with polymer-bundler. 

Bug: 764126
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: I96a88dff699389366122d39344044023d5b20b3c
Reviewed-on: https://chromium-review.googlesource.com/699245Reviewed-by: Scott Chen <scottchen@chromium.org>
Commit-Queue: Demetrios Papadopoulos <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#506921}

Bug: 769018
Change-Id: I5bdaf2ebfc8998f77d5c8ffaa3bded58facedb2a
Reviewed-on: https://chromium-review.googlesource.com/688660
Commit-Queue: Shanfeng Zhang <szhangcs@google.com>
Reviewed-by: Jesse Doherty <jwd@chromium.org>
Reviewed-by: Roger McFarlane <rogerm@chromium.org>
Cr-Commit-Position: refs/heads/master@{#506920}

:(

BUG=769611

Change-Id: I6d455b6bba646a27f81f47c4d1058a80778712fd
Reviewed-on: https://chromium-review.googlesource.com/703994Reviewed-by: Matthew Jones <mdjones@chromium.org>
Commit-Queue: Theresa <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#506919}