From 63fedc1821ee8b43b6ee6d49a1c702a9548b427e Mon Sep 17 00:00:00 2001
From: Jason Simmons <jsimmons@google.com>
Date: Wed, 14 Jul 2021 15:29:50 -0700
Subject: [PATCH] Update the Fuchsia runner to use fpromise instead of
 fit::promise

---
 shell/platform/fuchsia/flutter/accessibility_bridge.cc      | 2 +-
 .../fuchsia/flutter/accessibility_bridge_unittest.cc        | 6 +++---
 shell/platform/fuchsia/flutter/runner.cc                    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/shell/platform/fuchsia/flutter/accessibility_bridge.cc b/shell/platform/fuchsia/flutter/accessibility_bridge.cc
index 1494307325e7f..94c9cf754dce0 100644
--- a/shell/platform/fuchsia/flutter/accessibility_bridge.cc
+++ b/shell/platform/fuchsia/flutter/accessibility_bridge.cc
@@ -273,7 +273,7 @@ AccessibilityBridge::AccessibilityBridge(
               inspector.GetRoot().CreateChild(kTreeDumpInspectRootName),
               &inspector);
         }
-        return fit::make_ok_promise(std::move(inspector));
+        return fpromise::make_ok_promise(std::move(inspector));
       });
 #endif  // !FLUTTER_RELEASE
 
diff --git a/shell/platform/fuchsia/flutter/accessibility_bridge_unittest.cc b/shell/platform/fuchsia/flutter/accessibility_bridge_unittest.cc
index e61e08ecebf54..5d83ff57988fb 100644
--- a/shell/platform/fuchsia/flutter/accessibility_bridge_unittest.cc
+++ b/shell/platform/fuchsia/flutter/accessibility_bridge_unittest.cc
@@ -68,7 +68,7 @@ class AccessibilityBridgeTest : public testing::Test {
     loop_.ResetQuit();
   }
 
-  void RunPromiseToCompletion(fit::promise<> promise) {
+  void RunPromiseToCompletion(fpromise::promise<> promise) {
     bool done = false;
     executor_.schedule_task(
         std::move(promise).and_then([&done]() { done = true; }));
@@ -1013,11 +1013,11 @@ TEST_F(AccessibilityBridgeTest, InspectData) {
   accessibility_bridge_->AddSemanticsNodeUpdate(std::move(updates), 1.f);
   RunLoopUntilIdle();
 
-  fit::result<inspect::Hierarchy> hierarchy;
+  fpromise::result<inspect::Hierarchy> hierarchy;
   ASSERT_FALSE(hierarchy.is_ok());
   RunPromiseToCompletion(
       inspect::ReadFromInspector(*inspector_)
-          .then([&hierarchy](fit::result<inspect::Hierarchy>& result) {
+          .then([&hierarchy](fpromise::result<inspect::Hierarchy>& result) {
             hierarchy = std::move(result);
           }));
   ASSERT_TRUE(hierarchy.is_ok());
diff --git a/shell/platform/fuchsia/flutter/runner.cc b/shell/platform/fuchsia/flutter/runner.cc
index 0a7aab15de9f9..86e6dfbb6e047 100644
--- a/shell/platform/fuchsia/flutter/runner.cc
+++ b/shell/platform/fuchsia/flutter/runner.cc
@@ -172,7 +172,7 @@ Runner::Runner(fml::RefPtr<fml::TaskRunner> task_runner,
           name = out[0].name;
         }
         inspector.GetRoot().CreateString("vm_service_port", name, &inspector);
-        return fit::make_ok_promise(inspector);
+        return fpromise::make_ok_promise(inspector);
       },
       inspector);