Remove the x-ppapi-nacl-srpc and x-nacl-srpc mime types in favor of the singl...

tests/srpc/nacl.scons

 # -*- python -*-
 # 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.
 
 import platform
 
 Import('env')
 
 
-# In Chrome, we can share the nexe between the NPAPI (built-in) and
-# PPAPI (loaded with --register-pepper-plugins) versions of NaCl, but the html
-# needs to be different to specify different plugin content types:
-# "application/x-nacl-srpc" for srpc nexes with NPAPI plugin and
-# "application/x-ppapi-nacl-srpc" for for srpc nexes with PPAPI plugin.
-# TODO(polina): at some point there should only be "application/x-nacl".
-
-
 ######################################################################
 # Simple RPC basic methods tests
 ######################################################################
 srpc_test_nexe = env.ComponentProgram('srpc_test.nexe', 'srpc_test.c',
                                       EXTRA_LIBS=['srpc', 'm', 'pthread'])
 env.Publish('srpc_test.nexe', 'run',
             ['srpc_basic.html', 'srpc_perf.html', 'srpc_shm.html',
              'srpc_plugin.html',
              env.File('${SCONSTRUCT_DIR}/tests/nacl_js_lib.js') ])
 env.Publish('srpc_test.nexe', 'run',
@@ skipping 215 matching lines @@
     'srpc_shm_browser_ppapi_test.out',
      url='srpc_shm_ppapi.html',
      files=[srpc_shm_nexe,
             env.File('srpc_shm_ppapi.html'),
             env.File('${SCONSTRUCT_DIR}/tests/nacl_js_lib.js'),
             ],
      )
 env.AddNodeToTestSuite(node,
                        ['pepper_browser_tests'],
                        'run_srpc_shm_ppapi_browser_test')