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

src/trusted/plugin/srpc_client.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 <string.h>
 
 #include <map>
 
 #include "native_client/src/shared/platform/nacl_log.h"
-#include "native_client/src/shared/npruntime/npmodule.h"
-
-#include "native_client/src/trusted/plugin/srpc/browser_interface.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/srpc/srpc_client.h"
-#include "native_client/src/trusted/plugin/srpc/utility.h"
-#include "native_client/src/trusted/plugin/srpc/desc_based_handle.h"
+#include "native_client/src/trusted/plugin/browser_interface.h"
+#include "native_client/src/trusted/plugin/connected_socket.h"
+#include "native_client/src/trusted/plugin/desc_based_handle.h"
+#include "native_client/src/trusted/plugin/plugin.h"
+#include "native_client/src/trusted/plugin/scriptable_handle.h"
+#include "native_client/src/trusted/plugin/srpc_client.h"
+#include "native_client/src/trusted/plugin/utility.h"
 
 namespace {
 
 // TODO(sehr): again, not reentrant.  See bug 605.
 PLUGIN_JMPBUF srpc_env;
 
 void SignalHandler(int value) {
   PLUGIN_PRINTF(("SrpcClient::SignalHandler()\n"));
   PLUGIN_LONGJMP(srpc_env, value);
 }
@@ skipping 131 matching lines @@
     PLUGIN_PRINTF(("SrpcClient::Invoke: returned err %s\n",
                    NaClSrpcErrorString(err)));
     return false;
   }
 
   PLUGIN_PRINTF(("SrpcClient::Invoke: done\n"));
   return true;
 }
 
 }  // namespace plugin