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

src/trusted/plugin/method_map.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 <map>
 
 #include "native_client/src/include/checked_cast.h"
 #include "native_client/src/shared/platform/nacl_log.h"
-
 #include "native_client/src/trusted/desc/nacl_desc_base.h"
 #include "native_client/src/trusted/nonnacl_util/sel_ldr_launcher.h"
-
-#include "native_client/src/trusted/plugin/srpc/method_map.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/method_map.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"
 
 using nacl::assert_cast;
 
 namespace {
 
 uint32_t ArgsLength(NaClSrpcArg** index) {
   uint32_t i;
   for (i = 0; (i < NACL_SRPC_MAX_ARGS) && NULL != index[i]; ++i) {
     // Empty body.  Avoids warning.
   }
@@ skipping 157 matching lines @@
 
 void MethodMap::AddMethod(uintptr_t method_id, MethodInfo *info) {
   if (method_map_.find(method_id) != method_map_.end()) {
     // the method already exists
     abort();
   }
   method_map_[method_id] = info;
 }
 
 }  // namespace plugin