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

src/trusted/plugin/ppapi/browser_interface_ppapi.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.
  */
 
 // PPAPI-based implementation of the interface to call browser functionality.
 
 #ifndef NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PPAPI_BROWSER_INTERFACE_PPAPI_H_
 #define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PPAPI_BROWSER_INTERFACE_PPAPI_H_
 
 #include <string>
 
 #include "native_client/src/include/nacl_string.h"
-#include "native_client/src/trusted/plugin/srpc/browser_interface.h"
+#include "native_client/src/trusted/plugin/browser_interface.h"
 #include "ppapi/cpp/instance.h"
 
 namespace pp {
 class Instance;
 }  // namespace
 
 namespace plugin {
 
 class PortableHandle;
 class ScriptableHandle;
@@ skipping 33 matching lines @@
 // Convert from the API-independent instance identifier to the PPAPI
 // PP_Instance.
 pp::Instance* InstanceIdentifierToPPInstance(InstanceIdentifier id);
 // Convert from the PPAPI PP_Instance type to the API-independent instance
 // identifier.
 InstanceIdentifier PPInstanceToInstanceIdentifier(pp::Instance* instance);
 
 }  // namespace plugin
 
 #endif  // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PPAPI_BROWSER_INTERFACE_PPAPI_H_