1 files changed, 10 insertions, 6 deletions
diff --git a/src/node/ext/node_grpc.cc b/src/node/ext/node_grpc.cc
index 682af0e5ad..9b9eee85b7 100644
--- a/src/node/ext/node_grpc.cc
+++ b/src/node/ext/node_grpc.cc
@@ -56,12 +56,9 @@ extern "C" {
 #include "server.h"
 #include "completion_queue_async_worker.h"
 #include "server_credentials.h"
-#include "slice.h"
 #include "timeval.h"
 #include "completion_queue.h"
 
-using grpc::node::CreateSliceFromString;
-
 using v8::FunctionTemplate;
 using v8::Local;
 using v8::Value;
@@ -286,8 +283,10 @@ NAN_METHOD(MetadataKeyIsLegal) {
         "headerKeyIsLegal's argument must be a string");
   }
   Local<String> key = Nan::To<String>(info[0]).ToLocalChecked();
+  Nan::Utf8String key_utf8_str(key);
+  char *key_str = *key_utf8_str;
   info.GetReturnValue().Set(static_cast<bool>(
-      grpc_header_key_is_legal(CreateSliceFromString(key))));
+      grpc_header_key_is_legal(key_str, static_cast<size_t>(key->Length()))));
 }
 
 NAN_METHOD(MetadataNonbinValueIsLegal) {
@@ -296,8 +295,11 @@ NAN_METHOD(MetadataNonbinValueIsLegal) {
         "metadataNonbinValueIsLegal's argument must be a string");
   }
   Local<String> value = Nan::To<String>(info[0]).ToLocalChecked();
+  Nan::Utf8String value_utf8_str(value);
+  char *value_str = *value_utf8_str;
   info.GetReturnValue().Set(static_cast<bool>(
-      grpc_header_nonbin_value_is_legal(CreateSliceFromString(value))));
+      grpc_header_nonbin_value_is_legal(
+          value_str, static_cast<size_t>(value->Length()))));
 }
 
 NAN_METHOD(MetadataKeyIsBinary) {
@@ -306,8 +308,10 @@ NAN_METHOD(MetadataKeyIsBinary) {
         "metadataKeyIsLegal's argument must be a string");
   }
   Local<String> key = Nan::To<String>(info[0]).ToLocalChecked();
+  Nan::Utf8String key_utf8_str(key);
+  char *key_str = *key_utf8_str;
   info.GetReturnValue().Set(static_cast<bool>(
-      grpc_is_binary_header(CreateSliceFromString(key))));
+      grpc_is_binary_header(key_str, static_cast<size_t>(key->Length()))));
 }
 
 static grpc_ssl_roots_override_result get_ssl_roots_override(