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

webkit/plugins/npapi/plugin_list.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/plugins/npapi/plugin_list.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
@@ skipping 65 matching lines @@
 // http://support.microsoft.com/kb/2668562
 // http://technet.microsoft.com/en-us/security/Bulletin/MS12-016
 static const VersionRangeDefinition kSilverlightVersionRange[] = {
     { "0", "5", "4.1.10111.0" },
     { "5", "6", "" },
 };
 
 // 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", \
     kSilverlightVersionRange, arraysize(kSilverlightVersionRange) }
 
 #define kChromePdfDefinition { \
     "google-chrome-pdf", "Chrome PDF Viewer", "Chrome PDF Viewer", NULL, 0 }
 
 #define kGoogleTalkDefinition { \
     "google-talk", "Google Talk", "Google Talk", NULL, 0 }
@@ skipping 387 matching lines @@
     GetPluginsInDir(extra_plugin_dirs[i], plugin_paths);
 
   for (size_t i = 0; i < directories_to_scan.size(); ++i)
     GetPluginsInDir(directories_to_scan[i], plugin_paths);
 
 #if defined(OS_WIN)
   GetPluginPathsFromRegistry(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_);
 
   plugins_need_refresh_ = false;
 
   plugin_groups_.reset();
   for (std::vector<webkit::WebPluginInfo>::const_iterator it = plugins.begin();
        it != plugins.end();
        ++it) {
     AddToPluginGroups(*it, &plugin_groups_);
@@ skipping 203 matching lines @@
   }
   return false;
 }
 
 PluginList::~PluginList() {
 }
 
 
 }  // namespace npapi
 }  // namespace webkit