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

src/trusted/plugin/ppapi/scriptable_handle_ppapi.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.
  */
 
 // PPAPI-based implementation of the interface for a scriptable object.
 
 #ifndef NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PPAPI_SCRIPTABLE_HANDLE_PPAPI_H_
 #define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PPAPI_SCRIPTABLE_HANDLE_PPAPI_H_
 
-#include "native_client/src/trusted/plugin/srpc/scriptable_handle.h"
+#include "native_client/src/trusted/plugin/scriptable_handle.h"
 #include "ppapi/cpp/scriptable_object.h"
 
 namespace plugin {
 
 class PortableHandle;
 
 // Encapsulates a browser scriptable object for a PPAPI plugin.
 class ScriptableHandlePpapi : public pp::ScriptableObject,
                               public ScriptableHandle {
  public:
@@ skipping 14 matching lines @@
   NACL_DISALLOW_COPY_AND_ASSIGN(ScriptableHandlePpapi);
   // Prevent construction and destruction from outside the class:
   // must use factory New() and base's Delete() methods instead.
   explicit ScriptableHandlePpapi(PortableHandle* handle);
   virtual ~ScriptableHandlePpapi();
 };
 
 }  // namespace plugin
 
 #endif  // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PPAPI_SCRIPTABLE_HANDLE_PPAPI_H_