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

src/trusted/plugin/npapi/video.cc

 /*
  * 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.
  */
 
 
 #include "native_client/src/trusted/plugin/npapi/video.h"
 
 #if NACL_OSX
 #include <Carbon/Carbon.h>
 #endif  // NACL_OSX
 #if NACL_WINDOWS
 #include <windows.h>
 #include <windowsx.h>
 #endif  // NACL_WINDOWS
 #if NACL_LINUX && defined(MOZ_X11)
 #include <sched.h>
 #include <X11/Xlib.h>
 #include <X11/Intrinsic.h>
 #include <X11/keysym.h>
 #endif  // NACL_LINUX && defined(MOZ_X11)
 
 #include "native_client/src/include/nacl_base.h"
 #include "native_client/src/include/checked_cast.h"
+#include "native_client/src/trusted/plugin/browser_interface.h"
 #include "native_client/src/trusted/plugin/npapi/browser_impl_npapi.h"
-#include "native_client/src/trusted/plugin/srpc/browser_interface.h"
-#include "native_client/src/trusted/plugin/srpc/plugin.h"
-#include "native_client/src/trusted/plugin/srpc/portable_handle.h"
-#include "native_client/src/trusted/plugin/srpc/scriptable_handle.h"
-#include "native_client/src/trusted/plugin/srpc/shared_memory.h"
+#include "native_client/src/trusted/plugin/plugin.h"
+#include "native_client/src/trusted/plugin/portable_handle.h"
+#include "native_client/src/trusted/plugin/scriptable_handle.h"
+#include "native_client/src/trusted/plugin/shared_memory.h"
 
 using nacl::can_cast;
 using nacl::saturate_cast;
 
 // TODO(nfullagar): this could be cleaner/more readable for
 // platform-specific implementations to go into separate files under
 // platform subdirectories, rather than using ifdefs.
 
 namespace plugin {
 
@@ skipping 1319 matching lines @@
   }
 #if NACL_WINDOWS
   if (window_ && window_->window) {
     SubclassWindow(reinterpret_cast<HWND>(window_->window),
         original_window_procedure_);
   }
 #endif  // NACL_WINDOWS
 }
 
 }  // namespace plugin