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

tests/fake_browser/fake_browser_test.cc

 /*
  * Copyright 2010 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.
  */
 
 /*
  * TODO(mseaborn): It would be nice to be able to write this in C, but
  * third_party/npapi/bindings/npruntime.h depends on
  * base/basictypes.h, which depends on C++.
@@ skipping 562 matching lines @@
 // TODO(mseaborn): Reduce the amount of boilerplate code duplicated
 // between these test cases.  For example, all the newp() (NPP_New())
 // calls are pretty much the same.  Also, we could use a C++ wrapper
 // for NPObjects to make npruntime calls less verbose.  Adding an
 // extra layer here would also make it easier to run these tests
 // against PPAPI.
 
 void TestNewAndDestroy() {
   printf("Test NPP_New() and NPP_Destroy()...\n");
 
-  NPMIMEType mime_type = const_cast<char*>("application/x-nacl-srpc");
+  NPMIMEType mime_type = const_cast<char*>("application/x-nacl");
   NPP plugin_instance = new NPP_t;
   int argc = 0;
   char** arg_names = NULL;
   char** arg_values = NULL;
   NPSavedData* saved_data = NULL;
   // NPP_New
   CheckRetval(plugin_funcs.newp(mime_type, plugin_instance, NP_EMBED,
                                 argc, arg_names, arg_values, saved_data));
 
   // This reproduced a double-free bug:
   // http://code.google.com/p/nativeclient/issues/detail?id=653.
   // It tests the case where the plugin NPObject is never reffed by
   // the browser.
 
   // NPP_Destroy
   CheckRetval(plugin_funcs.destroy(plugin_instance, NULL));
 
   ASSERT_EQ(all_objects.size(), 0);
   delete plugin_instance;
 }
 
 void TestHelloWorldMethod(const char* nexe_url, bool reverse_deallocate) {
-  NPMIMEType mime_type = const_cast<char*>("application/x-nacl-srpc");
+  NPMIMEType mime_type = const_cast<char*>("application/x-nacl");
   NPP plugin_instance = new NPP_t;
   int argc = 0;
   char** arg_names = NULL;
   char** arg_values = NULL;
   NPSavedData* saved_data = NULL;
   // NPP_New
   CheckRetval(plugin_funcs.newp(mime_type, plugin_instance, NP_EMBED,
                                 argc, arg_names, arg_values, saved_data));
 
   NPObject* plugin_obj;
@@ skipping 25 matching lines @@
   DestroyPluginInstance(plugin_instance, reverse_deallocate);
 }
 
 // This tests for a plugin bug that caused a crash,
 // http://code.google.com/p/nativeclient/issues/detail?id=672.
 // Test running an executable that does not act as an SRPC server.
 void TestMissingSrpcInit() {
   printf("Test failure to init SRPC...\n");
   const char* nexe_url = "http://localhost/hello_world.nexe";
 
-  NPMIMEType mime_type = const_cast<char*>("application/x-nacl-srpc");
+  NPMIMEType mime_type = const_cast<char*>("application/x-nacl");
   NPP plugin_instance = new NPP_t;
   CheckRetval(plugin_funcs.newp(mime_type, plugin_instance, NP_EMBED,
                                 0, NULL, NULL, NULL));
 
   NPObject* plugin_obj;
   CheckRetval(plugin_funcs.getvalue(plugin_instance,
                                     NPPVpluginScriptableNPObject, &plugin_obj));
   NPVariant url;
   STRINGZ_TO_NPVARIANT(nexe_url, url);
   bool is_ok = fb_NPN_SetProperty(plugin_instance, plugin_obj,
@@ skipping 13 matching lines @@
 }
 
 // This tests for a memory and thread leak.  See:
 // http://code.google.com/p/nativeclient/issues/detail?id=791
 // The leak is detected by valgrind, using "--leak-check=full
 // --show-reachable=yes", but not by this test on its own.
 void TestOverlappingLaunch() {
   printf("Test assigning to src twice...\n");
   const char* nexe_url = "http://localhost/spin.nexe";
 
-  NPMIMEType mime_type = const_cast<char*>("application/x-nacl-srpc");
+  NPMIMEType mime_type = const_cast<char*>("application/x-nacl");
   NPP plugin_instance = new NPP_t;
   CheckRetval(plugin_funcs.newp(mime_type, plugin_instance, NP_EMBED,
                                 0, NULL, NULL, NULL));
 
   NPObject* plugin_obj;
   CheckRetval(plugin_funcs.getvalue(plugin_instance,
                                     NPPVpluginScriptableNPObject, &plugin_obj));
   NPVariant url;
   STRINGZ_TO_NPVARIANT(nexe_url, url);
   // Assign to the "src" attribute twice.  The second assignment is
   // done before the download triggered by the first completes.
   CHECK(fb_NPN_SetProperty(plugin_instance, plugin_obj,
                            fb_NPN_GetStringIdentifier("src"), &url));
   CHECK(fb_NPN_SetProperty(plugin_instance, plugin_obj,
                            fb_NPN_GetStringIdentifier("src"), &url));
   fb_NPN_ReleaseObject(plugin_obj);
   // Now allow the download to complete.
   RunQueuedCallbacks(plugin_instance);
 
   DestroyPluginInstance(plugin_instance, false);
 }
 
 void TestAsyncMessages() {
   printf("Test asynchronous messages...\n");
   const char* nexe_url = "http://localhost/async_message_test.nexe";
 
-  NPMIMEType mime_type = const_cast<char*>("application/x-nacl-srpc");
+  NPMIMEType mime_type = const_cast<char*>("application/x-nacl");
   NPP plugin_instance = new NPP_t;
   CheckRetval(plugin_funcs.newp(mime_type, plugin_instance, NP_EMBED,
                                 0, NULL, NULL, NULL));
 
   NPObject* plugin_obj;
   CheckRetval(plugin_funcs.getvalue(plugin_instance,
                                     NPPVpluginScriptableNPObject, &plugin_obj));
   NPVariant url;
   STRINGZ_TO_NPVARIANT(nexe_url, url);
   bool success = fb_NPN_SetProperty(plugin_instance, plugin_obj,
@@ skipping 90 matching lines @@
 
   fb_NPN_ReleaseObject(callback);
 
   DestroyPluginInstance(plugin_instance, /* reverse_deallocate= */ false);
 }
 
 void TestDeferredSrpcInit() {
   printf("Test __startSrpcServices()...\n");
   const char* nexe_url = "http://localhost/deferred_srpc_init.nexe";
 
-  NPMIMEType mime_type = const_cast<char*>("application/x-nacl-srpc");
+  NPMIMEType mime_type = const_cast<char*>("application/x-nacl");
   NPP plugin_instance = new NPP_t;
   CheckRetval(plugin_funcs.newp(mime_type, plugin_instance, NP_EMBED,
                                 0, NULL, NULL, NULL));
 
   NPObject* plugin_obj;
   CheckRetval(plugin_funcs.getvalue(plugin_instance,
                                     NPPVpluginScriptableNPObject, &plugin_obj));
   NPVariant url;
   STRINGZ_TO_NPVARIANT(nexe_url, url);
   CHECK(fb_NPN_SetProperty(plugin_instance, plugin_obj,
@@ skipping 113 matching lines @@
       ++iter) {
     free(iter->second);
   }
   interned_strings.clear();
 
   NaClCondVarDtor(&callback_condvar);
   NaClMutexDtor(&callback_mutex);
 
   return 0;
 }