fix clang

Author: chunhtai

.cirrus.yml

@@ -109,11 +109,14 @@ task:
     cd %ENGINE_PATH%/src
     gclient sync
   matrix:
-    - name: build_windows_unopt_debug
+    - name: build_and_test_windows_unopt_debug
       compile_host_script: |
         cd %ENGINE_PATH%/src
         python flutter/tools/gn --runtime-mode debug --unoptimized
         ninja -C out/host_debug_unopt
+      test_host_script: |
+        cd $ENGINE_PATH/src
+        python flutter/testing/run_tests.py --type=engine --engine-filter=flutter_windows_unittests,client_wrapper_windows_unittests
     - name: build_windows_opt_debug
       compile_host_script: |
         cd %ENGINE_PATH%/src

ci/licenses_golden/licenses_flutter

@@ -1025,6 +1025,7 @@ FILE: ../../../flutter/shell/platform/windows/win32_flutter_window.cc
 FILE: ../../../flutter/shell/platform/windows/win32_flutter_window.h
 FILE: ../../../flutter/shell/platform/windows/win32_window.cc
 FILE: ../../../flutter/shell/platform/windows/win32_window.h
+FILE: ../../../flutter/shell/platform/windows/win32_window_unittests.cc
 FILE: ../../../flutter/shell/platform/windows/window_state.h
 FILE: ../../../flutter/shell/version/version.cc
 FILE: ../../../flutter/shell/version/version.h

shell/platform/windows/testing/win32_flutter_window_test.cc

@@ -7,7 +7,7 @@ void Win32FlutterWindowTest::OnFontChange() {
   on_font_change_called_ = true;
 }
 
-bool OnFontChangeIsCalled() {
+bool Win32FlutterWindowTest::OnFontChangeWasCalled() {
   return on_font_change_called_;
 }
 }  // namespace testing

shell/platform/windows/testing/win32_flutter_window_test.h

@@ -17,7 +17,7 @@ class Win32FlutterWindowTest : public Win32FlutterWindow {
   // |Win32Window|
   void OnFontChange() override;
 
-  bool OnFontChangeIsCalled();
+  bool OnFontChangeWasCalled();
 
  private:
   bool on_font_change_called_ = false;

shell/platform/windows/win32_window_unittests.cc

@@ -1,20 +1,19 @@
 #include "flutter/shell/platform/windows/testing/win32_flutter_window_test.h"
-#include "flutter/shell/platform/windows/win32_flutter_window.h"
 #include "gtest/gtest.h"
 
 namespace flutter {
 namespace testing {
 
 TEST(Win32FlutterWindowTest, CreateDestroy) {
-  Win32FlutterWindow window(800, 600);
+  Win32FlutterWindowTest window(800, 600);
 }
 
 TEST(Win32FlutterWindowTest, CanFontChange) {
   Win32FlutterWindowTest window(800, 600);
   HWND hwnd = window.GetWindowHandle();
   LRESULT result = SendMessage(hwnd, WM_FONTCHANGE, NULL, NULL);
   ASSERT_EQ(result, 0);
-  ASSERT_TRUE(window.OnFontChangeIsCalled());
+  ASSERT_TRUE(window.OnFontChangeWasCalled());
 }
 
 }  // namespace testing

testing/run_tests.py

@@ -83,6 +83,10 @@ def RunCCTests(build_dir, filter):
   # https://github.com/flutter/flutter/issues/36294
   if not IsWindows():
     RunEngineExecutable(build_dir, 'embedder_unittests', filter, shuffle_flags)
+  else:
+    RunEngineExecutable(build_dir, 'flutter_windows_unittests', filter, shuffle_flags)
+
+    RunEngineExecutable(build_dir, 'client_wrapper_windows_unittests', filter, shuffle_flags)
 
   flow_flags = ['--gtest_filter=-PerformanceOverlayLayer.Gold']
   if IsLinux():