From 066550d6ee9d018634cbd9bcef4871b75a691180 Mon Sep 17 00:00:00 2001
From: Yash Tibrewal <yashkt@google.com>
Date: Mon, 10 Feb 2020 12:04:02 -0800
Subject: [PATCH] Remaning logical thread references

---
 src/core/ext/filters/client_channel/client_channel.cc         | 4 ++--
 .../resolver/dns/c_ares/grpc_ares_ev_driver_libuv.cc          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/core/ext/filters/client_channel/client_channel.cc b/src/core/ext/filters/client_channel/client_channel.cc
index a1fbd6ae08e..4e91e1be68f 100644
--- a/src/core/ext/filters/client_channel/client_channel.cc
+++ b/src/core/ext/filters/client_channel/client_channel.cc
@@ -1054,12 +1054,12 @@ class ChannelData::SubchannelWrapper : public SubchannelInterface {
             state_(new_state),
             connected_subchannel_(std::move(connected_subchannel)) {
         parent_->parent_->chand_->work_serializer_->Run(
-            [this]() { ApplyUpdateInControlPlaneLogicalThread(); },
+            [this]() { ApplyUpdateInControlPlaneWorkSerializer(); },
             DEBUG_LOCATION);
       }
 
      private:
-      void ApplyUpdateInControlPlaneLogicalThread() {
+      void ApplyUpdateInControlPlaneWorkSerializer() {
         if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_routing_trace)) {
           gpr_log(GPR_INFO,
                   "chand=%p: processing connectivity change in work serializer "
diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_libuv.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_libuv.cc
index 947c3657833..4cb549f619a 100644
--- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_libuv.cc
+++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_libuv.cc
@@ -161,7 +161,7 @@ class GrpcPolledFdFactoryLibuv : public GrpcPolledFdFactory {
   GrpcPolledFd* NewGrpcPolledFdLocked(
       ares_socket_t as, grpc_pollset_set* driver_pollset_set,
       std::shared_ptr<WorkSerializer> work_serializer) override {
-    return new GrpcPolledFdLibuv(as, work_serializer);
+    return new GrpcPolledFdLibuv(as, std::move(work_serializer));
   }
 
   void ConfigureAresChannelLocked(ares_channel channel) override {}