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

src/trusted/plugin/npapi/npp_launcher.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.
  */
 
 
 /**
   * @file
   * Defines the basic API for the nacl browser plugin
@@ skipping 37 matching lines @@
 #if defined(EXPIRATION_CHECK)
                                   " and expires on "
                                   EMBED(EXPIRATION_MONTH) "/"
                                   EMBED(EXPIRATION_DAY) "/"
                                   EMBED(EXPIRATION_YEAR)
                                   " (mm/dd/yyyy)"
 #endif
                                   "";
 
 char* NPP_GetMIMEDescription() {
-  return const_cast<char*>("application/x-nacl-srpc:nexe:NativeClient"
+  return const_cast<char*>("application/x-nacl:nexe:NativeClient"
                            " Simple RPC module;");
 }
 
 // Invoked from NP_Initialize()
 NPError NPP_Initialize() {
   PLUGIN_PRINTF(("NPP_Initialize\n"));
   NaClNrdAllModulesInit();
   return NPERR_NO_ERROR;
 }
 
@@ skipping 14 matching lines @@
   UNREFERENCED_PARAMETER(saved);
   PLUGIN_PRINTF(("NPP_New '%s'\n", plugin_type));
 
   for (int i = 0; i < argc; ++i) {
     PLUGIN_PRINTF(("args %u: '%s' '%s'\n", i, argn[i], argv[i]));
   }
 
   if (npp == NULL) {
     return NPERR_INVALID_INSTANCE_ERROR;
   }
-  if (strcmp(plugin_type, "application/x-nacl-srpc") == 0) {
+  if (strcmp(plugin_type, "application/x-nacl") == 0) {
     npp->pdata = static_cast<nacl::NPInstance*>(
         plugin::PluginNpapi::New(npp, argc, argn, argv));
     if (npp->pdata == NULL) {
       return NPERR_OUT_OF_MEMORY_ERROR;
     }
   }
   if (npp->pdata == NULL) {
     return NPERR_OUT_OF_MEMORY_ERROR;
   }
 #ifndef NACL_STANDALONE
@@ skipping 131 matching lines @@
                    void* notify_data) {
   PLUGIN_PRINTF(("NPP_URLNotify(%s)\n", url));
   if (npp == NULL) {
     return;
   }
   nacl::NPInstance* module = static_cast<nacl::NPInstance*>(npp->pdata);
   if (module != NULL) {
     module->URLNotify(url, reason, notify_data);
   }
 }