From 2d4b2145c518b6b02763c4d2d3ce25bd9593706a Mon Sep 17 00:00:00 2001
From: Aaron Clarke <aaclarke@google.com>
Date: Tue, 25 Oct 2022 12:55:31 -0700
Subject: [PATCH] Fixed race in incorrect windows platform channel test.

---
 shell/platform/windows/fixtures/main.dart                  | 2 +-
 shell/platform/windows/flutter_windows_engine_unittests.cc | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/shell/platform/windows/fixtures/main.dart b/shell/platform/windows/fixtures/main.dart
index 66fa68d2d3052..43de4bea59496 100644
--- a/shell/platform/windows/fixtures/main.dart
+++ b/shell/platform/windows/fixtures/main.dart
@@ -32,7 +32,7 @@ void hiPlatformChannels() {
       ui.PlatformDispatcher.instance
           .sendPlatformMessage('hi', reply, (ByteData? reply) {});
     });
-    callback(null);
+    callback(data);
   });
 }
 
diff --git a/shell/platform/windows/flutter_windows_engine_unittests.cc b/shell/platform/windows/flutter_windows_engine_unittests.cc
index fa5aeada3652a..4b44a0919f9ad 100644
--- a/shell/platform/windows/flutter_windows_engine_unittests.cc
+++ b/shell/platform/windows/flutter_windows_engine_unittests.cc
@@ -295,12 +295,12 @@ TEST_F(FlutterWindowsEngineTest, PlatformMessageRoundTrip) {
   binary_messenger->Send(
       channel, reinterpret_cast<uint8_t*>(payload), 5,
       [&did_call_reply](const uint8_t* reply, size_t reply_size) {
-        EXPECT_EQ(reply_size, 3);
-        EXPECT_EQ(reply[0], static_cast<uint8_t>('b'));
+        EXPECT_EQ(reply_size, 5);
+        EXPECT_EQ(reply[0], static_cast<uint8_t>('h'));
         did_call_reply = true;
       });
   // Rely on timeout mechanism in CI.
-  while (!did_call_callback && !did_call_reply && !did_call_dart_reply) {
+  while (!did_call_callback || !did_call_reply || !did_call_dart_reply) {
     engine->task_runner()->ProcessTasks();
   }
 }