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

src/trusted/plugin/nexe_arch.cc

 /*
  * Copyright 2010 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 "native_client/src/trusted/plugin/srpc/nexe_arch.h"
+#include "native_client/src/trusted/plugin/nexe_arch.h"
 
 #include <stdio.h>
 
 #include "native_client/src/include/portability.h"
 #include "native_client/src/trusted/platform_qualify/nacl_os_qualify.h"
-#include "native_client/src/trusted/plugin/srpc/utility.h"
+#include "native_client/src/trusted/plugin/utility.h"
 
 namespace plugin {
 
 // Returns the kind of SFI sandbox implemented by sel_ldr on this
 // platform: ARM, x86-32, x86-64.
 //
 // This is a function of the current CPU, OS, browser, installed
 // sel_ldr(s).  It is not sufficient to derive the result only from
 // build-time parameters since, for example, an x86-32 plugin is
 // capable of launching a 64-bit NaCl sandbox if a 64-bit sel_ldr is
@@ skipping 90 matching lines @@
   const nacl::string sandbox = GetSandbox();
   PLUGIN_PRINTF(("GetNexeURL(): sandbox='%s' nexes='%s'.\n",
                  sandbox.c_str(), nexes_attr));
   if (FindNexeForSandbox(nexes_attr, sandbox, result)) return true;
   *result = "No Native Client executable was provided for the " + sandbox
       + " sandbox.";
   return false;
 }
 
 }  // namespace plugin