Bug 1293062 test fixup: name the Flash nptest plugin "Shockwave Flash" so that it passes for Flash during tests.

MozReview-Commit-ID: 7kou5izPgmU

--HG--
extra : rebase_source : 51177992136e72483e35c546a25576f5b10f9f36

dom/plugins/test/mochitest/test_bug1165981.html

@@ -10,7 +10,7 @@
       "use strict";
 
       SimpleTest.waitForExplicitFinish();
-      ok(SpecialPowers.setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED, "Flash Test Plug-in"), "Should find allowed test flash plugin");
+      ok(SpecialPowers.setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED, "Shockwave Flash"), "Should find allowed test flash plugin");
       ok(SpecialPowers.setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED, "Silverlight Test Plug-in"), "Should find allowed test silverlight plugin");
       ok(!SpecialPowers.setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED, "Third Test Plug-in"), "Should not find disallowed plugin");
 
@@ -56,11 +56,11 @@
         pluginElement = document.getElementById("disallowedPlugin");
         is(typeof pluginElement.identifierToStringTest, "undefined", "Should NOT be able to call a function on a disallowed plugin");
 
-        ok(navigator.plugins["Flash Test Plug-in"], "Should have queried a plugin named 'Flash Test Plug-in'");
+        ok(navigator.plugins["Shockwave Flash"], "Should have queried a plugin named 'Shockwave Flash'");
         ok(navigator.plugins["Silverlight Test Plug-in"], "Should have queried a plugin named 'Silverlight Test Plug-in'");
         ok(!navigator.plugins["Third Test Plug-in"], "Should NOT have queried a disallowed plugin named 'Third Test Plug-in'");
 
-        ok(findPlugin("Flash Test Plug-in"), "Should have found a plugin named 'Flash Test Plug-in'");
+        ok(findPlugin("Shockwave Flash"), "Should have found a plugin named 'Shockwave Flash'");
         ok(findPlugin("Silverlight Test Plug-in"), "Should have found a plugin named 'Silverlight Test Plug-in'");
         ok(!findPlugin("Third Test Plug-in"), "Should NOT found a disallowed plugin named 'Third Test Plug-in'");
 

dom/plugins/test/testplugin/flashplugin/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundleVersion</key>
 	<string>1.0.0.0</string>
 	<key>WebPluginName</key>
-	<string>Flash Test Plug-in</string>
+	<string>Shockwave Flash</string>
 	<key>WebPluginDescription</key>
 	<string>Flash plug-in for testing purposes.</string>
 	<key>WebPluginMIMETypes</key>

dom/plugins/test/testplugin/flashplugin/nptest.rc

@@ -31,7 +31,7 @@ BEGIN
             VALUE "InternalName", "npswftest"
             VALUE "MIMEType", "application/x-shockwave-flash-test"
             VALUE "OriginalFilename", "npswftest.dll"
-            VALUE "ProductName", "Flash Test Plug-in"
+            VALUE "ProductName", "Shockwave Flash"
             VALUE "ProductVersion", "1.0"
         END
     END

dom/plugins/test/testplugin/flashplugin/nptest_name.cpp

@@ -2,6 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-const char *sPluginName = "Flash Test Plug-in";
+const char *sPluginName = "Shockwave Flash";
 const char *sPluginDescription = "Flash plug-in for testing purposes.";
 const char *sMimeDescription = "application/x-shockwave-flash-test:swf:Flash test type";