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

src/trusted/plugin/plugin.h

Index: src/trusted/plugin/plugin.h
===================================================================
--- src/trusted/plugin/plugin.h	(revision 2712)
+++ src/trusted/plugin/plugin.h	(working copy)
@@ -8,17 +8,17 @@
 // The ActiveX, NPAPI, and Pepper versions of the plugin instantiate
 // subclasses of this class.
 
-#ifndef NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SRPC_PLUGIN_H_
-#define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SRPC_PLUGIN_H_
+#ifndef NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PLUGIN_H_
+#define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PLUGIN_H_
 
 #include <stdio.h>
 
 #include "native_client/src/include/nacl_macros.h"
 #include "native_client/src/include/nacl_string.h"
 #include "native_client/src/trusted/plugin/api_defines.h"
-#include "native_client/src/trusted/plugin/srpc/service_runtime.h"
-#include "native_client/src/trusted/plugin/srpc/portable_handle.h"
-#include "native_client/src/trusted/plugin/srpc/utility.h"
+#include "native_client/src/trusted/plugin/service_runtime.h"
+#include "native_client/src/trusted/plugin/portable_handle.h"
+#include "native_client/src/trusted/plugin/utility.h"
 
 namespace nacl {
 class DescWrapperFactory;
@@ -210,4 +210,4 @@
 
 }  // namespace plugin
 
-#endif  // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SRPC_PLUGIN_H_
+#endif  // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PLUGIN_H_
Property changes on: src/trusted/plugin/plugin.h
___________________________________________________________________
Added: svn:mergeinfo