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

chrome/browser/plugin_finder.cc

Index: chrome/browser/plugin_finder.cc
diff --git a/chrome/browser/plugin_finder.cc b/chrome/browser/plugin_finder.cc
index a0eaf03cee93f702ee1342ee7fcf23d0ec149f95..245616922e6f77cc41e01cf623d5757f60dff7fc 100644
--- a/chrome/browser/plugin_finder.cc
+++ b/chrome/browser/plugin_finder.cc
@@ -35,18 +35,12 @@ PluginFinder* PluginFinder::GetInstance() {
 }
 
 PluginFinder::PluginFinder() : plugin_list_(LoadPluginList()) {
-  if (!plugin_list_.get()) {
-    NOTREACHED();
+  if (!plugin_list_.get())
     plugin_list_.reset(new DictionaryValue());
-  }
 }
 
 // static
-scoped_ptr<DictionaryValue> PluginFinder::LoadPluginList() {
-  return scoped_ptr<DictionaryValue>(LoadPluginListInternal());
-}
-
-DictionaryValue* PluginFinder::LoadPluginListInternal() {
+DictionaryValue* PluginFinder::LoadPluginList() {
 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
   base::StringPiece json_resource(
       ResourceBundle::GetSharedInstance().GetRawDataResource(