Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / ppapi / native_client / src / trusted / plugin / srpc_client.h

diff --git a/src/ppapi/native_client/src/trusted/plugin/srpc_client.h b/src/ppapi/native_client/src/trusted/plugin/srpc_client.h
index 02fe1da..71ecbf7 100644 (file)
--- a/src/ppapi/native_client/src/trusted/plugin/srpc_client.h
+++ b/src/ppapi/native_client/src/trusted/plugin/srpc_client.h
@@ -11,8 +11,9 @@
 #define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SRPC_CLIENT_H_
 
 #include <map>
+#include <string>
+
 #include "native_client/src/include/nacl_macros.h"
-#include "native_client/src/include/nacl_string.h"
 #include "native_client/src/shared/srpc/nacl_srpc.h"
 #include "ppapi/native_client/src/trusted/plugin/utility.h"
 
@@ -41,12 +42,12 @@ class SrpcClient {
   ~SrpcClient();
 
   //  Test whether the SRPC service has a given method.
-  bool HasMethod(const nacl::string& method_name);
+  bool HasMethod(const std::string& method_name);
   //  Invoke an SRPC method.
-  bool Invoke(const nacl::string& method_name, SrpcParams* params);
+  bool Invoke(const std::string& method_name, SrpcParams* params);
   // Get the error status from that last method invocation
   NaClSrpcError GetLastError() { return last_error_; }
-  bool InitParams(const nacl::string& method_name, SrpcParams* params);
+  bool InitParams(const std::string& method_name, SrpcParams* params);
 
   // Attach a service for reverse-direction (from .nexe) RPCs.
   void AttachService(NaClSrpcService* service, void* instance_data);
@@ -55,7 +56,7 @@ class SrpcClient {
   NACL_DISALLOW_COPY_AND_ASSIGN(SrpcClient);
   SrpcClient();
   void GetMethods();
-  typedef std::map<nacl::string, MethodInfo*> Methods;
+  typedef std::map<std::string, MethodInfo*> Methods;
   Methods methods_;
   NaClSrpcChannel srpc_channel_;
   bool srpc_channel_initialised_;