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

src/trusted/plugin/npapi/closure.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 "native_client/src/trusted/plugin/npapi/closure.h"
 
 #include <string.h>
 
 #include "native_client/src/include/nacl_string.h"
 #include "native_client/src/shared/npruntime/npmodule.h"
 #include "native_client/src/shared/platform/nacl_host_desc.h"
 #include "native_client/src/trusted/desc/nacl_desc_invalid.h"
 #include "native_client/src/trusted/desc/nacl_desc_wrapper.h"
+#include "native_client/src/trusted/plugin/desc_based_handle.h"
 #include "native_client/src/trusted/plugin/npapi/browser_impl_npapi.h"
 #include "native_client/src/trusted/plugin/npapi/npapi_native.h"
 #include "native_client/src/trusted/plugin/npapi/plugin_npapi.h"
 #include "native_client/src/trusted/plugin/npapi/scriptable_impl_npapi.h"
 #include "native_client/src/trusted/plugin/origin.h"
-#include "native_client/src/trusted/plugin/srpc/desc_based_handle.h"
-#include "native_client/src/trusted/plugin/srpc/scriptable_handle.h"
-#include "native_client/src/trusted/plugin/srpc/shared_memory.h"
-#include "native_client/src/trusted/plugin/srpc/stream_shm_buffer.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/stream_shm_buffer.h"
 #include "native_client/src/trusted/service_runtime/include/sys/fcntl.h"
 
 struct NPObject;
 
 namespace plugin {
 
 bool Closure::StartDownload() {
   PLUGIN_PRINTF(("StartDownload npp_=%p, requested_url_=%s, this=%p\n",
                  reinterpret_cast<void*>(npp_),
                  requested_url_.c_str(),
@@ skipping 337 matching lines @@
   // If the user requested a notification, invoke NPP_URLNotify.
   if (call_url_notify_) {
     module_->URLNotify(npp_,
                        notify_url.c_str(),
                        notify_reason,
                        reinterpret_cast<void*>(notify_data_));
   }
 }
 
 }  // namespace plugin