Fix Windows build

Author: arbreng

flow/layers/opacity_layer_unittests.cc

@@ -82,22 +82,21 @@ TEST_F(OpacityLayerTest, FullyOpaque) {
   layer_bounds.makeOffset(-child_offset.fX, -child_offset.fY)
       .roundOut(&opacity_bounds);
   layer->Paint(paint_context());
-  EXPECT_EQ(
-      mock_canvas().draw_calls(),
-      std::vector({MockCanvas::DrawCall{0, MockCanvas::SaveData{1}},
-                   MockCanvas::DrawCall{
-                       1, MockCanvas::ConcatMatrixData{child_transform}},
+  auto expected_draw_calls = std::vector(
+      {MockCanvas::DrawCall{0, MockCanvas::SaveData{1}},
+       MockCanvas::DrawCall{1, MockCanvas::ConcatMatrixData{child_transform}},
 #ifndef SUPPORT_FRACTIONAL_TRANSLATION
-                   MockCanvas::DrawCall{
-                       1, MockCanvas::SetMatrixData{integral_child_transform}},
+       MockCanvas::DrawCall{
+           1, MockCanvas::SetMatrixData{integral_child_transform}},
 #endif
-                   MockCanvas::DrawCall{
-                       1, MockCanvas::SaveLayerData{opacity_bounds,
-                                                    opacity_paint, nullptr, 2}},
-                   MockCanvas::DrawCall{
-                       2, MockCanvas::DrawPathData{child_path, child_paint}},
-                   MockCanvas::DrawCall{2, MockCanvas::RestoreData{1}},
-                   MockCanvas::DrawCall{1, MockCanvas::RestoreData{0}}}));
+       MockCanvas::DrawCall{
+           1, MockCanvas::SaveLayerData{opacity_bounds, opacity_paint, nullptr,
+                                        2}},
+       MockCanvas::DrawCall{2,
+                            MockCanvas::DrawPathData{child_path, child_paint}},
+       MockCanvas::DrawCall{2, MockCanvas::RestoreData{1}},
+       MockCanvas::DrawCall{1, MockCanvas::RestoreData{0}}});
+  EXPECT_EQ(mock_canvas().draw_calls(), expected_draw_calls);
 }
 
 }  // namespace testing

flow/layers/picture_layer_unittests.cc

@@ -82,21 +82,20 @@ TEST_F(PictureLayerTest, SimplePicture) {
   EXPECT_FALSE(layer->needs_system_composite());
 
   layer->Paint(paint_context());
-  EXPECT_EQ(
-      mock_canvas().draw_calls(),
-      std::vector(
-          {MockCanvas::DrawCall{0, MockCanvas::SaveData{1}},
-           MockCanvas::DrawCall{
-               1, MockCanvas::ConcatMatrixData{layer_offset_matrix}},
+  auto expected_draw_calls = std::vector(
+      {MockCanvas::DrawCall{0, MockCanvas::SaveData{1}},
+       MockCanvas::DrawCall{1,
+                            MockCanvas::ConcatMatrixData{layer_offset_matrix}},
 #ifndef SUPPORT_FRACTIONAL_TRANSLATION
-           MockCanvas::DrawCall{
-               1, MockCanvas::SetMatrixData{RasterCache::GetIntegralTransCTM(
-                      layer_offset_matrix)}},
+       MockCanvas::DrawCall{
+           1, MockCanvas::SetMatrixData{RasterCache::GetIntegralTransCTM(
+                  layer_offset_matrix)}},
 #endif
-           MockCanvas::DrawCall{
-               1, MockCanvas::DrawPictureData{mock_picture->serialize(),
-                                              SkPaint(), SkMatrix()}},
-           MockCanvas::DrawCall{1, MockCanvas::RestoreData{0}}}));
+       MockCanvas::DrawCall{
+           1, MockCanvas::DrawPictureData{mock_picture->serialize(), SkPaint(),
+                                          SkMatrix()}},
+       MockCanvas::DrawCall{1, MockCanvas::RestoreData{0}}});
+  EXPECT_EQ(mock_canvas().draw_calls(), expected_draw_calls);
 }
 
 }  // namespace testing

flow/matrix_decomposition_unittests.cc

@@ -2,15 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/flow/matrix_decomposition.h"
-
 #include "flutter/fml/build_config.h"
-#include "gtest/gtest.h"
 #if defined(OS_WIN)
 #define _USE_MATH_DEFINES
 #endif
+
 #include <cmath>
 
+#include "flutter/flow/matrix_decomposition.h"
+#include "gtest/gtest.h"
+
 namespace flutter {
 namespace testing {