use existing executable_wrapper.h

Makefile

@@ -1439,7 +1439,6 @@ FORMAT_CPP_FILES += $(LINT_CPP_FILES)
 # C source codes.
 FORMAT_CPP_FILES += $(wildcard \
 	benchmark/napi/*/*.c \
-	test/embedding/*.c \
 	test/js-native-api/*.h \
 	test/js-native-api/*/*.c \
 	test/js-native-api/*/*.h \

node.gyp

@@ -1152,6 +1152,7 @@
 
       'include_dirs': [
         'src',
+        'tools',
         'tools/msvs/genfiles',
         'deps/v8/include',
         'deps/cares/include',
@@ -1163,7 +1164,6 @@
       'sources': [
         'src/node_snapshot_stub.cc',
         'test/embedding/embedtest.cc',
-        'test/embedding/utf8_args.c',
       ],
 
       'conditions': [

test/embedding/embedtest.cc

@@ -2,9 +2,8 @@
 #undef NDEBUG
 #endif
 #include <assert.h>
+#include "executable_wrapper.h"
 #include "node.h"
-#include "utf8_args.h"
-#include "uv.h"
 
 #include <algorithm>
 
@@ -28,10 +27,10 @@ static int RunNodeInstance(MultiIsolatePlatform* platform,
                            const std::vector<std::string>& args,
                            const std::vector<std::string>& exec_args);
 
-int main(int argc, char** argv) {
-  GetUtf8CommandLineArgs(&argc, &argv);
+NODE_MAIN(int argc, node::argv_type raw_argv[]) {
+  char** argv = nullptr;
+  node::FixupMain(argc, raw_argv, &argv);
 
-  argv = uv_setup_args(argc, argv);
   std::vector<std::string> args(argv, argv + argc);
   std::unique_ptr<node::InitializationResult> result =
       node::InitializeOncePerProcess(
@@ -57,8 +56,6 @@ int main(int argc, char** argv) {
   V8::DisposePlatform();
 
   node::TearDownOncePerProcess();
-
-  FreeUtf8CommandLineArgs(argc, argv);
   return ret;
 }