Revert of Delete SkFlattenable::Type

tools/chrome_fuzz.cpp

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "SkCanvas.h"
 #include "SkFlattenableSerialization.h"
 #include "SkImageFilter.h"
 #include "SkOSFile.h"
 #include "SkString.h"
 
@@ skipping 13 matching lines @@
   testdata->resize(len);
   (void) sk_fread(testdata->writable_str(), len, file);
   return true;
 }
 
 static void run_test_case(const SkString& testdata, const SkBitmap& bitmap,
                  SkCanvas* canvas) {
   // This call shouldn't crash or cause ASAN to flag any memory issues
   // If nothing bad happens within this call, everything is fine
   SkFlattenable* flattenable = SkValidatingDeserializeFlattenable(
-        testdata.c_str(), testdata.size());
+        testdata.c_str(), testdata.size(), SkImageFilter::GetFlattenableType());
 
   // Adding some info, but the test passed if we got here without any trouble
   if (flattenable != nullptr) {
     SkDebugf("Valid stream detected.\n");
     // Let's see if using the filters can cause any trouble...
     SkPaint paint;
     paint.setImageFilter(static_cast<SkImageFilter*>(flattenable))->unref();
     canvas->save();
     canvas->clipRect(SkRect::MakeXYWH(
         0, 0, SkIntToScalar(kBitmapSize), SkIntToScalar(kBitmapSize)));
@@ skipping 27 matching lines @@
   SkCanvas canvas(bitmap);
   canvas.clear(0x00000000);
   for (int i = 1; i < argc; i++)
     if (!read_and_run_test_case(argv[i], bitmap, &canvas))
       ret = 2;
   // Cluster-Fuzz likes "#EOF" as the last line of output to help distinguish
   // successful runs from crashes.
   SkDebugf("#EOF\n");
   return ret;
 }