Major bench refactoring.

gyp/bench.gypi

 # sources and conditions used in skia's bench.gyp and chromium's skia.gyp
 #
 {
   'sources': [
     '../bench/benchmain.cpp',
     '../bench/SkBenchmark.h',
     '../bench/SkBenchmark.cpp',
     '../bench/AAClipBench.cpp',
     '../bench/BicubicBench.cpp',
     '../bench/BitmapBench.cpp',
@@ skipping 56 matching lines @@
     '../bench/TableBench.cpp',
     '../bench/TextBench.cpp',
     '../bench/TileBench.cpp',
     '../bench/VertBench.cpp',
     '../bench/WriterBench.cpp',
     '../bench/XfermodeBench.cpp',
     '../bench/WritePixelsBench.cpp',
 
     '../bench/SkBenchLogger.h',
     '../bench/SkBenchLogger.cpp',
-    '../bench/TimerData.h',
-    '../bench/TimerData.cpp',
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: