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

src/trusted/plugin/plugin.gyp

 # 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 142 matching lines @@
             '<(DEPTH)/native_client/src/trusted/desc/desc.gyp:nrd_xfer',
             '<(DEPTH)/native_client/src/trusted/nonnacl_util/nonnacl_util.gyp:nonnacl_util_chrome',
             '<(DEPTH)/native_client/src/trusted/service_runtime/service_runtime.gyp:expiration',
             '<(DEPTH)/native_client/src/trusted/service_runtime/service_runtime.gyp:gio_shm',
             '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
           ],
           'sources': [
             '<@(common_sources)',
             '<@(npapi_sources)',
             'nacl_entry_points.cc',
-            'srpc/video_chrome.cc',
+            'npapi/video_chrome.cc',
           ],
         },
       ],
     }],
     ['nacl_standalone==0 and OS=="win"', {
       'targets': [
         {
           'target_name': 'npGoogleNaClPluginChrome64',
           'type': 'static_library',
           'variables': {
             'win_target': 'x64',
           },
           'sources': [
             '<@(common_sources)',
             '<@(npapi_sources)',
             'nacl_entry_points.cc',
-            'srpc/video_chrome.cc',
+            'npapi/video_chrome.cc',
           ],
           'dependencies': [
             '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio64',
             '<(DEPTH)/native_client/src/shared/imc/imc.gyp:google_nacl_imc_c64',
             '<(DEPTH)/native_client/src/shared/npruntime/npruntime.gyp:google_nacl_npruntime64',
             '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform64',
             '<(DEPTH)/native_client/src/trusted/desc/desc.gyp:nrd_xfer64',
             '<(DEPTH)/native_client/src/trusted/nonnacl_util/nonnacl_util.gyp:nonnacl_util_chrome64',
             '<(DEPTH)/native_client/src/trusted/service_runtime/service_runtime.gyp:expiration64',
             '<(DEPTH)/native_client/src/trusted/service_runtime/service_runtime.gyp:gio_shm64',
             '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
           ],
           'configurations': {
             'Common_Base': {
               'msvs_target_platform': 'x64',
             },
           },
         }
       ],
     }],
   ],
 }