commit a8acdf1672dc9e0ad1baeb8c704c74d350c46f6d
author Ankur Mittal <anmittal@google.com> Thu Mar 21 17:48:57 2019 +0000
committer Ankur Mittal <anmittal@google.com> Thu Mar 21 17:48:57 2019 +0000
tree 7ba8946fbae42e9446693a20dd6a85c8105f5c05
parent cff62a0cddf02689dac521bfdd7e1061a3a03481

[chrealm] Use libsys instead of libcomponent

DX-387 #comment

TEST=CQ

Change-Id: Ia1b7c1d76d759100fc1d369f03fdb779bb19a6e0

garnet/bin/chrealm/integration_tests/BUILD.gn

diff --git a/garnet/bin/chrealm/integration_tests/BUILD.gn b/garnet/bin/chrealm/integration_tests/BUILD.gn
index ba18b33..ea86af2 100644
--- a/garnet/bin/chrealm/integration_tests/BUILD.gn
+++ b/garnet/bin/chrealm/integration_tests/BUILD.gn
@@ -35,8 +35,8 @@
   ]
 
   deps = [
+    "//sdk/lib/sys/cpp/",
     "fidl/fuchsia.testing.chrealm",
-    "//garnet/public/lib/component/cpp",
     "//garnet/public/lib/fsl",
     "//sdk/fidl/fuchsia.sys",
     "//zircon/public/lib/async-loop-cpp",

garnet/bin/chrealm/integration_tests/get_message_client.cc

diff --git a/garnet/bin/chrealm/integration_tests/get_message_client.cc b/garnet/bin/chrealm/integration_tests/get_message_client.cc
index 7e39865..9432266 100644
--- a/garnet/bin/chrealm/integration_tests/get_message_client.cc
+++ b/garnet/bin/chrealm/integration_tests/get_message_client.cc
@@ -7,12 +7,10 @@
 #include <fuchsia/sys/cpp/fidl.h>
 #include <fuchsia/testing/chrealm/cpp/fidl.h>
 #include <lib/async-loop/cpp/loop.h>
+#include <lib/sys/cpp/component_context.h>
+#include <lib/zx/channel.h>
 #include <zircon/status.h>
 #include <zircon/types.h>
-#include <lib/zx/channel.h>
-
-#include "lib/component/cpp/startup_context.h"
-#include "lib/svc/cpp/services.h"
 
 int main(int argc, const char** argv) {
   if (argc != 1) {
@@ -21,9 +19,9 @@
   }
 
   async::Loop loop(&kAsyncLoopConfigAttachToThread);
-  auto startup_context = component::StartupContext::CreateFromStartupInfo();
+  auto startup_context = sys::ComponentContext::CreateFromStartupInfo();
   fuchsia::testing::chrealm::TestServicePtr test_svc;
-  startup_context->ConnectToEnvironmentService(test_svc.NewRequest());
+  startup_context->svc()->Connect(test_svc.NewRequest());
 
   test_svc->GetMessage([&loop](fidl::StringPtr msg) {
     printf("%s", msg->c_str());