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

src/trusted/plugin/srt_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.
  */
 
 // A representation of a connected socket connection to the service runtime.
 
-#ifndef NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SRPC_SRT_SOCKET_H_
-#define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SRPC_SRT_SOCKET_H_
+#ifndef NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SRT_SOCKET_H_
+#define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SRT_SOCKET_H_
 
 #include "native_client/src/include/nacl_macros.h"
 #include "native_client/src/include/nacl_string.h"
 #include "native_client/src/shared/imc/nacl_imc.h"
-#include "native_client/src/trusted/plugin/srpc/connected_socket.h"
-#include "native_client/src/trusted/plugin/srpc/scriptable_handle.h"
+#include "native_client/src/trusted/plugin/connected_socket.h"
+#include "native_client/src/trusted/plugin/scriptable_handle.h"
 
 struct NaClDesc;
 
 namespace plugin {
 
 class SrtSocket {
  public:
   SrtSocket(ScriptableHandle* s, BrowserInterface* browser_interface);
   ~SrtSocket();
 
@@ skipping 10 matching lines @@
   }
 
  private:
   NACL_DISALLOW_COPY_AND_ASSIGN(SrtSocket);
   ScriptableHandle* connected_socket_;
   BrowserInterface* browser_interface_;
 };  // class SrtSocket
 
 }  // namespace plugin
 
-#endif  // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SRPC_SRT_SOCKET_H_
+#endif  // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SRT_SOCKET_H_