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

src/trusted/plugin/plugin.cc

Index: src/trusted/plugin/plugin.cc
===================================================================
--- src/trusted/plugin/plugin.cc	(revision 2712)
+++ src/trusted/plugin/plugin.cc	(working copy)
@@ -4,7 +4,7 @@
  * be found in the LICENSE file.
  */
 
-#include "native_client/src/trusted/plugin/srpc/plugin.h"
+#include "native_client/src/trusted/plugin/plugin.h"
 
 #include <assert.h>
 #include <fcntl.h>
@@ -22,18 +22,19 @@
 #include "native_client/src/trusted/desc/nacl_desc_conn_cap.h"
 #include "native_client/src/trusted/desc/nacl_desc_wrapper.h"
 #include "native_client/src/trusted/nonnacl_util/sel_ldr_launcher.h"
+// TODO(sehr): move video_update_mode_ to PluginNpapi
 #include "native_client/src/trusted/plugin/npapi/video.h"
 #include "native_client/src/trusted/plugin/origin.h"
-#include "native_client/src/trusted/plugin/srpc/browser_interface.h"
-#include "native_client/src/trusted/plugin/srpc/connected_socket.h"
-#include "native_client/src/trusted/plugin/srpc/nexe_arch.h"
-#include "native_client/src/trusted/plugin/srpc/scriptable_handle.h"
-#include "native_client/src/trusted/plugin/srpc/service_runtime.h"
-#include "native_client/src/trusted/plugin/srpc/shared_memory.h"
-#include "native_client/src/trusted/plugin/srpc/socket_address.h"
-#include "native_client/src/trusted/plugin/srpc/stream_shm_buffer.h"
-#include "native_client/src/trusted/plugin/srpc/string_encoding.h"
-#include "native_client/src/trusted/plugin/srpc/utility.h"
+#include "native_client/src/trusted/plugin/browser_interface.h"
+#include "native_client/src/trusted/plugin/connected_socket.h"
+#include "native_client/src/trusted/plugin/nexe_arch.h"
+#include "native_client/src/trusted/plugin/scriptable_handle.h"
+#include "native_client/src/trusted/plugin/service_runtime.h"
+#include "native_client/src/trusted/plugin/shared_memory.h"
+#include "native_client/src/trusted/plugin/socket_address.h"
+#include "native_client/src/trusted/plugin/stream_shm_buffer.h"
+#include "native_client/src/trusted/plugin/string_encoding.h"
+#include "native_client/src/trusted/plugin/utility.h"
 
 namespace {
 
Property changes on: src/trusted/plugin/plugin.cc
___________________________________________________________________
Added: svn:mergeinfo