Revert of Default SK_ANGLE to true on Windows, run angle whenever possible on bots.

tools/dm_flags.py

 #!/usr/bin/env python
 
 usage = '''
 Write extra flags to outfile for DM based on the bot name:
   $ python dm_flags.py outfile Test-Mac10.9-MacMini6.2-HD4000-x86_64-Release
 Or run self-tests:
   $ python dm_flags.py test
 '''
 
 import inspect
 import json
 import os
 import sys
 
 
 def lineno():
   caller = inspect.stack()[1]  # Up one level to our caller.
   return inspect.getframeinfo(caller[0]).lineno
 
 
 cov_start = lineno()+1   # We care about coverage starting just past this def.
 def get_args(bot):
   args = []
 
-  configs = ['565', '8888', 'gpu', 'nvprmsaa4', 'angle']
+  configs = ['565', '8888', 'gpu', 'nvprmsaa4']
   # Xoom and NP are running out of RAM when we run all these modes.  skia:3255
   if ('Xoom'        not in bot and
       'NexusPlayer' not in bot):
     configs.extend(mode + '-8888' for mode in
                    ['serialize', 'tiles_rt', 'pipe'])
     configs.append('tiles_rt-gpu')
+  if 'ANGLE' in bot:
+    configs.append('angle')
   args.append('--config')
   args.extend(configs)
 
   blacklist = []
   # This image is too large to be a texture for many GPUs.
   blacklist.extend('gpu _ PANO_20121023_214540.jpg'.split(' '))
   blacklist.extend('msaa _ PANO_20121023_214540.jpg'.split(' '))
 
   # Drawing SKPs or images into GPU canvases is a New Thing.
   # It seems like we're running out of RAM on some Android bots, so start off
@@ skipping 37 matching lines @@
 
 
 def self_test():
   import coverage  # This way the bots don't need coverage.py to be installed.
   args = {}
   cases = [
     'Test-Android-Nexus7-Tegra3-Arm7-Release',
     'Test-Android-Xoom-Tegra2-Arm7-Release',
     'Test-ChromeOS-Alex-GMA3150-x86-Debug',
     'Test-Ubuntu12-ShuttleA-GTX550Ti-x86_64-Release-Valgrind',
+    'Test-Win7-ShuttleA-HD2000-x86-Debug-ANGLE',
   ]
 
   cov = coverage.coverage()
   cov.start()
   for case in cases:
     args[case] = get_args(case)
   cov.stop()
 
   this_file = os.path.basename(__file__)
   _, _, not_run, _ = cov.analysis(this_file)
@@ skipping 11 matching lines @@
   if len(sys.argv) == 2 and sys.argv[1] == 'test':
     self_test()
     sys.exit(0)
 
   if len(sys.argv) != 3:
     print usage
     sys.exit(1)
 
   with open(sys.argv[1], 'w') as out:
     json.dump(get_args(sys.argv[2]), out)