Replace SkPicture(SkStream) constructors with a factory.

tools/filtermain.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkDebugCanvas.h"
 #include "SkDevice.h"
 #include "SkForceLinking.h"
@@ skipping 648 matching lines @@
     { check_8, apply_8, 0 },
     { check_9, apply_9, 0 },
 };
 
 
 static int filter_picture(const SkString& inFile, const SkString& outFile) {
     SkAutoTDelete<SkPicture> inPicture;
 
     SkFILEStream inStream(inFile.c_str());
     if (inStream.isValid()) {
-        inPicture.reset(SkNEW_ARGS(SkPicture, (&inStream, NULL, &SkImageDecoder::DecodeMemory)));
+        inPicture.reset(SkPicture::CreateFromStream(&inStream));
     }
 
     if (NULL == inPicture.get()) {
         SkDebugf("Could not read file %s\n", inFile.c_str());
         return -1;
     }
 
     int localCount[SK_ARRAY_COUNT(gOptTable)];
 
     memset(localCount, 0, sizeof(localCount));
@@ skipping 159 matching lines @@
 
     SkGraphics::Term();
     return 0;
 }
 
 #if !defined SK_BUILD_FOR_IOS
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif