commit 5591f6a0540c42de1ff03e343f42eda6db445d22
author Abdulla Kamar <abdulla@google.com> Tue Oct 27 22:12:04 2020 +0000
committer CQ Bot <commit-bot@chromium.org> Tue Oct 27 22:12:04 2020 +0000
tree 4cd901e1e527a7fc3cf4834d1685d730c0ba8334
parent 4ce24c3e1fcbc402496bd2fee61f7e8fabe5f199

[driver_runner] Update use of exposed dir

Recent changes to component_manager mean that the contents of
exposed dir is now a flat list of capabilities, rather than being nested
under /svc.

Bug: 33183
Change-Id: I9f0944530c4a175f2900aff11a1b2530f1509603
Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/443484
Testability-Review: Abdulla Kamar <abdulla@google.com>
Reviewed-by: Alex Legg <alexlegg@google.com>
Commit-Queue: Abdulla Kamar <abdulla@google.com>

src/devices/bin/driver_manager/driver_runner.cc

diff --git a/src/devices/bin/driver_manager/driver_runner.cc b/src/devices/bin/driver_manager/driver_runner.cc
index be1a90d..cae229f 100644
--- a/src/devices/bin/driver_manager/driver_runner.cc
+++ b/src/devices/bin/driver_manager/driver_runner.cc
@@ -10,7 +10,6 @@
 
 #include <unordered_set>
 
-#include <fbl/string_printf.h>
 #include <fs/service.h>
 
 #include "src/devices/lib/driver2/start_args.h"
@@ -316,10 +315,10 @@
   if (status != ZX_OK) {
     return zx::error(status);
   }
-  auto path = fbl::StringPrintf("svc/%s", fdf::DriverHost::Name);
-  status = fdio_service_connect_at(create->get(), path.data(), server_end.release());
+  status = fdio_service_connect_at(create->get(), fdf::DriverHost::Name, server_end.release());
   if (status != ZX_OK) {
-    LOGF(ERROR, "Failed to connect to service '%s': %s", path.data(), zx_status_get_string(status));
+    LOGF(ERROR, "Failed to connect to service '%s': %s", fdf::DriverHost::Name,
+         zx_status_get_string(status));
     return zx::error(status);
   }
 

src/devices/bin/driver_manager/driver_runner_test.cc

diff --git a/src/devices/bin/driver_manager/driver_runner_test.cc b/src/devices/bin/driver_manager/driver_runner_test.cc
index d873ea6..c6845ec 100644
--- a/src/devices/bin/driver_manager/driver_runner_test.cc
+++ b/src/devices/bin/driver_manager/driver_runner_test.cc
@@ -177,7 +177,7 @@
       EXPECT_EQ(ZX_OK, directory_binding_.Bind(std::move(exposed_dir), loop_.dispatcher()));
     });
     directory().SetOpenHandler([this](std::string path, auto object) {
-      EXPECT_EQ("svc/fuchsia.driver.framework.DriverHost", path);
+      EXPECT_EQ(fdf::DriverHost::Name_, path);
       EXPECT_EQ(ZX_OK, driver_host_binding_.Bind(object.TakeChannel(), loop_.dispatcher()));
     });
   }