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

src/trusted/plugin/npapi/browser_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.
  */
 
 
 // Portable interface for browser interaction - NPAPI implementation
 
 #include "native_client/src/trusted/plugin/npapi/browser_impl_npapi.h"
 
 #include <setjmp.h>
 #include <stdio.h>
 #include <string.h>
 
 #include <map>
 
 #include "native_client/src/include/checked_cast.h"
 #include "native_client/src/include/nacl_elf.h"
 #include "native_client/src/include/nacl_string.h"
 #include "native_client/src/include/portability_io.h"
 #include "native_client/src/shared/npruntime/nacl_npapi.h"
 #include "native_client/src/trusted/plugin/npapi/plugin_npapi.h"
 #include "native_client/src/trusted/plugin/npapi/scriptable_impl_npapi.h"
-#include "native_client/src/trusted/plugin/srpc/utility.h"
+#include "native_client/src/trusted/plugin/utility.h"
 
 using nacl::assert_cast;
 
 namespace {
 
 // Create an NPString from a C string.
 bool CopyToNPString(const nacl::string& string, NPString* npstr) {
   // We have to create a copy of the string using NPN_MemAlloc, because the
   // browser sometimes will free the string using NPN_MemFree. Strdup and
   // friends use malloc, which would mix the memory allocators.
@@ skipping 158 matching lines @@
 
 NPP InstanceIdentifierToNPP(InstanceIdentifier id) {
   return reinterpret_cast<NPP>(assert_cast<intptr_t>(id));
 }
 
 InstanceIdentifier NPPToInstanceIdentifier(NPP npp) {
   return assert_cast<InstanceIdentifier>(reinterpret_cast<intptr_t>(npp));
 }
 
 }  // namespace plugin