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

src/trusted/plugin/plugin.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.
  */
 
 // The portable representation of an instance and root scriptable object.
 // The ActiveX, NPAPI, and Pepper versions of the plugin instantiate
 // subclasses of this class.
 
-#ifndef NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SRPC_PLUGIN_H_
-#define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SRPC_PLUGIN_H_
+#ifndef NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PLUGIN_H_
+#define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PLUGIN_H_
 
 #include <stdio.h>
 
 #include "native_client/src/include/nacl_macros.h"
 #include "native_client/src/include/nacl_string.h"
 #include "native_client/src/trusted/plugin/api_defines.h"
-#include "native_client/src/trusted/plugin/srpc/service_runtime.h"
-#include "native_client/src/trusted/plugin/srpc/portable_handle.h"
-#include "native_client/src/trusted/plugin/srpc/utility.h"
+#include "native_client/src/trusted/plugin/service_runtime.h"
+#include "native_client/src/trusted/plugin/portable_handle.h"
+#include "native_client/src/trusted/plugin/utility.h"
 
 namespace nacl {
 class DescWrapperFactory;
 }  // namespace nacl
 
 namespace plugin {
 
 class StreamShmBuffer;
 class ScriptableHandle;
 
@@ skipping 171 matching lines @@
  public:
   VideoScopedGlobalLock() { VideoGlobalLock(); }
   ~VideoScopedGlobalLock() { VideoGlobalUnlock(); }
 
  private:
   NACL_DISALLOW_COPY_AND_ASSIGN(VideoScopedGlobalLock);
 };
 
 }  // namespace plugin
 
-#endif  // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SRPC_PLUGIN_H_
+#endif  // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PLUGIN_H_