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

src/trusted/plugin/method_map.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.
  */
 
 // Lookup table types for method dispatching.
 
-#ifndef NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SRPC_METHOD_MAP_H
-#define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SRPC_METHOD_MAP_H
+#ifndef NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_METHOD_MAP_H
+#define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_METHOD_MAP_H
 
 #include "native_client/src/include/nacl_macros.h"
 #include "native_client/src/include/portability_string.h"
 #include "native_client/src/shared/srpc/nacl_srpc.h"
 
 #include <limits.h>
 #include <map>
 
 namespace plugin {
 
@@ skipping 90 matching lines @@
   void AddMethod(uintptr_t method_id, MethodInfo* info);
 
  private:
   NACL_DISALLOW_COPY_AND_ASSIGN(MethodMap);
   typedef std::map<uintptr_t, MethodInfo*> MethodMapStorage;
   MethodMapStorage method_map_;
 };
 
 }  // namespace plugin
 
-#endif  // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SRPC_METHOD_MAP_H
+#endif  // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_METHOD_MAP_H