[fuchsia] Migrate fuchsia.ui.input3 to Natural FIDL bindings

Bug: 1351487
Change-Id: I7a543e660371f8d98aa1f856481870d82ffdf5c7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4327451
Reviewed-by: David Dorwin <ddorwin@chromium.org>
Commit-Queue: Bryant Chandler <bryantchandler@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1122520}

fuchsia_web/webengine/BUILD.gn

@@ -610,10 +610,11 @@ test("web_engine_browsertests") {
     "//testing/gtest",
     "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.accessibility.semantics:fuchsia.accessibility.semantics_hlcpp",
     "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.element:fuchsia.element_hlcpp",
+    "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.input.virtualkeyboard:fuchsia.input.virtualkeyboard_cpp",
     "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.input.virtualkeyboard:fuchsia.input.virtualkeyboard_hlcpp",
     "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.mediacodec:fuchsia.mediacodec_hlcpp",
     "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.mem:fuchsia.mem_hlcpp",
-    "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.ui.input3:fuchsia.ui.input3_hlcpp",
+    "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.ui.input3:fuchsia.ui.input3_cpp",
     "//third_party/fuchsia-sdk/sdk/pkg/scenic_cpp",
     "//ui/gfx",
     "//ui/ozone",

fuchsia_web/webengine/browser/virtual_keyboard_browsertest.cc

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <fidl/fuchsia.ui.input3/cpp/fidl.h>
 #include <fuchsia/input/virtualkeyboard/cpp/fidl.h>
-#include <fuchsia/ui/input3/cpp/fidl.h>
 #include <lib/fit/function.h>
 
 #include "base/fuchsia/fuchsia_logging.h"
@@ -73,7 +73,8 @@ class VirtualKeyboardTest : public WebEngineBrowserTest {
 
     // Ensure that the fuchsia.ui.input3.Keyboard service is connected.
     component_context_->additional_services()
-        ->RemovePublicService<fuchsia::ui::input3::Keyboard>();
+        ->RemovePublicService<fuchsia_ui_input3::Keyboard>(
+            fidl::DiscoverableProtocolName<fuchsia_ui_input3::Keyboard>);
     keyboard_input_checker_.emplace(component_context_->additional_services());
 
     fuchsia::web::NavigationControllerPtr controller;
@@ -134,7 +135,7 @@ class VirtualKeyboardTest : public WebEngineBrowserTest {
   ScenicTestHelper scenic_test_helper_;
   base::test::ScopedFeatureList scoped_feature_list_;
 
-  absl::optional<EnsureConnectedChecker<fuchsia::ui::input3::Keyboard>>
+  absl::optional<EnsureConnectedChecker<fuchsia_ui_input3::Keyboard>>
       keyboard_input_checker_;
 
   // Fake virtual keyboard services for the InputMethod to use.

fuchsia_web/webengine/test/scoped_connection_checker.h

@@ -6,16 +6,18 @@
 #define FUCHSIA_WEB_WEBENGINE_TEST_SCOPED_CONNECTION_CHECKER_H_
 
 #include <lib/fdio/directory.h>
+#include <lib/fidl/cpp/wire/connect_service.h>
 #include <lib/vfs/cpp/service.h>
+
 #include <memory>
 #include <string>
 
 #include "base/fuchsia/fuchsia_logging.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 // Verifies that a connection was made, or never attempted, for a given
-// |Service| without needing to provide an implementation.
-template <typename Service, bool expect_connection>
+// `Protocol` without needing to provide an implementation.
+template <typename Protocol, bool expect_connection>
 class ScopedConnectionCheckerBase {
  public:
   explicit ScopedConnectionCheckerBase(
@@ -25,7 +27,7 @@ class ScopedConnectionCheckerBase {
             [this](zx::channel channel, async_dispatcher_t*) {
               pending_channels_.push_back(std::move(channel));
             }),
-        std::string(Service::Name_));
+        fidl::DiscoverableProtocolName<Protocol>);
 
     ZX_CHECK(status == ZX_OK, status) << "OutgoingDirectory::AddPublicService";
   }
@@ -43,16 +45,16 @@ class ScopedConnectionCheckerBase {
 
  private:
   // Client channels are held in a pending (unconnected) state for the
-  // lifetime of |this|, so that the client never sees a disconnection event.
+  // lifetime of `this`, so that the client never sees a disconnection event.
   std::vector<zx::channel> pending_channels_;
 };
 
-// Checks that no client attempted to connect to |Service|.
-template <typename Service>
-using NeverConnectedChecker = ScopedConnectionCheckerBase<Service, false>;
+// Checks that no client attempted to connect to `Protocol`.
+template <typename Protocol>
+using NeverConnectedChecker = ScopedConnectionCheckerBase<Protocol, false>;
 
-// Checks that at least one client attempted to connect to |Service|.
-template <typename Service>
-using EnsureConnectedChecker = ScopedConnectionCheckerBase<Service, true>;
+// Checks that at least one client attempted to connect to `Protocol`.
+template <typename Protocol>
+using EnsureConnectedChecker = ScopedConnectionCheckerBase<Protocol, true>;
 
 #endif  // FUCHSIA_WEB_WEBENGINE_TEST_SCOPED_CONNECTION_CHECKER_H_

ui/base/ime/fuchsia/BUILD.gn

@@ -22,7 +22,7 @@ component("fuchsia") {
     "//base",
     "//third_party/abseil-cpp:absl",
     "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.input.virtualkeyboard:fuchsia.input.virtualkeyboard_hlcpp",
-    "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.ui.input3:fuchsia.ui.input3_hlcpp",
+    "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.ui.input3:fuchsia.ui.input3_cpp",
     "//third_party/fuchsia-sdk/sdk/pkg/scenic_cpp",
     "//third_party/fuchsia-sdk/sdk/pkg/sys_cpp",
     "//ui/base/ime",