Move plugin/srpc contents to the more appropriately named plugin/common....

src/trusted/plugin/service_runtime.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/service_runtime.h"
+#include "native_client/src/trusted/plugin/service_runtime.h"
 
 #include <map>
 #include <vector>
 
 #include "native_client/src/include/nacl_string.h"
 #include "native_client/src/include/nacl_macros.h"
 #include "native_client/src/shared/imc/nacl_imc.h"
 #include "native_client/src/shared/platform/nacl_log.h"
 #include "native_client/src/trusted/desc/nacl_desc_imc.h"
 #include "native_client/src/trusted/desc/nrd_xfer.h"
 #include "native_client/src/trusted/desc/nrd_xfer_effector.h"
 #include "native_client/src/trusted/handle_pass/browser_handle.h"
 #include "native_client/src/trusted/nonnacl_util/sel_ldr_launcher.h"
 
-#include "native_client/src/trusted/plugin/npapi/multimedia_socket.h"
-#include "native_client/src/trusted/plugin/srpc/browser_interface.h"
-#include "native_client/src/trusted/plugin/srpc/connected_socket.h"
-#include "native_client/src/trusted/plugin/srpc/plugin.h"
-#include "native_client/src/trusted/plugin/srpc/shared_memory.h"
-#include "native_client/src/trusted/plugin/srpc/socket_address.h"
-#include "native_client/src/trusted/plugin/srpc/srt_socket.h"
-#include "native_client/src/trusted/plugin/srpc/scriptable_handle.h"
-#include "native_client/src/trusted/plugin/srpc/utility.h"
+#include "native_client/src/trusted/plugin/browser_interface.h"
+#include "native_client/src/trusted/plugin/connected_socket.h"
+#include "native_client/src/trusted/plugin/plugin.h"
+#include "native_client/src/trusted/plugin/scriptable_handle.h"
+#include "native_client/src/trusted/plugin/shared_memory.h"
+#include "native_client/src/trusted/plugin/socket_address.h"
+#include "native_client/src/trusted/plugin/srt_socket.h"
+#include "native_client/src/trusted/plugin/utility.h"
 
 #include "native_client/src/trusted/service_runtime/nacl_error_code.h"
 #include "native_client/src/trusted/service_runtime/include/sys/nacl_imc_api.h"
 
 using std::vector;
 
 namespace plugin {
 
 ServiceRuntime::ServiceRuntime(
     BrowserInterface* browser_interface,
@@ skipping 362 matching lines @@
                  static_cast<void*>(descs[0])));
   retval = browser_interface_->NewScriptableHandle(
       SocketAddress::New(plugin, descs[0]));
  cleanup:
   imc_desc->Delete();
   PLUGIN_PRINTF((" returning %p\n", static_cast<void*>(retval)));
   return retval;
 }
 
 }  // namespace plugin