Reenable XFormTest.BlendScale on ARM

ui/gfx/transform_unittest.cc

 // Copyright (c) 2011 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.
 
 // MSVC++ requires this to be set before any other includes to get M_PI.
 #define _USE_MATH_DEFINES
 
 #include "ui/gfx/transform.h"
 
 #include <stddef.h>
@@ skipping 739 matching lines @@
       Transform expected2;
       expected2.RotateAbout(axes[index], -180.0 * t);
 
       EXPECT_TRUE(MatricesAreNearlyEqual(expected1, to) ||
                   MatricesAreNearlyEqual(expected2, to))
           << "axis: " << index << ", i: " << i;
     }
   }
 }
 
-#if defined(_WIN64) || defined(ARCH_CPU_ARM_FAMILY)
-// Win: https://crbug.com/406574
-// Arm: https://crbug.com/662558
+#if defined(_WIN64)
+// https://crbug.com/406574
 #define MAYBE_BlendScale DISABLED_BlendScale
 #else
 #define MAYBE_BlendScale BlendScale
 #endif
 TEST(XFormTest, MAYBE_BlendScale) {
   Transform from;
   for (int i = -5; i < 15; ++i) {
     Transform to;
     to.Scale3d(5, 4, 3);
-    double t = i / 9.0;
-    EXPECT_TRUE(to.Blend(from, t));
-    EXPECT_FLOAT_EQ(t * 4 + 1, to.matrix().get(0, 0)) << "i: " << i;
-    EXPECT_FLOAT_EQ(t * 3 + 1, to.matrix().get(1, 1)) << "i: " << i;
-    EXPECT_FLOAT_EQ(t * 2 + 1, to.matrix().get(2, 2)) << "i: " << i;
+    double s1 = i / 9.0;
+    double s2 = 1 - s1;
+    EXPECT_TRUE(to.Blend(from, s1));
+    EXPECT_FLOAT_EQ(5 * s1 + s2, to.matrix().get(0, 0)) << "i: " << i;
+    EXPECT_FLOAT_EQ(4 * s1 + s2, to.matrix().get(1, 1)) << "i: " << i;
+    EXPECT_FLOAT_EQ(3 * s1 + s2, to.matrix().get(2, 2)) << "i: " << i;
   }
 }
 
 TEST(XFormTest, BlendSkew) {
   Transform from;
   for (int i = 0; i < 2; ++i) {
     Transform to;
     to.Skew(10, 5);
     double t = i;
     Transform expected;
@@ skipping 1930 matching lines @@
   EXPECT_FALSE(backface_invisible.IsBackFaceVisible());
 
   // A noise that is more than the tolerance should change the result.
   backface_invisible.matrix().set(0, 3, 1.f + (2 * noise));
   EXPECT_TRUE(backface_invisible.IsBackFaceVisible());
 }
 
 }  // namespace
 
 }  // namespace gfx