Revert r4259

git-svn-id: http://skia.googlecode.com/svn/trunk@4260 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gm/gmmain.cpp b/gm/gmmain.cpp
index 01d6b0b..877d0af 100644
--- a/gm/gmmain.cpp
+++ b/gm/gmmain.cpp
@@ -725,7 +725,7 @@
         SkDebugf(gRec[i].fName);
     }
     SkDebugf(" ]\n");
-    SkDebugf("    [--noreplay] [--pipe] [--noserialize] [--forceBWtext] [--nopdf] \n"
+    SkDebugf("    [--noreplay] [--pipe] [--serialize] [--forceBWtext] [--nopdf] \n"
              "    [--tiledPipe] \n"
              "    [--nodeferred] [--match substring] [--notexturecache]\n"
              "    [-h|--help]\n"
@@ -740,7 +740,7 @@
     SkDebugf("    --pipe: Exercise SkGPipe replay.\n");
     SkDebugf("    --tiledPipe: Exercise tiled SkGPipe replay.\n");
     SkDebugf(
-             "    --noserialize: do not exercise SkPicture serialization & deserialization.\n");
+             "    --serialize: exercise SkPicture serialization & deserialization.\n");
     SkDebugf("    --forceBWtext: disable text anti-aliasing.\n");
     SkDebugf("    --nopdf: skip the pdf rendering test pass.\n");
     SkDebugf("    --nodeferred: skip the deferred rendering test pass.\n");
@@ -828,7 +828,7 @@
     bool doReplay = true;
     bool doPipe = false;
     bool doTiledPipe = false;
-    bool doSerialize = true;
+    bool doSerialize = false;
     bool doDeferred = true;
     bool disableTextureCache = false;
     SkTDArray<size_t> configs;
@@ -880,10 +880,8 @@
             gNotifyMissingReadReference = false;
         } else if (strcmp(*argv, "--enable-missing-warning") == 0) {
             gNotifyMissingReadReference = true;
-        } else if (strcmp(*argv, "--noserialize") == 0) {
-            doSerialize = false;
         } else if (strcmp(*argv, "--serialize") == 0) {
-            //@todo borenet - Remove unused "--serialize" flag
+            doSerialize = true;
         } else if (strcmp(*argv, "--match") == 0) {
             ++argv;
             if (argv < stop && **argv) {