[ci] Manually roll master (flutter#6418)

Rolls Flutter master to the version that first failed due to flutter/engine#33688

Updates the camera_windows mocks to include the new method so that the tests will compile on master.

Fixes the blocked roll.

Author: stuartmorgan-g

packages/camera/camera_windows/windows/test/capture_controller_test.cpp

@@ -291,7 +291,7 @@ TEST(CaptureController, InitCaptureEngineReportsFailure) {
   EXPECT_CALL(*engine.Get(), Initialize).Times(1).WillOnce(Return(E_FAIL));
 
   EXPECT_CALL(*texture_registrar, RegisterTexture).Times(0);
-  EXPECT_CALL(*texture_registrar, UnregisterTexture).Times(0);
+  EXPECT_CALL(*texture_registrar, UnregisterTexture(_)).Times(0);
   EXPECT_CALL(*camera, OnCreateCaptureEngineSucceeded).Times(0);
   EXPECT_CALL(*camera,
               OnCreateCaptureEngineFailed(Eq(CameraResult::kError),
@@ -335,7 +335,7 @@ TEST(CaptureController, InitCaptureEngineReportsAccessDenied) {
       .WillOnce(Return(E_ACCESSDENIED));
 
   EXPECT_CALL(*texture_registrar, RegisterTexture).Times(0);
-  EXPECT_CALL(*texture_registrar, UnregisterTexture).Times(0);
+  EXPECT_CALL(*texture_registrar, UnregisterTexture(_)).Times(0);
   EXPECT_CALL(*camera, OnCreateCaptureEngineSucceeded).Times(0);
   EXPECT_CALL(*camera,
               OnCreateCaptureEngineFailed(Eq(CameraResult::kAccessDenied),

packages/camera/camera_windows/windows/test/mocks.h

@@ -67,7 +67,8 @@ class MockTextureRegistrar : public flutter::TextureRegistrar {
           return this->texture_id_;
         });
 
-    ON_CALL(*this, UnregisterTexture)
+    // Deprecated pre-Flutter-3.4 version.
+    ON_CALL(*this, UnregisterTexture(_))
         .WillByDefault([this](int64_t tid) -> bool {
           if (tid == this->texture_id_) {
             texture_ = nullptr;
@@ -77,6 +78,18 @@ class MockTextureRegistrar : public flutter::TextureRegistrar {
           return false;
         });
 
+    // Flutter 3.4+ version.
+    ON_CALL(*this, UnregisterTexture(_, _))
+        .WillByDefault(
+            [this](int64_t tid, std::function<void()> callback) -> void {
+              // Forward to the pre-3.4 implementation so that expectations can
+              // be the same for all versions.
+              this->UnregisterTexture(tid);
+              if (callback) {
+                callback();
+              }
+            });
+
     ON_CALL(*this, MarkTextureFrameAvailable)
         .WillByDefault([this](int64_t tid) -> bool {
           if (tid == this->texture_id_) {
@@ -91,7 +104,13 @@ class MockTextureRegistrar : public flutter::TextureRegistrar {
   MOCK_METHOD(int64_t, RegisterTexture, (flutter::TextureVariant * texture),
               (override));
 
+  // Pre-Flutter-3.4 version.
   MOCK_METHOD(bool, UnregisterTexture, (int64_t), (override));
+  // Flutter 3.4+ version.
+  // TODO(cbracken): Add an override annotation to this once 3.4+ is the
+  // minimum version tested in CI.
+  MOCK_METHOD(void, UnregisterTexture,
+              (int64_t, std::function<void()> callback), ());
   MOCK_METHOD(bool, MarkTextureFrameAvailable, (int64_t), (override));
 
   int64_t texture_id_ = -1;