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

src/trusted/plugin/npapi/scriptable_impl_npapi.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.
  */
 
 
 // NPAPI Scriptable handle implementation.
 
 #include "native_client/src/trusted/plugin/npapi/scriptable_impl_npapi.h"
 
 #include <stdio.h>
 #include <string.h>
 
 #include <set>
 
 #include "native_client/src/include/checked_cast.h"
 #include "native_client/src/include/portability.h"
 #include "third_party/npapi/bindings/npapi.h"
+#include "native_client/src/shared/srpc/nacl_srpc.h"
 #include "native_client/src/trusted/plugin/npapi/browser_impl_npapi.h"
 #include "native_client/src/trusted/plugin/npapi/npapi_native.h"
 #include "native_client/src/trusted/plugin/npapi/plugin_npapi.h"
 #include "native_client/src/trusted/plugin/npapi/ret_array.h"
-#include "native_client/src/trusted/plugin/srpc/socket_address.h"
-#include "native_client/src/trusted/plugin/srpc/utility.h"
-#include "native_client/src/shared/srpc/nacl_srpc.h"
+#include "native_client/src/trusted/plugin/socket_address.h"
+#include "native_client/src/trusted/plugin/utility.h"
 
 
 namespace {
 
 // Functions for marshalling arguments from NPAPI world into NaCl SRPC and
 // vice versa.
 
 uint32_t ArgsLength(const NaClSrpcArg* index[]) {
   uint32_t i;
   for (i = 0; (i < NACL_SRPC_MAX_ARGS) && NULL != index[i]; ++i) {
@@ skipping 710 matching lines @@
 }
 
 ScriptableImplNpapi::ScriptableImplNpapi(PortableHandle* handle)
   : ScriptableHandle(handle) {
   PLUGIN_PRINTF(("ScriptableImplNpapi::ScriptableImplNpapi(%p, %p)\n",
                  static_cast<void*>(this),
                  static_cast<void*>(handle)));
 }
 
 }  // namespace plugin