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

src/trusted/plugin/desc_based_handle.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.
  */
 
 // Portable representation of scriptable NaClDesc.
 
-#ifndef NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SRPC_DESC_BASED_HANDLE_H_
-#define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SRPC_DESC_BASED_HANDLE_H_
+#ifndef NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_DESC_BASED_HANDLE_H_
+#define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_DESC_BASED_HANDLE_H_
 
 #include <stdio.h>
 #include <map>
 
 #include "native_client/src/include/nacl_macros.h"
 #include "native_client/src/trusted/desc/nacl_desc_wrapper.h"
-#include "native_client/src/trusted/plugin/srpc/portable_handle.h"
-#include "native_client/src/trusted/plugin/srpc/utility.h"
+#include "native_client/src/trusted/plugin/portable_handle.h"
+#include "native_client/src/trusted/plugin/utility.h"
 
 struct NaClDesc;
 
 namespace nacl {
 class DescWrapper;
 }  // namespace nacl
 
 namespace plugin {
 
 class Plugin;
@@ skipping 23 matching lines @@
 
  private:
   NACL_DISALLOW_COPY_AND_ASSIGN(DescBasedHandle);
   void LoadMethods();
   Plugin* plugin_;
   nacl::DescWrapper* wrapper_;
 };
 
 }  // namespace plugin
 
-#endif  // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SRPC_DESC_BASED_HANDLE_H_
+#endif  // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_DESC_BASED_HANDLE_H_