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

src/trusted/plugin/plugin.gypi

 # Copyright 2009, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
@@ skipping 20 matching lines @@
   'variables': {
     'common_sources': [
       # TODO: we should put a scons file in src/third_party_mod/nacl_plugin
       # which exports a library which is then linked in.
       # Currently this results inlink time symbol clashes
       '<(DEPTH)/native_client/src/third_party_mod/npapi_plugin/np_entry.cc',
       '<(DEPTH)/native_client/src/third_party_mod/npapi_plugin/npn_gate.cc',
       # generic URL-origin / same-domain handling
       'origin.cc',
       # Portable plugin code
-      'srpc/browser_interface.cc',
-      'srpc/connected_socket.cc',
-      'srpc/desc_based_handle.cc',
-      'srpc/method_map.cc',
-      'srpc/nexe_arch.cc',
-      'srpc/plugin.cc',
-      'srpc/portable_handle.cc',
-      'srpc/scriptable_handle.cc',
-      'srpc/service_runtime.cc',
-      'srpc/shared_memory.cc',
-      'srpc/socket_address.cc',
-      'srpc/srpc_client.cc',
-      'srpc/srt_socket.cc',
-      'srpc/stream_shm_buffer.cc',
-      'srpc/string_encoding.cc',
-      'srpc/utility.cc',
+      'browser_interface.cc',
+      'connected_socket.cc',
+      'desc_based_handle.cc',
+      'method_map.cc',
+      'nexe_arch.cc',
+      'plugin.cc',
+      'portable_handle.cc',
+      'scriptable_handle.cc',
+      'service_runtime.cc',
+      'shared_memory.cc',
+      'socket_address.cc',
+      'srpc_client.cc',
+      'srt_socket.cc',
+      'stream_shm_buffer.cc',
+      'string_encoding.cc',
+      'utility.cc',
     ],
     'npapi_sources': [
       # NPAPI specific code
       'npapi/async_receive.cc',
       'npapi/browser_impl_npapi.cc',
       'npapi/closure.cc',
       'npapi/multimedia_socket.cc',
       'npapi/npapi_native.cc',
       'npapi/npp_gate.cc',
       'npapi/npp_launcher.cc',
@@ skipping 68 matching lines @@
         'link_settings': {
           'libraries': [
             '-lgdi32.lib',
             '-luser32.lib',
           ],
         },
       }],
     ],
   },
 }