Commit Graph

35 Commits

Author SHA1 Message Date
Ben Wagner
6c4c685b2b Remove Debian9 GCC jobs and related code
Also update some recipe expectations to use job names that currently
exist.

Bug: skia:9632
Change-Id: I35883474a91ffb9fb2ab3b16089c7c80b5df0bd6
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/255982
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com>
2019-11-24 23:51:04 +00:00
Ben Wagner
a6f07c5b5c Reland "Use integer patchset and issue variables."
This is a reland of 50b1248ed8

Fixes from the original are in PS2. Change several recipes to use the
shared 'is_trybot' variable, and explicitly check for 0 rather than
relying on patch_ref not being set.

Original change's description:
> Use integer patchset and issue variables.
>
> See https://skia-review.googlesource.com/c/buildbot/+/246397/
>
> Change-Id: I39dae809abdc63007f65bc05040809d1a870b118
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/246302
> Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com>
> Reviewed-by: Eric Boren <borenet@google.com>

Change-Id: Ibe1d4f0dc1dc61c39eee6c980bd7509fc260101b
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/246919
Commit-Queue: Eric Boren <borenet@google.com>
Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
2019-10-08 11:28:17 +00:00
recipe-roller
a47836e01a Roll recipe dependencies (nontrivial).
This is an automated CL created by the recipe roller. This CL rolls recipe
changes from upstream projects (e.g. depot_tools) into downstream projects
(e.g. tools/build).


Please review the expectation changes, and LGTM+CQ.


More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug.
recipe_engine:
  https://crrev.com/f362dc019e5cedc0e5ce334039a16afcbc95dcb4 Reland "[fileutil] Add support for recursive glob" (atyfto@google.com)


R=kjlubick@google.com

Recipe-Tryjob-Bypass-Reason: Autoroller
Bugdroid-Send-Email: False
Change-Id: I3c1a79eb1f1fc8a23bf02ac25f17b8673d7dd199
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/240416
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
2019-09-10 11:50:47 +00:00
recipe-roller
c0b32b3355 Roll recipe dependencies (nontrivial).
This is an automated CL created by the recipe roller. This CL rolls recipe
changes from upstream projects (e.g. depot_tools) into downstream projects
(e.g. tools/build).


Please review the expectation changes, and LGTM+CQ.


More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug.
recipe_engine:
  https://crrev.com/b5922385482112ce31df891af71854c81662d69e Remove jsonResult defaulting to null (martiniss@google.com)
  https://crrev.com/8eb708a2d5545c549ee462a193891ed7e30d430e [archive] Append file permissions stored in extra attributes (smut@google.com)


R=jcgregorio@google.com

Recipe-Tryjob-Bypass-Reason: Autoroller
Bugdroid-Send-Email: False
Change-Id: I2077c009f11e0e2901c24489d04dcbe5633506f4
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/217581
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Robbie Iannucci <iannucci@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
2019-06-03 11:25:16 +00:00
recipe-roller
51ab616bcf Roll recipe dependencies (nontrivial).
This is an automated CL created by the recipe roller. This CL rolls recipe
changes from upstream projects (e.g. depot_tools) into downstream projects
(e.g. tools/build).


Please review the expectation changes, and LGTM+CQ.


More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug.
recipe_engine:
  https://crrev.com/c2ae1f8b058dc210e2f8b1753aa7184973da36a6 Remove stdout and stderr from expectation files. (gbeaty@chromium.org)


R=stephana@google.com

Recipe-Tryjob-Bypass-Reason: Autoroller
Bugdroid-Send-Email: False
Change-Id: Idc32b8c2c426c0bc60b0c57476258b649d9620d1
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/216355
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Robbie Iannucci <iannucci@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
2019-05-28 19:24:02 +00:00
Robert Iannucci
a848c3b829 Manual recipe roll
Changelog:

