Merge branch 'channelz-subchannels' into channelz-server

2 files changed, 4 insertions, 4 deletions

diff --git a/test/core/channel/channel_trace_test.cc b/test/core/channel/channel_trace_test.cc
index e33277753b..d594445bfb 100644
--- a/test/core/channel/channel_trace_test.cc
+++ b/test/core/channel/channel_trace_test.cc
@@ -44,8 +44,8 @@ namespace testing {
 // testing peer to access channel internals
 class ChannelNodePeer {
  public:
-  ChannelNodePeer(ChannelNode* node) : node_(node) {}
-  ChannelTrace* trace() { return &node_->trace_; }
+  explicit ChannelNodePeer(ChannelNode* node) : node_(node) {}
+  ChannelTrace* trace() const { return &node_->trace_; }
 
  private:
   ChannelNode* node_;
diff --git a/test/core/channel/channelz_test.cc b/test/core/channel/channelz_test.cc
index 4bfab4e2ee..bcda30d9f2 100644
--- a/test/core/channel/channelz_test.cc
+++ b/test/core/channel/channelz_test.cc
@@ -47,8 +47,8 @@ namespace testing {
 // testing peer to access channel internals
 class CallCountingHelperPeer {
  public:
-  CallCountingHelperPeer(CallCountingHelper* node) : node_(node) {}
-  grpc_millis last_call_started_millis() {
+  explicit CallCountingHelperPeer(CallCountingHelper* node) : node_(node) {}
+  grpc_millis last_call_started_millis() const {
     return (grpc_millis)gpr_atm_no_barrier_load(
         &node_->last_call_started_millis_);
   }