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

src/trusted/plugin/desc_based_handle.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 <setjmp.h>
 #include <stdio.h>
 #include <string.h>
 
 #include <map>
 
-#include "native_client/src/trusted/plugin/srpc/browser_interface.h"
-#include "native_client/src/trusted/plugin/srpc/desc_based_handle.h"
-#include "native_client/src/trusted/plugin/srpc/portable_handle.h"
-#include "native_client/src/trusted/plugin/srpc/shared_memory.h"
-#include "native_client/src/trusted/plugin/srpc/plugin.h"
+#include "native_client/src/trusted/plugin/browser_interface.h"
+#include "native_client/src/trusted/plugin/desc_based_handle.h"
+#include "native_client/src/trusted/plugin/portable_handle.h"
+#include "native_client/src/trusted/plugin/scriptable_handle.h"
+#include "native_client/src/trusted/plugin/shared_memory.h"
+#include "native_client/src/trusted/plugin/plugin.h"
 
-#include "native_client/src/trusted/plugin/srpc/scriptable_handle.h"
 
 namespace {
 
 bool Map(void* obj, plugin::SrpcParams* params) {
   plugin::DescBasedHandle *ptr =
       reinterpret_cast<plugin::DescBasedHandle*>(obj);
   // Create a copy of the wrapper to go on the SharedMemory object.
   nacl::DescWrapper* shm_wrapper =
       ptr->plugin()->wrapper_factory()->MakeGeneric(ptr->wrapper()->desc());
   // Increment the ref count of the contained object.
@@ skipping 55 matching lines @@
 BrowserInterface* DescBasedHandle::browser_interface() const {
   return plugin_->browser_interface();
 }
 
 void DescBasedHandle::LoadMethods() {
   // Methods supported by DescBasedHandle.
   AddMethodCall(Map, "map", "", "h");
 }
 
 }  // namespace plugin