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

src/trusted/plugin/plugin.cc

 /*
  * Copyright 2008 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.
  */
 
-#include "native_client/src/trusted/plugin/srpc/plugin.h"
+#include "native_client/src/trusted/plugin/plugin.h"
 
 #include <assert.h>
 #include <fcntl.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
 
 #include "native_client/src/include/nacl_string.h"
 #include "native_client/src/include/portability_string.h"
 #include "native_client/src/trusted/desc/nacl_desc_base.h"
 #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 {
 
 static int32_t stringToInt32(char* src) {
   return strtol(src,  // NOLINT(runtime/deprecated_fn)
                 static_cast<char**>(NULL), 0);
 }
 
 // TODO(sehr): using a static jmpbuf here has several problems.  Notably we
 // cannot reliably handle errors when there are multiple plugins in the same
@@ skipping 580 matching lines @@
 
 void VideoGlobalLock() {
   g_VideoMutex.Lock();
 }
 
 void VideoGlobalUnlock() {
   g_VideoMutex.Unlock();
 }
 
 }  // namespace plugin