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

src/trusted/plugin/npapi/video.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 representation of 2D graphics used by the av interface.
 
 #ifndef NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_NPAPI_VIDEO_H_
 #define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_NPAPI_VIDEO_H_
@@ skipping 15 matching lines @@
 #else  //  NACL_STANDALONE
 // Don't include video support in Chrome build
 
 #endif  //  NACL_STANDALONE
 
 #include "native_client/src/include/nacl_macros.h"
 #include "native_client/src/include/nacl_platform.h"
 #include "native_client/src/include/portability.h"
 
 #include "native_client/src/shared/npruntime/nacl_npapi.h"
-#include "native_client/src/trusted/plugin/srpc/utility.h"
+#include "native_client/src/trusted/plugin/utility.h"
 #include "native_client/src/trusted/service_runtime/include/sys/audio_video.h"
 #include "native_client/src/trusted/service_runtime/nacl_config.h"
 #include "native_client/src/trusted/service_runtime/sel_util.h"
 #include "native_client/src/untrusted/av/nacl_av_priv.h"
 
 typedef NPWindow PluginWindow;
 
 namespace nacl {
 
 class DescWrapper;
@@ skipping 105 matching lines @@
   bool video_enabled_;
   VideoCallbackData* video_callback_data_;
   ScriptableHandle* video_shared_memory_;
   int video_update_mode_;
   PluginWindow* window_;
 };
 
 }  // namespace plugin
 
 #endif  // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_NPAPI_VIDEO_H_