Revert "Revert "move onto new factories for SkMatrix""

This reverts commit c80ee456adf664c4a62fa2ccaeaf157c723ed656.

fix: update flutter's gn file to add guard

Change-Id: Iac5171c8475d9a862d06255dab1c6f38f10de2f2
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/291361
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
diff --git a/tests/GrQuadCropTest.cpp b/tests/GrQuadCropTest.cpp
index 255cc77..ded0b24 100644
--- a/tests/GrQuadCropTest.cpp
+++ b/tests/GrQuadCropTest.cpp
@@ -232,8 +232,8 @@
 
 TEST(AxisAligned) {
     test_axis_aligned(r, SkMatrix::I());
-    test_axis_aligned(r, SkMatrix::MakeScale(-1.f, 1.f));
-    test_axis_aligned(r, SkMatrix::MakeScale(1.f, -1.f));
+    test_axis_aligned(r, SkMatrix::Scale(-1.f, 1.f));
+    test_axis_aligned(r, SkMatrix::Scale(1.f, -1.f));
 
     SkMatrix rotation;
     rotation.setRotate(90.f);