recipe_engine:
  https://crrev.com/125d102e429465dc3468b4b235f9e3a5df4b252c Reland: Refactor recipe engine step execution. (iannucci@chromium.org)
  https://crrev.com/13fa883dbdc89e258d7ef300035e4bba67bffc9f Replace paths in simulations sorted by -len. (iannucci@chromium.org)
  https://crrev.com/0aae08882d042675016c1f44da43457958fe8054 Treat any cmd0 containing path sep as relative. (iannucci@chromium.org)
  https://crrev.com/107d545f22f4f6923e46655032afb050c1945bd6 Roll swarming client (maruel@chromium.org)
  https://crrev.com/2e9624d2c517e450eb2d896171d9a058d9829989 [swarming] Start exposing new containment flags (maruel@chromium.org)
  https://crrev.com/b2103d4eb1f8a9380ec37299db6d0898bd014d12 Remove subprocess42 everywhere except the actual recipe step runner. (iannucci@chromium.org)
  https://crrev.com/41c54934d664b4034e5a42655a42e866f6ba8485 swarming: fix aliasing in dimensions, env_vars and env_prefixes (maruel@chromium.org)
  https://crrev.com/55fabf49b398f40fe4561f37ca5bac0eb9352e7e Move simulator stream engine to its own file. (iannucci@chromium.org)
  https://crrev.com/c262e24ab6137157a6c834fc38a127a886ba959a Extract debug command from the test subcommand. (iannucci@chromium.org)
  https://crrev.com/cc6f5c718d9336bc98b85a820d04bdefd6dfe2b8 Improve cmd0 resolution to account for absolute base paths. (iannucci@chromium.org)

depot_tools:
  https://crrev.com/6a9b00e433cff68ea348a22a9f46483fe9f1c197 scm: Replace invalid UTF-8 in Git output (raul@tambre.ee)
  https://crrev.com/09e64b49ee394043da081356be15e85e2ca86c08 Make presubmit scripts not inherit the executor script's context (raul@tambre.ee)
  https://crrev.com/25eb8e4680acaa931f1987557513bd5f35537333 Update colorama to 0.4.1 (raul@tambre.ee)


R=borenet@google.com

Change-Id: I77625c1620df3ef1b4c6ae05c172bb52bfefafbd
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/214692
Commit-Queue: Robbie Iannucci <iannucci@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
2019-05-20 18:02:05 +00:00
recipe-roller
622e36f783 Roll recipe dependencies (nontrivial).
This is an automated CL created by the recipe roller. This CL rolls recipe
changes from upstream projects (e.g. depot_tools) into downstream projects
(e.g. tools/build).


Please review the expectation changes, and LGTM+CQ.


More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug.
depot_tools:
  https://crrev.com/43c083d5a4289d0f470be79c9d78b5b9916de3e5 Add missing options to git_rebase_update man page (dmcardle@chromium.org)
  https://crrev.com/5f6b911ad015b2660547353753bcfe50ae932fe2 Roll vpython. (iannucci@chromium.org)
  https://crrev.com/ccd2b4da9a7e6ddf126c0b4437db75201836154c Pruning old directories/ready files. (karenqian@google.com)
  https://crrev.com/80ee78e7fa9f84c3b36cc57e02034dc726d782af Convert print statements to Python 3 style (raul@tambre.ee)
recipe_engine:
  https://crrev.com/ec34fcd3b421c95e45a22bec90e9e676cd84928c Update implementation notes with information about magic_check_fn. (gbeaty@chromium.org)
  https://crrev.com/f95f160ff4e99f7c6b2e4cce06923e75cc158e26 Add beefier access control to StepData, remove StepDataAttributeError. (iannucci@chromium.org)
  https://crrev.com/a71df95b9d2348c680f05746607e12822d34517e Final simplification to RecipeResult. (iannucci@chromium.org)
  https://crrev.com/b4dac2345a45f448221fba393266fbcf541619db [buildbucket] Add search limit (nodir@google.com)
  https://crrev.com/a9d4612406b19eb642d31bff5b5a0705a783b5b0 Move StepData to its own file. (iannucci@chromium.org)


R=rmistry@google.com

Recipe-Tryjob-Bypass-Reason: Autoroller
Bugdroid-Send-Email: False
Change-Id: Ia9a9245089fb8cb46369f31b4acf5c3138a68e7a
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/214660
Reviewed-by: Robbie Iannucci <iannucci@google.com>
Reviewed-by: Ravi Mistry <rmistry@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
2019-05-20 12:33:25 +00:00
recipe-roller
edf562397e Roll recipe dependencies (nontrivial).
This is an automated CL created by the recipe roller. This CL rolls recipe
changes from upstream projects (e.g. depot_tools) into downstream projects
(e.g. tools/build).


