Fix asan issues, clean up

test/core/iomgr/socket_utils_test.c

@@ -77,6 +77,7 @@ static const grpc_socket_mutator_vtable mutator_vtable = {mutate_fd,
 
 int main(int argc, char **argv) {
   int sock;
+  grpc_error *err;
   grpc_test_init(argc, argv);
 
   sock = socket(PF_INET, SOCK_STREAM, 0);
@@ -118,8 +119,9 @@ int main(int argc, char **argv) {
       grpc_set_socket_with_mutator(sock, (grpc_socket_mutator *)&mutator)));
 
   mutator.option_value = -1;
-  GPR_ASSERT(GRPC_ERROR_NONE != grpc_set_socket_with_mutator(
-                                    sock, (grpc_socket_mutator *)&mutator));
+  err = grpc_set_socket_with_mutator(sock, (grpc_socket_mutator *)&mutator);
+  GPR_ASSERT(err != GRPC_ERROR_NONE);
+  GRPC_ERROR_UNREF(err);
 
   close(sock);
 

test/cpp/common/channel_arguments_test.cc

@@ -34,7 +34,6 @@
 #include <grpc++/support/channel_arguments.h>
 
 #include <grpc/grpc.h>
-#include <grpc/support/log.h>
 #include <gtest/gtest.h>
 #include "src/core/lib/iomgr/socket_mutator.h"
 
@@ -65,7 +64,6 @@ bool test_mutator_mutate_fd(int fd, grpc_socket_mutator* mutator) {
 
 void test_mutator_destroy(grpc_socket_mutator* mutator) {
   TestSocketMutator* tsm = (TestSocketMutator*)mutator;
-  gpr_log(GPR_ERROR, "destroy is called");
   delete tsm;
 }