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

src/trusted/plugin/npapi/multimedia_socket.h

 /*
  * 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.
  */
 
 // The socket class used for the av library to talk to the plugin.
 
 #ifndef NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_NPAPI_MULTIMEDIA_SOCKET_H_
 #define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_NPAPI_MULTIMEDIA_SOCKET_H_
 
 #include "native_client/src/include/nacl_macros.h"
 #include "native_client/src/shared/platform/nacl_sync_checked.h"
-#include "native_client/src/trusted/plugin/srpc/scriptable_handle.h"
+#include "native_client/src/trusted/plugin/scriptable_handle.h"
 
 namespace plugin {
 
 class BrowserInterface;
 class Plugin;
 class ServiceRuntime;
 
 class MultimediaSocket {
  public:
   MultimediaSocket(BrowserInterface* browser_interface,
@@ skipping 23 matching lines @@
     UPCALL_THREAD_EXITED
   } upcall_thread_state_;
 
   bool upcall_thread_should_exit_;
   uint32_t upcall_thread_id_;
 };
 
 }  // namespace plugin
 
 #endif  // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_NPAPI_MULTIMEDIA_SOCKET_H_