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

src/trusted/plugin/npapi/scriptable_impl_npapi.h

 /*
  * Copyright 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.
  */
 
 
 // The API specific scriptable object class.
 
 #ifndef NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_NPAPI_SCRIPTABLE_IMPL_NPAPI_H_
 #define 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/nacl_macros.h"
 #include "native_client/src/include/portability.h"
 #include "native_client/src/shared/npruntime/nacl_npapi.h"
 #include "native_client/src/trusted/plugin/api_defines.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/scriptable_handle.h"
+#include "native_client/src/trusted/plugin/utility.h"
 
 namespace plugin {
 
 // Forward declarations for externals.
 class PortableHandle;
 
 // ScriptableImplNpapi encapsulates objects that are scriptable from NPAPI.
 class ScriptableImplNpapi: public NPObject, public plugin::ScriptableHandle {
  public:
   // Create a new ScriptableImplNpapi.
@@ skipping 14 matching lines @@
   // And we need to be able to delete objects when the ref count drops to
   // zero.  To retain that Unref is the only interface that might cause
   // deletion, we need to have a method that can see the private destructor,
   // but can be invoked by NPAPI through the class table.
   static void Deallocate(NPObject* obj);
 };
 
 }  // namespace plugin
 
 #endif  // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_NPAPI_SCRIPTABLE_IMPL_NPAPI_H_