Revert of Explicit control in tools of ANGLE frontend and backend

infra/bots/recipes/swarm_perf.py

 # Copyright 2016 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 
 # Recipe module for Skia Swarming perf.
 
 
 DEPS = [
   'build/file',
@@ skipping 20 matching lines @@
       'Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android',
       'Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android',
       'Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN',
       'Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer',
       'Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN',
       'Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind',
       'Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench',
       'Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug',
       'Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release',
       'Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot',
-      'Perf-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE',
       'Perf-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug',
     ],
   },
 }
 
 
 import time
 
 
 def nanobench_flags(bot):
   args = ['--pre_log']
 
   if 'GPU' in bot:
     args.append('--images')
     args.extend(['--gpuStatsDump', 'true'])
 
   if 'Android' in bot and 'GPU' in bot:
     args.extend(['--useThermalManager', '1,1,10,1000'])
 
   args.extend(['--scales', '1.0', '1.1'])
 
   if 'iOS' in bot:
     args.extend(['--skps', 'ignore_skps'])
 
-  config = ['8888', 'gpu', 'nonrendering', 'hwui' ]
+  config = ['8888', 'gpu', 'nonrendering', 'angle', 'hwui' ]
   if 'AndroidOne' not in bot:
     config += [ 'f16', 'srgb' ]
   if '-GCE-' in bot:
     config += [ '565' ]
   # The S4 crashes and the NP produces a long error stream when we run with
   # MSAA.
   if ('GalaxyS4'    not in bot and
       'NexusPlayer' not in bot):
     if 'Android' in bot:
       # The TegraX1 has a regular OpenGL implementation. We bench that instead
@@ skipping 12 matching lines @@
   elif 'TegraX1' in bot:
     config.extend(['glinst', 'glinst4'])
   elif 'MacMini6.2' in bot:
     config.extend(['glinst', 'glinst16'])
 
   if 'CommandBuffer' in bot:
     config = ['commandbuffer']
   if 'Vulkan' in bot:
     config = ['vk']
 
-  if 'ANGLE' in bot:
-    config.extend(['angle_gl_es2', 'angle_d3d11_es2'])
-
   args.append('--config')
   args.extend(config)
 
   if 'Valgrind' in bot:
     # Don't care about Valgrind performance.
     args.extend(['--loops',   '1'])
     args.extend(['--samples', '1'])
     # Ensure that the bot framework does not think we have timed out.
     args.extend(['--keepAlive', 'true'])
 
@@ skipping 212 matching lines @@
           buildername='Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-' +
                       'Valgrind-Trybot',
           mastername='client.skia',
           slavename='skiabot-linux-swarm-000',
           buildnumber=5,
           path_config='kitchen',
           swarm_out_dir='[SWARM_OUT_DIR]',
           revision='abc123',
           **gerrit_kwargs)
   )