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

src/trusted/plugin/npapi/plugin_npapi.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/npapi/plugin_npapi.h"
 
 #include <stdio.h>
 #include <string.h>
 
 #include <limits>
 #include <set>
 
 #include "native_client/src/include/checked_cast.h"
 #include "native_client/src/include/nacl_macros.h"
 #include "native_client/src/include/nacl_string.h"
 #include "native_client/src/include/portability.h"
 
 #include "native_client/src/shared/npruntime/npmodule.h"
 
 #include "native_client/src/trusted/desc/nacl_desc_wrapper.h"
 #include "native_client/src/trusted/handle_pass/browser_handle.h"
 
+#include "native_client/src/trusted/plugin/browser_interface.h"
 #include "native_client/src/trusted/plugin/npapi/async_receive.h"
 #include "native_client/src/trusted/plugin/npapi/browser_impl_npapi.h"
 #include "native_client/src/trusted/plugin/npapi/closure.h"
 #include "native_client/src/trusted/plugin/npapi/multimedia_socket.h"
 #include "native_client/src/trusted/plugin/npapi/scriptable_impl_npapi.h"
 #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/plugin.h"
-#include "native_client/src/trusted/plugin/srpc/scriptable_handle.h"
-#include "native_client/src/trusted/plugin/srpc/stream_shm_buffer.h"
-#include "native_client/src/trusted/plugin/srpc/utility.h"
+#include "native_client/src/trusted/plugin/plugin.h"
+#include "native_client/src/trusted/plugin/scriptable_handle.h"
+#include "native_client/src/trusted/plugin/stream_shm_buffer.h"
+#include "native_client/src/trusted/plugin/utility.h"
 
 namespace {
 
 static bool identifiers_initialized = false;
 
 void InitializeIdentifiers() {
   if (identifiers_initialized) {
     return;
   }
   plugin::PluginNpapi::kHrefIdent = NPN_GetStringIdentifier("href");
@@ skipping 493 matching lines @@
   // It would be nice if the thread interface did not require us to
   // specify a stack size.  This is fairly arbitrary.
   size_t stack_size = 128 << 10;
   NaClThreadCreateJoinable(&plugin->receive_thread_, AsyncReceiveThread, args,
                            stack_size);
   plugin->receive_thread_running_ = true;
   return true;
 }
 
 }  // namespace plugin