Plugin: Remove __socketAddressFactory() and toString() on SocketAddresses

src/native_client/src/trusted/plugin/srpc/plugin.cc

 /*
  * Copyright 2008 The Native Client Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can
  * be found in the LICENSE file.
  */
 
 #include "native_client/src/trusted/plugin/srpc/plugin.h"
 
 #include <assert.h>
 #include <fcntl.h>
@@ skipping 69 matching lines @@
 
 // A method to test the cost of invoking a method in a plugin without
 // making an RPC to the service runtime.  Used for performance evaluation.
 bool NullPluginMethod(void* obj, plugin::SrpcParams* params) {
   UNREFERENCED_PARAMETER(obj);
   params->outs()[0]->tag = NACL_SRPC_ARG_TYPE_INT;
   params->outs()[0]->u.ival = 0;
   return true;
 }
 
-bool SocketAddressFactory(void* obj, plugin::SrpcParams* params) {
-  plugin::Plugin* plugin = reinterpret_cast<plugin::Plugin*>(obj);
-  // Type check the input parameter.
-  if (NACL_SRPC_ARG_TYPE_STRING != params->ins()[0]->tag) {
-    return false;
-  }
-  char* str = params->ins()[0]->u.sval;
-  nacl::DescWrapper* wrapper =
-      plugin->wrapper_factory()->MakeSocketAddress(str);
-  if (NULL == wrapper) {
-    return false;
-  }
-  // Create a scriptable object to return.
-  plugin::SocketAddress* portable_socket_address =
-      plugin::SocketAddress::New(plugin, wrapper);
-  plugin::ScriptableHandle* socket_address =
-      plugin->browser_interface()->NewScriptableHandle(portable_socket_address);
-  if (NULL == socket_address) {
-    wrapper->Delete();
-    params->set_exception_string("out of memory");
-    portable_socket_address->Delete();
-    return false;
-  }
-  // Plug the scriptable object into the return values.
-  params->outs()[0]->tag = NACL_SRPC_ARG_TYPE_OBJECT;
-  params->outs()[0]->u.oval = socket_address;
-  return true;
-}
-
 bool GetModuleReadyProperty(void* obj, plugin::SrpcParams* params) {
   plugin::Plugin* plugin = reinterpret_cast<plugin::Plugin*>(obj);
   if (plugin->socket()) {
     params->outs()[0]->u.ival = 1;
   } else {
     params->outs()[0]->u.ival = 0;
   }
   return true;
 }
 
@@ skipping 80 matching lines @@
 
 }  // namespace
 
 namespace plugin {
 
 static int const kAbiHeaderBuffer = 256;  // must be at least EI_ABIVERSION + 1
 
 void Plugin::LoadMethods() {
   // Methods supported by Plugin.
   AddMethodCall(ShmFactory, "__shmFactory", "i", "h");
-  AddMethodCall(SocketAddressFactory, "__socketAddressFactory", "s", "h");
   AddMethodCall(DefaultSocketAddress, "__defaultSocketAddress", "", "h");
   AddMethodCall(NullPluginMethod, "__nullPluginMethod", "s", "i");
   // Properties implemented by Plugin.
   AddPropertyGet(GetHeightProperty, "height", "i");
   AddPropertySet(SetHeightProperty, "height", "i");
   AddPropertyGet(GetModuleReadyProperty, "__moduleReady", "i");
   AddPropertySet(SetModuleReadyProperty, "__moduleReady", "i");
   AddPropertyGet(GetNexesProperty, "nexes", "s");
   AddPropertySet(SetNexesProperty, "nexes", "s");
   AddPropertyGet(GetSrcProperty, "src", "s");
@@ skipping 358 matching lines @@
 
 void VideoGlobalLock() {
   g_VideoMutex.Lock();
 }
 
 void VideoGlobalUnlock() {
   g_VideoMutex.Unlock();
 }
 
 }  // namespace plugin