Please review the expectation changes, and LGTM+CQ.


More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug.
recipe_engine:
  https://crrev.com/80e1d4b24dded35128a888c2de959ccd0dd8d140 Remove step exit code from test expectations. (iannucci@chromium.org)
  https://crrev.com/5c579aefde72744956934c8805273cd43f53cd1d Move StepConfig and friends to their own module, engine_step. (iannucci@chromium.org)


R=kjlubick@google.com

Recipe-Tryjob-Bypass-Reason: Autoroller
Bugdroid-Send-Email: False
Change-Id: Idcb76229ca11e137b200f5712617008d34490d3a
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/204286
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
2019-03-28 13:15:52 +00:00
recipe-roller
96ea340182 Roll recipe dependencies (nontrivial).
This is an automated CL created by the recipe roller. This CL rolls recipe
changes from upstream projects (e.g. depot_tools) into downstream projects
(e.g. tools/build).


Please review the expectation changes, and LGTM+CQ.


More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug.
depot_tools:
  https://crrev.com/9afc6490c14847e5d73fb041f0def4d95f36821b Manual roll for new run logic (martiniss@google.com)
recipe_engine:
  https://crrev.com/ee0e2c37c03936c3683be03d215f58d47d04ee08 Always use new run logic (martiniss@google.com)


R=jcgregorio@google.com

Recipe-Tryjob-Bypass-Reason: Autoroller
Bugdroid-Send-Email: False
Change-Id: If6d406af7bc8f38e95a98b046b5d0719b4adeac7
Reviewed-on: https://skia-review.googlesource.com/c/166622
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
2018-10-31 16:38:00 +00:00
Kevin Lubick
8d744124a6 Fix upload_dm_results
Also simplify (i.e. remove) the "copy to tmp dir" step.

Bug: skia:
Change-Id: I88a12aeaa1ad131588f66ac306909ec892e5ad18
Reviewed-on: https://skia-review.googlesource.com/148021
Reviewed-by: Stephan Altmueller <stephana@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Kevin Lubick <kjlubick@google.com>
2018-08-20 16:44:24 +00:00
Kevin Lubick
29d501cddc Make verbose.log optional in upload_dm_results
Will land/test after https://skia-review.googlesource.com/c/skia/+/147042

Bug: skia:
Change-Id: I381e369df7fb904c81948f36dbad679d3f430415
Reviewed-on: https://skia-review.googlesource.com/147202
Reviewed-by: Stephan Altmueller <stephana@google.com>
Commit-Queue: Kevin Lubick <kjlubick@google.com>
2018-08-16 17:54:13 +00:00
Stephan Altmüller
64cc576b1f [infra] Make GS buckets for images and hash file URL configurable
This is necessary for lottie-ci so we can upload to different
buckets and fetch different hash files.

Bug: skia:
Change-Id: I98b4d551df34473e2b5fc04284b0de04fbc097f3
Reviewed-on: https://skia-review.googlesource.com/144840
Commit-Queue: Stephan Altmueller <stephana@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
2018-08-02 07:17:21 +00:00
Eric Boren
cd0a98c0d1 [recipes] Simplify test/perf dirs
Bug: skia:6473
Change-Id: Iee2f195ddf4bbcdabc1580f2a021d2e9a07ff0b2
Reviewed-on: https://skia-review.googlesource.com/133441
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
2018-06-20 17:50:18 +00:00
Eric Boren
9599b0fd91 Reland "[infra] Run recipes through Kitchen"
Bug: skia:7050
Change-Id: Icf0bcfbbc505c90a4e8cee7437037a3037bdf33b
Reviewed-on: https://skia-review.googlesource.com/121781
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
2018-04-19 11:27:46 +00:00
Eric Boren
bd2e1f1ca6 Revert "Reland "[infra] Run recipes through Kitchen""
This reverts commit f39bbe5a31.

Reason for revert: Broke lots of bots

