[fuchsia] Stop calling FIDL from Dart in Flutter integration tests

shell/platform/fuchsia/flutter/BUILD.gn

@@ -162,9 +162,10 @@ template("runner_sources") {
              "$fuchsia_sdk_root/fidl:fuchsia.ui.app",
              "$fuchsia_sdk_root/fidl:fuchsia.ui.composition",
              "$fuchsia_sdk_root/fidl:fuchsia.ui.pointer",
-             "$fuchsia_sdk_root/fidl:fuchsia.ui.views",
-             "$fuchsia_sdk_root/fidl:fuchsia.ui.scenic",
              "$fuchsia_sdk_root/fidl:fuchsia.ui.pointerinjector",
+             "$fuchsia_sdk_root/fidl:fuchsia.ui.scenic",
+             "$fuchsia_sdk_root/fidl:fuchsia.ui.test.input",
+             "$fuchsia_sdk_root/fidl:fuchsia.ui.views",
              "$fuchsia_sdk_root/pkg:async-cpp",
              "$fuchsia_sdk_root/pkg:async-default",
              "$fuchsia_sdk_root/pkg:async-loop",

shell/platform/fuchsia/flutter/engine.cc

@@ -582,7 +582,7 @@ void Engine::Initialize(
                    session_connection_->AwaitVsyncForSecondaryCallback(cb);
                  }
                },
-           product_config](flutter::Shell& shell) mutable {
+           product_config, svc](flutter::Shell& shell) mutable {
             OnShaderWarmup on_shader_warmup = nullptr;
             if (product_config.enable_shader_warmup()) {
               FML_DCHECK(surface_producer_);
@@ -636,7 +636,8 @@ void Engine::Initialize(
                       std::move(on_request_announce_callback),
                       std::move(on_shader_warmup),
                       std::move(await_vsync_callback),
-                      std::move(await_vsync_for_secondary_callback_callback));
+                      std::move(await_vsync_for_secondary_callback_callback),
+                      std::move(svc));
             } else {
               platform_view = std::make_unique<flutter_runner::GfxPlatformView>(
                   shell, shell.GetTaskRunners(), std::move(view_ref),
@@ -655,7 +656,8 @@ void Engine::Initialize(
                   std::move(on_semantics_node_update_callback),
                   std::move(on_request_announce_callback),
                   std::move(on_shader_warmup), std::move(await_vsync_callback),
-                  std::move(await_vsync_for_secondary_callback_callback));
+                  std::move(await_vsync_for_secondary_callback_callback),
+                  std::move(svc));
             }
             return platform_view;
           });

shell/platform/fuchsia/flutter/flatland_platform_view.cc

@@ -32,7 +32,8 @@ FlatlandPlatformView::FlatlandPlatformView(
     OnShaderWarmup on_shader_warmup,
     AwaitVsyncCallback await_vsync_callback,
     AwaitVsyncForSecondaryCallbackCallback
-        await_vsync_for_secondary_callback_callback)
+        await_vsync_for_secondary_callback_callback,
+    std::shared_ptr<sys::ServiceDirectory> dart_application_svc)
     : PlatformView(true /* is_flatland */,
                    delegate,
                    std::move(task_runners),
@@ -52,7 +53,8 @@ FlatlandPlatformView::FlatlandPlatformView(
                    std::move(on_request_announce_callback),
                    std::move(on_shader_warmup),
                    std::move(await_vsync_callback),
-                   std::move(await_vsync_for_secondary_callback_callback)),
+                   std::move(await_vsync_for_secondary_callback_callback),
+                   std::move(dart_application_svc)),
       parent_viewport_watcher_(parent_viewport_watcher.Bind()),
       on_create_view_callback_(std::move(on_create_view_callback)),
       on_destroy_view_callback_(std::move(on_destroy_view_callback)),

shell/platform/fuchsia/flutter/flatland_platform_view.h

@@ -46,7 +46,8 @@ class FlatlandPlatformView final : public flutter_runner::PlatformView {
       OnShaderWarmup on_shader_warmup,
       AwaitVsyncCallback await_vsync_callback,
       AwaitVsyncForSecondaryCallbackCallback
-          await_vsync_for_secondary_callback_callback);
+          await_vsync_for_secondary_callback_callback,
+      std::shared_ptr<sys::ServiceDirectory> dart_application_svc);
   ~FlatlandPlatformView() override;
 
   void OnGetLayout(fuchsia::ui::composition::LayoutInfo info);

shell/platform/fuchsia/flutter/gfx_platform_view.cc

@@ -33,7 +33,8 @@ GfxPlatformView::GfxPlatformView(
     OnShaderWarmup on_shader_warmup,
     AwaitVsyncCallback await_vsync_callback,
     AwaitVsyncForSecondaryCallbackCallback
-        await_vsync_for_secondary_callback_callback)
+        await_vsync_for_secondary_callback_callback,
+    std::shared_ptr<sys::ServiceDirectory> dart_application_svc)
     : PlatformView(false /* is_flatland */,
                    delegate,
                    std::move(task_runners),
@@ -53,7 +54,8 @@ GfxPlatformView::GfxPlatformView(
                    std::move(on_request_announce_callback),
                    std::move(on_shader_warmup),
                    std::move(await_vsync_callback),
-                   std::move(await_vsync_for_secondary_callback_callback)),
+                   std::move(await_vsync_for_secondary_callback_callback),
+                   std::move(dart_application_svc)),
       session_listener_binding_(this, std::move(session_listener_request)),
       session_listener_error_callback_(
           std::move(on_session_listener_error_callback)),

shell/platform/fuchsia/flutter/gfx_platform_view.h

@@ -50,7 +50,8 @@ class GfxPlatformView final : public flutter_runner::PlatformView,
       OnShaderWarmup on_shader_warmup,
       AwaitVsyncCallback await_vsync_callback,
       AwaitVsyncForSecondaryCallbackCallback
-          await_vsync_for_secondary_callback_callback);
+          await_vsync_for_secondary_callback_callback,
+      std::shared_ptr<sys::ServiceDirectory> dart_application_svc);
 
   ~GfxPlatformView() override;