Fix bug in Valgrind flags config.

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
@@ skipping 43 matching lines @@
   # 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
   # with a very wide blacklist disabling all these tests on all Android bots.
   if 'Android' in bot:  # skia:3255
     blacklist.extend('gpu skp _ gpu image _ gpu subset _'.split(' '))
     blacklist.extend('msaa skp _ msaa image _ gpu subset _'.split(' '))
 
   # PDF + .webp -> jumps depending on uninitialized memory.  skia:3505
   if 'Valgrind' in bot:
     blacklist.extend('pdf _ .webp'.split(' '))
-    if 'GPU' in bot:
+    if 'Valgrind_GPU' in bot:
       args.append('--nocpu')
-    elif 'CPU' in bot:
+    elif 'Valgrind_CPU' in bot:
       args.append('--nogpu')
 
   if blacklist:
     args.append('--blacklist')
     args.extend(blacklist)
 
   match = []
   if 'Alex' in bot:  # skia:2793
     # This machine looks to be running out of heap.
     # Running with fewer threads may help.
@@ skipping 23 matching lines @@
 cov_end = lineno()   # Don't care about code coverage past here.
 
 
 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_CPU',
+    'Test-Ubuntu14-GCE-NoGPU-x86_64-Release-Valgrind_CPU',
     'Test-Ubuntu12-ShuttleA-GTX550Ti-x86_64-Release-Valgrind_GPU',
     'Test-Win7-ShuttleA-HD2000-x86-Debug-ANGLE',
   ]
 
   cov = coverage.coverage()
   cov.start()
   for case in cases:
     args[case] = get_args(case)
   cov.stop()
 
@@ skipping 13 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)