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

src/trusted/plugin/npapi/browser_impl_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.
  */
 
 
 // NPAPI implementation of the interface to call browser functionality.
 
 #ifndef NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_NPAPI_BROWSER_IMPL_NPAPI_H_
 #define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_NPAPI_BROWSER_IMPL_NPAPI_H_
 
 #include <stdio.h>
 #include <map>
 
 #include "native_client/src/include/nacl_macros.h"
 #include "native_client/src/include/nacl_string.h"
 #include "native_client/src/include/portability.h"
 #include "native_client/src/shared/npruntime/nacl_npapi.h"
 #include "native_client/src/trusted/plugin/api_defines.h"
-#include "native_client/src/trusted/plugin/srpc/browser_interface.h"
+#include "native_client/src/trusted/plugin/browser_interface.h"
 
 namespace nacl {
 
 class NPModule;
 
 }  // namespace
 
 namespace plugin {
 
 class BrowserImplNpapi : public BrowserInterface {
@@ skipping 26 matching lines @@
 };
 
 // Convert from the API-independent instance identifier to the NPAPI NPP.
 NPP InstanceIdentifierToNPP(InstanceIdentifier id);
 // Convert from the NPAPI NPP type to the API-independent instance identifier.
 InstanceIdentifier NPPToInstanceIdentifier(NPP npp);
 
 }  // namespace plugin
 
 #endif  // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_NPAPI_BROWSER_IMPL_NPAPI_H_