Per discussion, we might want to keep the OS flavor in case we have multiple of them per GPU type.

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/81fcc4bc6123ace8dd37db74fd2592e3e15ea46a

commit 81fcc4bc6123ace8dd37db74fd2592e3e15ea46a
Author: jmadill <jmadill@chromium.org>
Date: Wed Nov 30 20:14:47 2016

Add new Intel GPU bot names, remove old AMD.

One AMD config persisted from the renaming fixes from
earlier. Remove this as well as add the Win10 Intel bot config.

BUG= 649863 , 665968 
R=kbr@chromium.org
CQ_INCLUDE_TRYBOTS=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

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

[modify] https://crrev.com/81fcc4bc6123ace8dd37db74fd2592e3e15ea46a/content/test/gpu/generate_buildbot_json.py
[modify] https://crrev.com/81fcc4bc6123ace8dd37db74fd2592e3e15ea46a/testing/buildbot/chromium.gpu.fyi.json

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/tools/build.git/+/a4118240571605e8a61851ef797da17811ee7789

commit a4118240571605e8a61851ef797da17811ee7789
Author: Kenneth Russell <kbr@chromium.org>
Date: Wed Dec 07 00:46:14 2016

Rename bots that are now running Win10.

These include the old Win8 NVIDIA bots and the Win7 Intel bots.

BUG= 665968 ,669703
TBR=dpranke@chromium.org

Change-Id: Idd45b20ac98f9ff46f4dae3d345f9db83cc095db
Reviewed-on: https://chromium-review.googlesource.com/417186
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Commit-Queue: Kenneth Russell <kbr@chromium.org>

[modify] https://crrev.com/a4118240571605e8a61851ef797da17811ee7789/masters/master.chromium.gpu.fyi/slaves.cfg
[modify] https://crrev.com/a4118240571605e8a61851ef797da17811ee7789/scripts/slave/recipe_modules/chromium_tests/chromium_gpu_fyi.py
[modify] https://crrev.com/a4118240571605e8a61851ef797da17811ee7789/scripts/slave/recipes/chromium.expected/full_chromium_gpu_fyi_GPU_Win_Builder.json
[modify] https://crrev.com/a4118240571605e8a61851ef797da17811ee7789/scripts/slave/recipes/chromium.expected/full_chromium_gpu_fyi_GPU_Win_Builder__dbg_.json
[rename] https://crrev.com/a4118240571605e8a61851ef797da17811ee7789/scripts/slave/recipes/chromium.expected/full_chromium_gpu_fyi_Win10_Debug__NVIDIA_.json
[rename] https://crrev.com/a4118240571605e8a61851ef797da17811ee7789/scripts/slave/recipes/chromium.expected/full_chromium_gpu_fyi_Win10_Debug__New_Intel_.json
[copy] https://crrev.com/a4118240571605e8a61851ef797da17811ee7789/scripts/slave/recipes/chromium.expected/full_chromium_gpu_fyi_Win10_Release__NVIDIA_.json
[rename] https://crrev.com/a4118240571605e8a61851ef797da17811ee7789/scripts/slave/recipes/chromium.expected/full_chromium_gpu_fyi_Win10_Release__New_Intel_.json
[delete] https://crrev.com/b1b0c269e2a509215ba67096739ff25ca602757c/scripts/slave/recipes/chromium.expected/full_chromium_gpu_fyi_Win8_Debug__NVIDIA_.json