Fix plug-in identifier for Shockwave and add a unit test.

webkit/plugins/npapi/plugin_list.cc

Index: webkit/plugins/npapi/plugin_list.cc
diff --git a/webkit/plugins/npapi/plugin_list.cc b/webkit/plugins/npapi/plugin_list.cc
index 260fadfefed73b20df98fe8a0f16fbee98d9eee0..5055b535514b77908c0ca066f3f18f2d6b90d3d3 100644
--- a/webkit/plugins/npapi/plugin_list.cc
+++ b/webkit/plugins/npapi/plugin_list.cc
@@ -83,12 +83,13 @@ static const VersionRangeDefinition kSilverlightVersionRange[] = {
 // Similarly, try and share the group definition for plug-ins that are
 // very consistent across OS'es.
 #define kFlashDefinition { \
-    "adobe-flash-player", "Flash", "Shockwave Flash", kFlashVersionRange,\
+    "adobe-flash-player", "Flash", "Shockwave Flash", kFlashVersionRange, \
     arraysize(kFlashVersionRange) }
 
 #define kShockwaveDefinition { \
-    "shockwave", PluginGroup::kShockwaveGroupName, "Shockwave for Director", \
-    kShockwaveVersionRange, arraysize(kShockwaveVersionRange) }
+    "adobe-shockwave", PluginGroup::kShockwaveGroupName, \
+    "Shockwave for Director", kShockwaveVersionRange, \
+    arraysize(kShockwaveVersionRange) }
 
 #define kSilverlightDefinition { \
     "silverlight", PluginGroup::kSilverlightGroupName, "Silverlight", \
@@ -496,6 +497,10 @@ void PluginList::GetPluginPathsToLoad(std::vector<FilePath>* plugin_paths) {
 #endif
 }
 
+const std::vector<PluginGroup*>& PluginList::GetHardcodedPluginGroups() const {
+  return hardcoded_plugin_groups_.get();
+}
+
 void PluginList::SetPlugins(const std::vector<webkit::WebPluginInfo>& plugins) {
   base::AutoLock lock(lock_);