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

src/trusted/plugin/npapi/plugin_npapi.h

 /*
  * 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.
  */
 
 #ifndef NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_NPAPI_PLUGIN_NPAPI_H_
 #define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_NPAPI_PLUGIN_NPAPI_H_
 
 #include "native_client/src/include/nacl_macros.h"
 #include "native_client/src/include/portability.h"
 #include "native_client/src/trusted/plugin/npapi/npinstance.h"
-#include "native_client/src/trusted/plugin/srpc/plugin.h"
+#include "native_client/src/trusted/plugin/plugin.h"
 
 namespace nacl {
 
 class NPModule;
 
 }  // namespace
 
 namespace plugin {
 
 class MultimediaSocket;
@@ skipping 60 matching lines @@
   ~PluginNpapi();
   nacl::NPModule* module_;
   NPObject* nacl_instance_;
   VideoMap* video_;
   MultimediaSocket* multimedia_channel_;
 };
 
 }  // namespace plugin
 
 #endif  // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_NPAPI_PLUGIN_NPAPI_H_