Original change's description:
> Reland "[infra] Run recipes through Kitchen"
> 
> Bug: skia:7050
> Change-Id: I331014c408dd5b6f7baafd78ffd12f1235c5bfe7
> Reviewed-on: https://skia-review.googlesource.com/121481
> Commit-Queue: Eric Boren <borenet@google.com>
> Reviewed-by: Ben Wagner <benjaminwagner@google.com>
> Reviewed-by: Ravi Mistry <rmistry@google.com>

TBR=borenet@google.com,benjaminwagner@google.com,rmistry@google.com

Change-Id: I4548c66a9cb0b4f105e2bc3b1c7185d14549172f
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:7050
Reviewed-on: https://skia-review.googlesource.com/121463
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
2018-04-17 11:28:54 +00:00
Eric Boren
f39bbe5a31 Reland "[infra] Run recipes through Kitchen"
Bug: skia:7050
Change-Id: I331014c408dd5b6f7baafd78ffd12f1235c5bfe7
Reviewed-on: https://skia-review.googlesource.com/121481
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Reviewed-by: Ravi Mistry <rmistry@google.com>
2018-04-17 11:13:53 +00:00
Eric Boren
276886160b Revert "[infra] Run recipes through Kitchen"
This reverts commit 7bbb26fee0.

Reason for revert: uploads broke task scheduler

Original change's description:
> [infra] Run recipes through Kitchen
> 
> Bug: skia:7050
> Change-Id: I50632444eb4ca7f9ae2b1b30b766e531092ccad4
> Reviewed-on: https://skia-review.googlesource.com/82500
> Commit-Queue: Eric Boren <borenet@google.com>
> Reviewed-by: Ravi Mistry <rmistry@google.com>

TBR=borenet@google.com,rmistry@google.com

Change-Id: Ic3a5404fde844f01eca551d50039a84a20e84e11
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:7050
Reviewed-on: https://skia-review.googlesource.com/121423
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
2018-04-16 13:21:07 +00:00
Eric Boren
7bbb26fee0 [infra] Run recipes through Kitchen
Bug: skia:7050
Change-Id: I50632444eb4ca7f9ae2b1b30b766e531092ccad4
Reviewed-on: https://skia-review.googlesource.com/82500
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Ravi Mistry <rmistry@google.com>
2018-04-16 12:07:05 +00:00
Kevin Lubick
d452434d17 Upload multiple dm images at once
Use the -m file, as recommended in
https://luci-milo.appspot.com/swarming/task/3b197fbd667a1510/steps/upload_images/0/stdout

Bug: skia:
Change-Id: I58d101f58594bf221d11a787057ee7950b197f86
Reviewed-on: https://skia-review.googlesource.com/94965
Reviewed-by: Stephan Altmueller <stephana@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Kevin Lubick <kjlubick@google.com>
2018-01-17 12:29:26 +00:00
Ben Wagner
6e0a6b3c40 [recipes] Update example builder names.
Change-Id: If3532bcb5bef5fad8c950d6844135ad3597d2674
Reviewed-on: https://skia-review.googlesource.com/51380
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
2017-09-26 20:26:56 +00:00
Eric Boren
a32c47b0e2 [infra] Always upload Gold images to the same bucket
But respect the passed-in bucket for verbose logs and JSON summary.

Bug: skia:
Change-Id: If57c16538802125c087b76991a0ca45b0a33beb2
Reviewed-on: https://skia-review.googlesource.com/46721
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Reviewed-by: Stephan Altmueller <stephana@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
2017-09-15 14:15:03 +00:00
Robert Iannucci
8cd50418af Remove dependency on recipe_engine/shutil.
R=borenet@google.com

Bug: chromium:739984
Change-Id: I077c4e6f494eb7e93851201120048ba1ef5faa07
Reviewed-on: https://skia-review.googlesource.com/21921
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
2017-07-10 13:46:35 +00:00
Eric Boren
3e2ffd74b5 [recipes] Switch to file module from recipe_engine
Bug: skia:6704
Change-Id: Id3cefa643316e5676d2038a75240e16d929d6d63
Reviewed-on: https://skia-review.googlesource.com/20146
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Ravi Mistry <rmistry@google.com>
2017-06-16 17:41:28 +00:00
Eric Boren
e16fb7584a Recipes: Use strict coverage, part 1
Shouldn't change any behavior.

