From 70c3bd1a22289977332e4c567618ffe94dc414f8 Mon Sep 17 00:00:00 2001
From: Filip Filmar <fmil@google.com>
Date: Tue, 19 Nov 2024 11:13:30 -0800
Subject: [PATCH] Revert "[fuchsia] Updates the FIDL bindings in
 Fuchsia-specific code (#302)" (#303)

This reverts commit b98efcf0e4145cca54e211bbd55d270020858f76.

The reverted change introduced a 64KB stack allocation which overflowed
stacks of some downstream programs.
---
 src/time_zone_lookup.cc | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/time_zone_lookup.cc b/src/time_zone_lookup.cc
index 5820628..ddc48e7 100644
--- a/src/time_zone_lookup.cc
+++ b/src/time_zone_lookup.cc
@@ -24,7 +24,7 @@
 #endif
 
 #if defined(__Fuchsia__)
-#include <fidl/fuchsia.intl/cpp/fidl.h>
+#include <fuchsia/intl/cpp/fidl.h>
 #include <lib/async-loop/cpp/loop.h>
 #include <lib/fdio/directory.h>
 #include <zircon/types.h>
@@ -218,31 +218,32 @@ time_zone local_time_zone() {
     // Note: We can't use the synchronous FIDL API here because it doesn't
     // allow timeouts; if the FIDL call failed, local_time_zone() would never
     // return.
+
     const zx::duration kTimeout = zx::msec(500);
 
     // Don't attach to the thread because otherwise the thread's dispatcher
     // would be set to null when the loop is destroyed, causing any other FIDL
     // code running on the same thread to crash.
     async::Loop loop(&kAsyncLoopConfigNeverAttachToThread);
-    auto endpoints =
-        fidl::Endpoints<fuchsia_intl::PropertyProvider>::Create();
+
+    fuchsia::intl::PropertyProviderHandle handle;
     zx_status_t status = fdio_service_connect_by_name(
-        fidl::DiscoverableProtocolName<fuchsia_intl::PropertyProvider>,
-        endpoints.server.TakeChannel().release());
+        fuchsia::intl::PropertyProvider::Name_,
+        handle.NewRequest().TakeChannel().release());
     if (status != ZX_OK) {
       return;
     }
-    fidl::Client intl_provider(
-        std::move(endpoints.client), loop.dispatcher());
-
-    // Attempt to initialize the time zone only once, and fail quietly.
-    // The end result of an error is an empty time zone string.
-    intl_provider->GetProfile().Then(
-        [&loop, &primary_tz](
-          fidl::Result<fuchsia_intl::PropertyProvider::GetProfile>& result) {
-          if (result.is_ok()) {
-            const auto& response = result.value();
-            primary_tz = response.profile().time_zones().value()[0].id();
+
+    fuchsia::intl::PropertyProviderPtr intl_provider;
+    status = intl_provider.Bind(std::move(handle), loop.dispatcher());
+    if (status != ZX_OK) {
+      return;
+    }
+
+    intl_provider->GetProfile(
+        [&loop, &primary_tz](fuchsia::intl::Profile profile) {
+          if (!profile.time_zones().empty()) {
+            primary_tz = profile.time_zones()[0].id;
           }
           loop.Quit();
         });