commit 580987abf03dc075c90e0ea5b787441191be8c95
author David Garcia Quintas <dgq@google.com> Fri Apr 29 17:26:33 2016 -0700
committer David Garcia Quintas <dgq@google.com> Fri Apr 29 17:26:33 2016 -0700
tree cc1889d1b580b089461e8acbdf7cfcd464a5e9dd
parent b41363e88eb78123926e760e45a981add977140f
parent 90b4a87d3ba78326d7ff523b3412684aa905670e

Merge branch 'master' of github.com:grpc/grpc into lr_hook

test/core/channel/channel_stack_test.c

diff --git a/test/core/channel/channel_stack_test.c b/test/core/channel/channel_stack_test.c
index 54f9fce..6b371e6 100644
--- a/test/core/channel/channel_stack_test.c
+++ b/test/core/channel/channel_stack_test.c
@@ -63,7 +63,8 @@
                                  grpc_channel_element *elem) {}
 
 static void call_destroy_func(grpc_exec_ctx *exec_ctx, grpc_call_element *elem,
-                              const grpc_call_stats *stats) {
+                              const grpc_call_stats *stats,
+                              void *ignored) {
   ++*(int *)(elem->channel_data);
 }
 
@@ -87,7 +88,7 @@
 }
 
 static void free_call(grpc_exec_ctx *exec_ctx, void *arg, bool success) {
-  grpc_call_stack_destroy(exec_ctx, arg, NULL);
+  grpc_call_stack_destroy(exec_ctx, arg, NULL, NULL);
   gpr_free(arg);
 }