commit 7639e75b4e7bb08d82ca70163af0b732fcaae65f
author Mitchell Kember <mkember@google.com> Fri Jul 23 18:29:21 2021 +0000
committer CQ Bot <commit-bot@chromium.org> Fri Jul 23 18:29:21 2021 +0000
tree ddc962018dc6749ed3f1e9a5394eb48fced61f2d
parent 18e6f4003e30e4131bb939c891868035f09748b2

[fidl] Use ProtocolMarker and DiscoverableProtocolMarker

This CL removes the uses of deprecated trait names that were added in
I3b2f82ca5939a3e7156dc20fd63383959358be30, migrating them to the new
names from https://fuchsia-review.googlesource.com/c/fuchsia/+/559038.
This completes the soft transition.

Change-Id: I599b1985a510964eb950bf7dd25799f98b95281e
Reviewed-on: https://fuchsia-review.googlesource.com/c/experiences/+/559281
Reviewed-by: Ian McKellar <ianloic@google.com>
Commit-Queue: Mitchell Kember <mkember@google.com>

session_shells/ermine/session/src/main.rs

diff --git a/session_shells/ermine/session/src/main.rs b/session_shells/ermine/session/src/main.rs
index c3d8bf9..9e4c1d6 100644
--- a/session_shells/ermine/session/src/main.rs
+++ b/session_shells/ermine/session/src/main.rs
@@ -11,7 +11,7 @@
 use {
     crate::element_repository::{ElementEventHandler, ElementManagerServer, ElementRepository},
     anyhow::{Context as _, Error},
-    fidl::endpoints::{ClientEnd, Proxy},
+    fidl::endpoints::{ClientEnd, DiscoverableProtocolMarker, Proxy},
     fidl_fuchsia_session::{
         ElementManagerMarker, ElementManagerRequestStream, GraphicalPresenterMarker,
     },
@@ -38,10 +38,6 @@
     std::sync::{Arc, Weak},
 };
 
-// TODO(fxbug.dev/75869): Remove when soft-transition is done.
-#[allow(deprecated)]
-use fidl::endpoints::DiscoverableService;
-
 enum ExposedServices {
     ElementManager(ElementManagerRequestStream),
     Presentation(PresentationRequestStream),
@@ -60,12 +56,10 @@
     let (client_chan, server_chan) = zx::Channel::create().unwrap();
 
     let mut launch_options = LaunchOptions::new();
-    // TODO(fxbug.dev/75869): Remove when soft-transition is done.
-    #[allow(deprecated)]
     launch_options.set_additional_services(
         vec![
-            PresentationMarker::SERVICE_NAME.to_string(),
-            ElementManagerMarker::SERVICE_NAME.to_string(),
+            PresentationMarker::PROTOCOL_NAME.to_string(),
+            ElementManagerMarker::PROTOCOL_NAME.to_string(),
         ],
         client_chan,
     );
@@ -95,12 +89,8 @@
     fs.take_and_serve_directory_handle()?;
 
     // Add services served over `server_chan`.
-    // TODO(fxbug.dev/75869): Remove when soft-transition is done.
-    #[allow(deprecated)]
-    fs.add_fidl_service_at(ElementManagerMarker::SERVICE_NAME, ExposedServices::ElementManager);
-    // TODO(fxbug.dev/75869): Remove when soft-transition is done.
-    #[allow(deprecated)]
-    fs.add_fidl_service_at(PresentationMarker::SERVICE_NAME, ExposedServices::Presentation);
+    fs.add_fidl_service_at(ElementManagerMarker::PROTOCOL_NAME, ExposedServices::ElementManager);
+    fs.add_fidl_service_at(PresentationMarker::PROTOCOL_NAME, ExposedServices::Presentation);
     fs.serve_connection(server_chan).unwrap();
 
     // create a reference so that we can use this within the `for_each_concurrent` generator.