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

tests/ppapi_example_2d/ppapi_example_2d.stdin

 # First register a bunch of dummy replays with zero count
 # so that those signatures will get registered during "install_upcalls"
 # Note: because of the zero count we do not have to get the parameters right
 #
 # Enumerating all known methods ahead of time helps in many ways:
 # * we can delay registering non zero count replays till later which help
 #   readability
 # * we get an error if for some reason the nexe calls one of these functions.
 #   Sadly, the nexe usually fails silently when a method is missing from a
 #   service
@@ skipping 100 matching lines @@
 echo "*** INIT MODULE"
 replay 1 PPB_GetInterface:s:i  s("PPB_Core;0.3") * i(1)
 replay 1 PPB_GetInterface:s:i  s("PPB_Instance;0.4") * i(1)
 replay 1 PPB_GetInterface:s:i  s("PPB_ImageData;0.3") * i(1)
 replay 1 PPB_GetInterface:s:i  s("PPB_Graphics2D;0.3") * i(1)
 rpc PPP_InitializeModule i(0) ${MODULE} h(pepper_desc) s("${service_string}") * i(0) i(0)
 
 echo
 echo "*** INIT INSTANCE"
 set_variable TAGS C(23,id\000name\000src\000style\000type\000)
-set_variable VALUES C(85,naclModule\000naclModule\000ppapi.nexe\000background-color:gray\000application/x-ppapi-nacl-srpc\000)
+set_variable VALUES C(74,naclModule\000naclModule\000ppapi.nexe\000background-color:gray\000application/x-nacl\000)
 
 # The PPP_GetInterface() call is probably not necessary, we just emulate what
 # happens in real life
 rpc PPP_GetInterface s("PPP_Instance;0.4") * i(0)
 rpc PPP_Instance_DidCreate ${INSTANCE} i(5) ${TAGS} ${VALUES} * i(0)
 
 echo
 echo "*** SETTTING UP VIDEO MEMORY"
 sysv video_handle video_address 65536
 memset ${video_address} 0  ${IMG_SIZE} 0
 checksum ${video_address} 0 ${IMG_SIZE}
 
 echo
 echo "*** TRIGGER REPAINT"
 replay 1 PPB_ImageData_Create:iiCi:i ${INSTANCE} i(0) ${IMG_FMT} i(1) * ${IMG_HANDLE}
 replay 1 PPB_ImageData_Describe:i:Chii ${IMG_HANDLE} * ${IMG_FMT2} h(video_handle) i(${IMG_SIZE}) i(1)
 replay 1 PPB_Graphics2D_Create:iCi:i ${INSTANCE} ${GRAPHICS_FMT} i(0) * ${GRAPHICS_HANLDE}
 replay 1 PPB_Instance_BindGraphics:ii:i ${INSTANCE} ${GRAPHICS_HANLDE} * i(1)
 replay 1 PPB_Graphics2D_ReplaceContents:ii:  ${GRAPHICS_HANLDE}  ${IMG_HANDLE} *
 replay 1 PPB_Graphics2D_Flush:ii:i ${GRAPHICS_HANLDE} i(1) * i(-1)
 replay 1 ReleaseResourceMultipleTimes:ii:  ${IMG_HANDLE} i(1) *
 rpc PPP_Instance_DidChangeView ${INSTANCE} I(4,8,79,400,400) I(4,0,0,400,400) *
 
 echo
 echo "*** CHECKING MEMORY"
 checksum ${video_address} 0 ${IMG_SIZE}
 
 rpc PPP_ShutdownModule *