Revert of Enabling ico decoding with use of png and bmp decoders

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 33 matching lines @@
   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(' '))
 
-  # Several of the newest version bmps fail on SkImageDecoder
-  blacklist.extend('_ image pal8os2v2.bmp'.split(' '))
-  blacklist.extend('_ image pal8v4.bmp'.split(' '))
-  blacklist.extend('_ image pal8v5.bmp'.split(' '))
-  blacklist.extend('_ image rgb16-565.bmp'.split(' '))
-  blacklist.extend('_ image rgb16-565pal.bmp'.split(' '))
-  blacklist.extend('_ image rgb32-111110.bmp'.split(' '))
-  blacklist.extend('_ image rgb32bf.bmp'.split(' '))
-  blacklist.extend('_ image rgba32.bmp'.split(' '))
-  blacklist.extend('_ image rgba32abf.bmp'.split(' '))
-  blacklist.extend('_ image rgb24largepal.bmp'.split(' '))
-  blacklist.extend('_ image pal8os2v2-16.bmp'.split(' '))
-  blacklist.extend('_ image pal8oversizepal.bmp'.split(' '))
-  blacklist.extend('_ subset rgb24largepal.bmp'.split(' '))
-  blacklist.extend('_ subset pal8os2v2-16.bmp'.split(' '))
-  blacklist.extend('_ subset pal8oversizepal.bmp'.split(' '))
-
-  # New ico files that fail on SkImageDecoder
-  blacklist.extend('_ image Hopstarter-Mac-Folders-Apple.ico'.split(' '))
-
   # Leon doesn't care about this, so why run it?
   if 'Win' in bot:
     blacklist.extend('_ image _'.split(' '))
     blacklist.extend('_ subset _'.split(' '))
 
   # Certain gm's on win7 gpu and pdf are never finishing and keeping the test
   # running forever
   if 'Win7' in bot:
     blacklist.extend('msaa16 gm colorwheelnative'.split(' '))
     blacklist.extend('pdf gm fontmgr_iter_factory'.split(' '))
@@ skipping 93 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)