Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / native_client / tests / subprocess / process_lib.cc

diff --git a/src/native_client/tests/subprocess/process_lib.cc b/src/native_client/tests/subprocess/process_lib.cc
index 8fc95b6..1cf7434 100644 (file)
--- a/src/native_client/tests/subprocess/process_lib.cc
+++ b/src/native_client/tests/subprocess/process_lib.cc
@@ -17,6 +17,7 @@
 // ABIs/APIs.
 #include "native_client/src/public/imc_syscalls.h"
 #include "native_client/src/public/name_service.h"
+#include "native_client/src/public/secure_service.h"
 #include "native_client/src/trusted/service_runtime/include/bits/nacl_syscalls.h"
 #include "native_client/src/trusted/service_runtime/include/sys/nacl_kernel_service.h"
 // get NACL_SYSCALL_BLOCK_SIZE, NACL_SYSCALL_START_ADDR
@@ -55,55 +56,6 @@ bool SrpcClientConnection::InitializeFromConnectionCapability(int cap) {
   return InitializeFromConnectedDesc(conn);
 }
 
-std::vector<std::string> NameServiceClient::List() {
-  std::vector<std::string> rv;
-  if (!initialized()) {
-    return rv;
-  }
-  NaClSrpcResultCodes result;
-  uint32_t buffer_size = 4096;
-  uint32_t used_bytes;
-  char *buffer = NULL;
-  for (;;) {
-    buffer = new char[buffer_size];
-    used_bytes = buffer_size;
-    result = NaClSrpcInvokeBySignature(chan(),
-                                       NACL_NAME_SERVICE_LIST,
-                                       &used_bytes, buffer);
-    if (NACL_SRPC_RESULT_OK != result) {
-      // Some kind of internal error, abort and indicate by returning
-      // an empty vector.
-      return rv;
-    }
-    if (used_bytes < buffer_size) {
-      break;
-    }
-    buffer_size = 2 * buffer_size;
-    delete[] buffer;
-    buffer = new char[buffer_size];
-  }
-  std::string name_list(buffer, used_bytes);
-  delete[] buffer;
-  // Parse name_list, separating at the ASCII NUL character
-  // (forbidden in names), into a vector of strings.
-  size_t start_ix = 0;
-  size_t space_ix;
-
-  while (start_ix < name_list.size()) {
-    space_ix = name_list.find('\0', start_ix);
-    if (space_ix == std::string::npos) {
-      space_ix = used_bytes;
-    }
-    rv.push_back(name_list.substr(start_ix, space_ix - start_ix));
-    if (space_ix != std::string::npos) {
-      start_ix = space_ix + 1;
-    } else {
-      start_ix = space_ix;
-    }
-  }
-  return rv;
-}
-
 int NameServiceClient::Resolve(std::string name) {
   NaClSrpcResultCodes result;
   int status;
@@ -200,9 +152,8 @@ NaClErrorCode ServiceRuntimeClient::RunNaClModule(int module_descriptor) {
   }
   printf("Entered RunNaClModule\n");
   printf("chan: %p\n", (void*) chan());
-  // TODO(bsy): srpc signature should be in a header file
-  result = NaClSrpcInvokeBySignature(chan(), "load_module:hs:",
-                                     module_descriptor, "aux info");
+  result = NaClSrpcInvokeBySignature(chan(), NACL_SECURE_SERVICE_LOAD_MODULE,
+                                     module_descriptor);
   printf("load_module result %d\n", result);
   if (NACL_SRPC_RESULT_OK != result) {
     fprintf(stderr, "load_module RPC failed (%d): %s\n",