cleanup codec names being produced by dm and uploaded to gold

dm/DM.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "CrashHandler.h"
 #include "DMJsonWriter.h"
 #include "DMSrcSink.h"
@@ skipping 175 matching lines @@
     }
     SkAutoTDelete<SkCodec> codec(SkCodec::NewFromData(encoded));
     if (NULL == codec.get()) {
         SkDebugf("Couldn't create codec for %s.", path.c_str());
         return;
     }
 
     // Build additional test cases for images that decode natively to non-canvas types
     switch(codec->getInfo().colorType()) {
         case kGray_8_SkColorType:
-            push_src("image", "codec kGray8", new CodecSrc(path, CodecSrc::kNormal_Mode,
+            push_src("image", "codec_kGray8", new CodecSrc(path, CodecSrc::kNormal_Mode,
                     CodecSrc::kGrayscale_Always_DstColorType));
-            push_src("image", "scanline kGray8", new CodecSrc(path, CodecSrc::kScanline_Mode,
+            push_src("image", "scanline_kGray8", new CodecSrc(path, CodecSrc::kScanline_Mode,
                     CodecSrc::kGrayscale_Always_DstColorType));
             // Intentional fall through
             // FIXME: Is this a long term solution for testing wbmps decodes to kIndex8?
             // Further discussion on this topic is at skbug.com/3683
       case kIndex_8_SkColorType:
-          push_src("image", "codec kIndex8", new CodecSrc(path, CodecSrc::kNormal_Mode,
+          push_src("image", "codec_kIndex8", new CodecSrc(path, CodecSrc::kNormal_Mode,
                   CodecSrc::kIndex8_Always_DstColorType));
           // FIXME: Need to implement scanline decoding for kIndex8.
           //push_src("image", "scanline kIndex8", new CodecSrc(path, CodecSrc::kScanline_Mode,
           //        CodecSrc::kIndex8_Always_DstColorType));
         break;
       default:
         // Do nothing
         break;
     }
 
@@ skipping 529 matching lines @@
     }
     return 0;
 }
 
 #if !defined(SK_BUILD_FOR_IOS)
 int main(int argc, char** argv) {
     SkCommandLineFlags::Parse(argc, argv);
     return dm_main();
 }
 #endif