Revert of Support Float32 output from SkColorSpaceXform

tests/ColorSpaceXformTest.cpp

Index: tests/ColorSpaceXformTest.cpp
diff --git a/tests/ColorSpaceXformTest.cpp b/tests/ColorSpaceXformTest.cpp
index 2401af582b0ba6335778ad4c30df68a882bedb0e..0beb38fb7a3c65978ebb7e561893aeac87ff5010 100644
--- a/tests/ColorSpaceXformTest.cpp
+++ b/tests/ColorSpaceXformTest.cpp
@@ -7,7 +7,6 @@
 
 #include "Resources.h"
 #include "SkCodec.h"
-#include "SkCodecPriv.h"
 #include "SkColorPriv.h"
 #include "SkColorSpace.h"
 #include "SkColorSpace_Base.h"
@@ -40,8 +39,7 @@
 
     // Create and perform an identity xform.
     std::unique_ptr<SkColorSpaceXform> xform = ColorSpaceXformTest::CreateIdentityXform(gammas);
-    xform->apply(dstPixels, srcPixels, width, select_xform_format(kN32_SkColorType),
-                 kOpaque_SkAlphaType);
+    xform->apply(dstPixels, srcPixels, width, kN32_SkColorType, kOpaque_SkAlphaType);
 
     // Since the src->dst matrix is the identity, and the gamma curves match,
     // the pixels should be unchanged.