image subsetting as part of the name instead of a separate source type

dm/DM.cpp

Index: dm/DM.cpp
diff --git a/dm/DM.cpp b/dm/DM.cpp
index dad1f8b33fd9af1a0436586eaee35c06e3c6c863..9c121e4fdc9d49ae96f0300f7837d128f1b15532 100644
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -15,7 +15,7 @@
 
 DEFINE_bool(tests, true, "Run tests?");
 DEFINE_string(images, "resources", "Images to decode.");
-DEFINE_string(src, "gm skp image subset", "Source types to test.");
+DEFINE_string(src, "gm skp image", "Source types to test.");
 DEFINE_bool(nameByHash, false,
             "If true, write to FLAGS_writePath[0]/<hash>.png instead of "
             "to FLAGS_writePath[0]/<config>/<sourceType>/<name>.png");
@@ -95,8 +95,8 @@ static void gather_srcs() {
             SkOSFile::Iter it(FLAGS_images[0], exts[i]);
             for (SkString file; it.next(&file); ) {
                 SkString path = SkOSPath::Join(FLAGS_images[0], file.c_str());
-                push_src("image",  new ImageSrc(path));     // Decode entire image.
-                push_src("subset", new ImageSrc(path, 5));  // Decode 5 random subsets.
+                push_src("image", new ImageSrc(path));     // Decode entire image.
+                push_src("image", new ImageSrc(path, 5));  // Decode 5 random subsets.
             }
         }
     }