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

src/trusted/plugin/connected_socket.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 <signal.h>
 #include <string.h>
 
 #include "native_client/src/shared/platform/nacl_sync.h"
 #include "native_client/src/shared/platform/nacl_threads.h"
-
 #include "native_client/src/trusted/desc/nacl_desc_imc.h"
 
-#include "native_client/src/trusted/plugin/srpc/connected_socket.h"
-#include "native_client/src/trusted/plugin/srpc/plugin.h"
-#include "native_client/src/trusted/plugin/srpc/srpc_client.h"
-#include "native_client/src/trusted/plugin/srpc/utility.h"
-#include "native_client/src/trusted/plugin/npapi/video.h"
+#include "native_client/src/trusted/plugin/connected_socket.h"
+#include "native_client/src/trusted/plugin/plugin.h"
+#include "native_client/src/trusted/plugin/srpc_client.h"
+#include "native_client/src/trusted/plugin/utility.h"
 
 namespace {
 
 PLUGIN_JMPBUF socket_env;
 
 void SignalHandler(int value) {
   PLUGIN_PRINTF(("ConnectedSocket::SignalHandler()\n"));
 
   PLUGIN_LONGJMP(socket_env, value);
 }
@@ skipping 95 matching lines @@
 
 ConnectedSocket::~ConnectedSocket() {
   PLUGIN_PRINTF(("ConnectedSocket::~ConnectedSocket(%p)\n",
                  static_cast<void*>(this)));
 
   // Free the SRPC connection.
   delete srpc_client_;
 }
 
 }  // namespace plugin