[6] Moves CreateVersionFromString to plugin_utils and updates the callers.

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 59a5052950cf60ac6ac7d8b85a1689af4106de23..2238c031d478446f5ef15add0b80d5da573bd50e 100644
--- a/chrome/browser/plugin_finder.cc
+++ b/chrome/browser/plugin_finder.cc
@@ -8,6 +8,7 @@
 #include "base/json/json_reader.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
+#include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/plugin_installer.h"
@@ -129,12 +130,15 @@ PluginInstaller* PluginFinder::CreateInstaller(
   DCHECK(success);
   bool display_url = false;
   plugin_dict->GetBoolean("displayurl", &display_url);
-
+  string16 group_name_matcher;
+  success = plugin_dict->GetString("group_name_matcher", &group_name_matcher);
+  DCHECK(success);
   PluginInstaller* installer = new PluginInstaller(identifier,
                                                    name,
                                                    display_url,
                                                    GURL(url),
-                                                   GURL(help_url));
+                                                   GURL(help_url),
+                                                   group_name_matcher);
   const ListValue* versions = NULL;
   if (plugin_dict->GetList("versions", &versions)) {
     for (ListValue::const_iterator it = versions->begin();
@@ -161,3 +165,14 @@ PluginInstaller* PluginFinder::CreateInstaller(
   installers_[identifier] = installer;
   return installer;
 }
+
+// Note: this method triggers the lazy initialization for all PluginInstallers.

[Bernhard Bauer, 2012/08/21 19:14:52]

It doesn't matter very much, but what I meant originally was that it's not
obvious why we're calling a method called FindXYZ if we're ignoring the return
value, so I wanted to add the comment right above the method call.

+const std::map<std::string, PluginInstaller*>&
+PluginFinder::GetAllPluginInstallers() {
+  for (DictionaryValue::Iterator plugin_it(*plugin_list_);
+      plugin_it.HasNext(); plugin_it.Advance()) {
+    FindPluginWithIdentifier(plugin_it.key());
+  }
+
+  return installers_;
+}