Bug: skia:
Change-Id: I953e0da886a6d61096eba7915101f245a6cec741
Reviewed-on: https://skia-review.googlesource.com/13765
Reviewed-by: Ravi Mistry <rmistry@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
2017-04-19 11:24:24 +00:00
Eric Boren
f9aa9e5169 Clean up no-longer-used recipes stuff
- Remove buildbot logic
- Remove non-Gerrit logic
- Remove master, slave, and build number properties

Bug: skia:6473
Change-Id: I203d523f3a0e03f933c0c48d29c7aabac503b2b9
Reviewed-on: https://skia-review.googlesource.com/12625
Reviewed-by: Ravi Mistry <rmistry@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
2017-04-10 14:27:58 +00:00
Eric Boren
4c7754c499 Move recipe content from modules back into recipes
At one point I moved the contents of the recipes into modules so that
they could be shared between repos. It turns out that we don't need
that, and it adds complexity.

Bug: skia:6473
Change-Id: I75a920b6a8474dcdd8b37ee9edd52aac801d1ab0
Reviewed-on: https://skia-review.googlesource.com/12622
Reviewed-by: Ravi Mistry <rmistry@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
2017-04-10 12:58:33 +00:00
Eric Boren
a159085008 Roll Recipe DEPS
Backing up from https://skia-review.googlesource.com/c/9884 due to failures.

BUG=skia:

Change-Id: I12182044191f5df56518f355262bbf83f8c5c1f8
Reviewed-on: https://skia-review.googlesource.com/9895
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
2017-03-20 17:36:33 +00:00
Eric Boren
5de544b3ca Move recipe expectations into example.py recipes inside of modules
Each top-level recipe still needs one test and expectation file.

BUG=skia:6070

Change-Id: I3b14e8a11a86af68f5558177536f0018b644be4d
Reviewed-on: https://skia-review.googlesource.com/6943
Reviewed-by: Ravi Mistry <rmistry@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
2017-01-12 14:29:12 +00:00
Ravi Mistry
9bcca6a212 Roll recipe DEPS
Looks like slave_build and cwd changed to start_dir in https://bugs.chromium.org/p/chromium/issues/detail?id=662586

BUG=skia:5979

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=5104

Change-Id: I46d080b9089ea9b4adc2ed45fc81fdc192bdb2b2
Reviewed-on: https://skia-review.googlesource.com/5104
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Commit-Queue: Ravi Mistry <rmistry@google.com>
2016-11-22 12:36:17 +00:00
borenet
96b38426b6 Fix recipes for Gerrit property rename
NOTREECHECKS=true
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2455523004

Review-Url: https://codereview.chromium.org/2455523004
2016-10-27 06:35:52 -07:00
borenet
2f036965f0 Use calendar.timegm instead of time.mktime in recipes
Timezones are hard.

BUG=skia:5823
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2392143004

Review-Url: https://codereview.chromium.org/2392143004
2016-10-05 11:43:41 -07:00
borenet
1818701746 Add retries to upload_dm_results
BUG=skia:5818
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2390723003

Review-Url: https://codereview.chromium.org/2390723003
2016-10-04 06:32:55 -07:00
borenet
d5603e670b upload_dm_results: Remove JSON validation step
This is infra-failing frequently for some reason, possibly due to large
file size?

TBR=stephana
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2383163002

Review-Url: https://codereview.chromium.org/2383163002
2016-09-30 12:18:47 -07:00
Eric Boren
cfdd64f41f Fix dm/nanobench uploads for Gerrit-based trybots
BUG=skia:5719

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2710

Change-Id: I43f03b19a9d7223b67de7dc7c4efea8cb75dba05
Reviewed-on: https://skia-review.googlesource.com/2710
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
2016-09-27 15:54:27 +00:00
borenet
9766f00166 Add swarming task for upload_dm_results
BUG=skia:5719
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2360203004

Review-Url: https://codereview.chromium.org/2360203004
2016-09-27 06:52:26 -07:00