Index: components/nacl/renderer/plugin/nacl_subprocess.h |
diff --git a/components/nacl/renderer/plugin/nacl_subprocess.h b/components/nacl/renderer/plugin/nacl_subprocess.h |
index 2a3727261fdb00e29cf8d4a3e9dde2530e9f6e88..b28bfa1196d14ce726bfe9172df256823fa166a8 100644 |
--- a/components/nacl/renderer/plugin/nacl_subprocess.h |
+++ b/components/nacl/renderer/plugin/nacl_subprocess.h |
@@ -15,7 +15,6 @@ |
#include "base/macros.h" |
#include "components/nacl/renderer/plugin/service_runtime.h" |
-#include "components/nacl/renderer/plugin/srpc_client.h" |
#include "native_client/src/include/nacl_macros.h" |
#include "native_client/src/include/portability.h" |
@@ -23,15 +22,13 @@ namespace plugin { |
class Plugin; |
class ServiceRuntime; |
-class SrpcParams; |
// A class representing an instance of a NaCl module, loaded by the plugin. |
class NaClSubprocess { |
public: |
NaClSubprocess(const std::string& description, |
- ServiceRuntime* service_runtime, |
- SrpcClient* srpc_client); |
+ ServiceRuntime* service_runtime); |
virtual ~NaClSubprocess(); |
ServiceRuntime* service_runtime() const { return service_runtime_.get(); } |
@@ -39,9 +36,6 @@ class NaClSubprocess { |
service_runtime_.reset(service_runtime); |
} |
- // The socket used for communicating w/ the NaCl module. |
- SrpcClient* srpc_client() const { return srpc_client_.get(); } |
- |
// A basic description of the subprocess. |
std::string description() const { return description_; } |
@@ -49,36 +43,16 @@ class NaClSubprocess { |
// Only use for debugging, but do not expose this to untrusted webapps. |
std::string detailed_description() const; |
- // Start up interfaces. |
- bool StartSrpcServices(); |
- |
- // Invoke an Srpc Method. |out_params| must be allocated and cleaned up |
- // outside of this function, but it will be initialized by this function, and |
- // on success any out-params (if any) will be placed in |out_params|. |
- // Input types must be listed in |input_signature|, with the actual |
- // arguments passed in as var-args. Returns |true| on success. |
- bool InvokeSrpcMethod(const std::string& method_name, |
- const std::string& input_signature, |
- SrpcParams* out_params, |
- ...); |
- |
// Fully shut down the subprocess. |
void Shutdown(); |
private: |
NACL_DISALLOW_COPY_AND_ASSIGN(NaClSubprocess); |
- bool VInvokeSrpcMethod(const std::string& method_name, |
- const std::string& signature, |
- SrpcParams* params, |
- va_list vl); |
- |
std::string description_; |
// The service runtime representing the NaCl module instance. |
nacl::scoped_ptr<ServiceRuntime> service_runtime_; |
- // Ownership of srpc_client taken from the service runtime. |
- nacl::scoped_ptr<SrpcClient> srpc_client_; |
}; |
} // namespace plugin |