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

src/trusted/plugin/npapi/multimedia_socket.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/multimedia_socket.h"
 
 #include <string.h>
 
 #include "native_client/src/include/portability_io.h"
 #include "native_client/src/shared/platform/nacl_sync.h"
 #include "native_client/src/shared/platform/nacl_sync_checked.h"
 #include "native_client/src/shared/platform/nacl_threads.h"
 #include "native_client/src/shared/platform/nacl_time.h"
 
 #include "native_client/src/trusted/desc/nacl_desc_imc.h"
 
+#include "native_client/src/trusted/plugin/browser_interface.h"
 #include "native_client/src/trusted/plugin/npapi/plugin_npapi.h"
 #include "native_client/src/trusted/plugin/npapi/video.h"
-#include "native_client/src/trusted/plugin/srpc/browser_interface.h"
-#include "native_client/src/trusted/plugin/srpc/service_runtime.h"
-#include "native_client/src/trusted/plugin/srpc/shared_memory.h"
-#include "native_client/src/trusted/plugin/srpc/srpc_client.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/shared_memory.h"
+#include "native_client/src/trusted/plugin/srpc_client.h"
+#include "native_client/src/trusted/plugin/utility.h"
 
 namespace {
 
 uintptr_t kNaClMultimediaBridgeIdent;
 
 int const kMaxUpcallThreadWaitSec = 5;
 int const kNanoXinMicroX = 1000;
 
 // NB: InitializeIdentifiers is not thread-safe.
 void InitializeIdentifiers(plugin::BrowserInterface* browser_interface) {
@@ skipping 227 matching lines @@
                                              METHOD_CALL,
                                              &params);
   PLUGIN_PRINTF(("MultmediaSocket::InitializeModuleMultimedia:"
                  " returned %d\n", static_cast<int>(rpc_result)));
   desc[1]->Delete();
 
   return rpc_result;
 }
 
 }  // namespace plugin