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

src/shared/npruntime/npmodule_rpc_impl.cc

 /*
  * Copyright (c) 2010 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 <limits>
 
 #include "native_client/src/include/nacl_string.h"
 #include "native_client/src/include/portability.h"
 #include "native_client/src/include/checked_cast.h"
 #include "native_client/src/shared/npruntime/npmodule.h"
 
 #include "gen/native_client/src/shared/npruntime/npmodule_rpc.h"
 #include "gen/native_client/src/shared/npruntime/npnavigator_rpc.h"
 #include "native_client/src/include/portability_io.h"
 #include "native_client/src/include/portability_process.h"
 #include "native_client/src/shared/npruntime/nacl_npapi.h"
 #include "native_client/src/shared/npruntime/npobject_proxy.h"
 #include "native_client/src/shared/npruntime/npobject_stub.h"
 #include "native_client/src/shared/npruntime/pointer_translations.h"
 #include "native_client/src/shared/npruntime/structure_translations.h"
 #include "native_client/src/shared/platform/nacl_threads.h"
 #include "native_client/src/trusted/desc/nacl_desc_invalid.h"
 #include "native_client/src/trusted/desc/nacl_desc_wrapper.h"
 #include "native_client/src/trusted/plugin/origin.h"
 #include "native_client/src/trusted/plugin/npapi/browser_impl_npapi.h"
 #include "native_client/src/trusted/plugin/npapi/closure.h"
-#include "native_client/src/trusted/plugin/srpc/utility.h"
+#include "native_client/src/trusted/plugin/utility.h"
 #include "third_party/npapi/bindings/npapi_extensions.h"
 
 using nacl::NPIdentifierToWireFormat;
 using nacl::NPModule;
 using nacl::NPObjectToWireFormat;
 using nacl::NPVariantsToWireFormat;
 using nacl::WireFormatToNPIdentifier;
 using nacl::WireFormatToNPP;
 using nacl::WireFormatToNPObject;
 using nacl::WireFormatToNPString;
@@ skipping 404 matching lines @@
 
 NaClSrpcError AudioRpcServer::AudioSetState(NaClSrpcChannel* channel,
                                             int32_t wire_npp,
                                             int32_t state,
                                             int32_t value) {
   UNREFERENCED_PARAMETER(channel);
   NPModule* module = NPModule::GetModule(wire_npp);
 
   return module->AudioSetState(WireFormatToNPP(wire_npp), state, value);
 }