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

src/trusted/plugin/scriptable_handle.h

Index: src/trusted/plugin/scriptable_handle.h
===================================================================
--- src/trusted/plugin/scriptable_handle.h	(revision 2712)
+++ src/trusted/plugin/scriptable_handle.h	(working copy)
@@ -8,10 +8,10 @@
 // The browser scriptable container class.  The methods on this class
 // are defined in the specific API directories.
 
-#ifndef NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SRPC_SCRIPTABLE_HANDLE_H_
-#define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SRPC_SCRIPTABLE_HANDLE_H_
+#ifndef NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SCRIPTABLE_HANDLE_H_
+#define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SCRIPTABLE_HANDLE_H_
 
-#include "native_client/src/trusted/plugin/srpc/scriptable_handle.h"
+#include "native_client/src/trusted/plugin/scriptable_handle.h"
 
 #include <stdio.h>
 #include <string.h>
@@ -21,7 +21,7 @@
 #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/trusted/plugin/srpc/utility.h"
+#include "native_client/src/trusted/plugin/utility.h"
 
 namespace plugin {
 
@@ -55,4 +55,4 @@
 
 }  // namespace plugin
 
-#endif  // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SRPC_SCRIPTABLE_HANDLE_H_
+#endif  // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SCRIPTABLE_HANDLE_H_
Property changes on: src/trusted/plugin/scriptable_handle.h
___________________________________________________________________
Added: svn:mergeinfo