From d429b674f1dd60590fda077fd893a4493c2b5455 Mon Sep 17 00:00:00 2001 From: Tamir Duberstein Date: Fri, 27 Jan 2023 13:01:28 -0500 Subject: [PATCH] [fuchsia] Migrate to new RealmBuilder API (flutter/engine#39196) See https://fxrev.dev/793422. Missed in 92fca42e0667969b3a78815c77afca9c6acd1c83 and 3bfa5c5b1db5391d49cc58f9a23f1b4cd802d3e3. --- .../dart_aot_runner/dart-aot-runner-integration-test.cc | 4 ++-- .../dart_jit_runner/dart-jit-runner-integration-test.cc | 4 ++-- .../flutter/tests/integration/mouse-input/mouse-input-test.cc | 2 +- .../flutter/tests/integration/text-input/text-input-test.cc | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/engine/src/flutter/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_aot_runner/dart-aot-runner-integration-test.cc b/engine/src/flutter/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_aot_runner/dart-aot-runner-integration-test.cc index fff8d443e0..33ec20c2ae 100644 --- a/engine/src/flutter/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_aot_runner/dart-aot-runner-integration-test.cc +++ b/engine/src/flutter/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_aot_runner/dart-aot-runner-integration-test.cc @@ -99,9 +99,9 @@ TEST_F(RealmBuilderTest, DartRunnerStartsUp) { // Build the Realm with the provided child and protocols auto realm = realm_builder.Build(dispatcher()); - FML_LOG(INFO) << "Realm built: " << realm.GetChildName(); + FML_LOG(INFO) << "Realm built: " << realm.component().GetChildName(); // Connect to the Dart echo server - auto echo = realm.ConnectSync(); + auto echo = realm.component().ConnectSync(); fidl::StringPtr response; // Attempt to ping the Dart echo server for a response echo->EchoString("hello", &response); diff --git a/engine/src/flutter/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/dart-jit-runner-integration-test.cc b/engine/src/flutter/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/dart-jit-runner-integration-test.cc index 0c24533459..ea32bb40f4 100644 --- a/engine/src/flutter/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/dart-jit-runner-integration-test.cc +++ b/engine/src/flutter/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/dart-jit-runner-integration-test.cc @@ -97,9 +97,9 @@ TEST_F(RealmBuilderTest, DartRunnerStartsUp) { // Build the Realm with the provided child and protocols auto realm = realm_builder.Build(dispatcher()); - FML_LOG(INFO) << "Realm built: " << realm.GetChildName(); + FML_LOG(INFO) << "Realm built: " << realm.component().GetChildName(); // Connect to the Dart echo server - auto echo = realm.ConnectSync(); + auto echo = realm.component().ConnectSync(); fidl::StringPtr response; // Attempt to ping the Dart echo server for a response echo->EchoString("hello", &response); diff --git a/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-test.cc b/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-test.cc index 42d3d2c4c5..f2e5b02cee 100644 --- a/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-test.cc +++ b/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-test.cc @@ -171,7 +171,7 @@ class MouseInputTest : public PortableUITest, // Get the display dimensions. FML_LOG(INFO) << "Waiting for scenic display info"; - scenic_ = realm_root()->Connect(); + scenic_ = realm_root()->component().Connect(); scenic_->GetDisplayInfo([this](fuchsia::ui::gfx::DisplayInfo display_info) { display_width_ = display_info.width_in_px; display_height_ = display_info.height_in_px; diff --git a/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-test.cc b/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-test.cc index b0311fda6f..d248cc03c7 100644 --- a/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-test.cc +++ b/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-test.cc @@ -145,7 +145,7 @@ class TextInputTest : public PortableUITest, // Get the display dimensions. FML_LOG(INFO) << "Waiting for scenic display info"; - scenic_ = realm_root()->template Connect(); + scenic_ = realm_root()->component().Connect(); scenic_->GetDisplayInfo([this](fuchsia::ui::gfx::DisplayInfo display_info) { display_width_ = display_info.width_in_px; display_height_ = display_info.height_in_px;