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

src/trusted/plugin/npapi/closure.h

 /*
  * 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.
  */
 
 // Generic and specialized closure classes.
 // TODO(sehr): Closure support needs to be factored to be made portable.
 
 
 #ifndef NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_NPAPI_CLOSURE_H_
 #define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_NPAPI_CLOSURE_H_
 
 #include "native_client/src/include/nacl_macros.h"
 #include "native_client/src/include/nacl_string.h"
 #include "native_client/src/shared/npruntime/npmodule.h"
 #include "native_client/src/trusted/plugin/npapi/browser_impl_npapi.h"
-#include "native_client/src/trusted/plugin/srpc/plugin.h"
+#include "native_client/src/trusted/plugin/plugin.h"
 
 namespace plugin {
 
   class StreamShmBuffer;
 
 // Closure base class.  Following our C++ style rules, we have
 // an explicit Run method rather than overload the operator().
 //
 // This is pretty generic, actually, and not restricted to be used for
 // notification callbacks.
@@ skipping 70 matching lines @@
   NACL_DISALLOW_COPY_AND_ASSIGN(NpGetUrlClosure);
   nacl::NPModule* module_;
   NPP npp_;
   int32_t notify_data_;
   bool call_url_notify_;
 };
 
 }  // namespace plugin
 
 #endif  // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_NPAPI_CLOSURE_H_