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

chrome/browser/plugin_finder.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 "chrome/browser/plugin_finder.h"
 
 #include "base/bind.h"
 #include "base/json/json_reader.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
@@ skipping 17 matching lines @@
 }
 
 // static
 PluginFinder* PluginFinder::GetInstance() {
   // PluginFinder::GetInstance() is the only method that's allowed to call
   // Singleton<PluginFinder>::get().
   return Singleton<PluginFinder>::get();
 }
 
 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(
           IDR_PLUGIN_DB_JSON));
   std::string error_str;
   scoped_ptr<base::Value> value(base::JSONReader::ReadAndReturnError(
       json_resource.as_string(),
       base::JSON_PARSE_RFC,
       NULL,
       &error_str));
@@ skipping 80 matching lines @@
   plugin_dict->GetBoolean("requires_authorization", &requires_authorization);
   PluginInstaller* installer = new PluginInstaller(identifier,
                                                    GURL(url),
                                                    GURL(help_url),
                                                    name,
                                                    display_url,
                                                    requires_authorization);
   installers_[identifier] = installer;
   return installer;
 }