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

chrome/browser/plugin_installer.h

 // 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.
 
 #ifndef CHROME_BROWSER_PLUGIN_INSTALLER_H_
 #define CHROME_BROWSER_PLUGIN_INSTALLER_H_
 
 #include "base/observer_list.h"
 #include "base/string16.h"
 #include "base/version.h"
@@ skipping 26 matching lines @@
   enum SecurityStatus {
     SECURITY_STATUS_UP_TO_DATE,
     SECURITY_STATUS_OUT_OF_DATE,
     SECURITY_STATUS_REQUIRES_AUTHORIZATION,
   };
 
   PluginInstaller(const std::string& identifier,
                   const string16& name,
                   bool url_for_display,
                   const GURL& plugin_url,
-                  const GURL& help_url);
+                  const GURL& help_url,
+                  const string16& group_name_matcher);
   virtual ~PluginInstaller();
 
   virtual void OnDownloadUpdated(content::DownloadItem* download) OVERRIDE;
   virtual void OnDownloadDestroyed(content::DownloadItem* download) OVERRIDE;
 
   void AddObserver(PluginInstallerObserver* observer);
   void RemoveObserver(PluginInstallerObserver* observer);
 
   void AddWeakObserver(WeakPluginInstallerObserver* observer);
   void RemoveWeakObserver(WeakPluginInstallerObserver* observer);
 
   // Unique identifier for the plug-in.
   const std::string& identifier() const { return identifier_; }
 
   // Human-readable name of the plug-in.
   const string16& name() const { return name_; }
 
+  // A substring used in matching similar plug-ins.
+  const string16& group_name_matcher() const { return group_name_matcher_; }
+
   // If |url_for_display| is false, |plugin_url| is the URL of the download page
   // for the plug-in, which should be opened in a new tab. If it is true,
   // |plugin_url| is the URL of the plug-in installer binary, which can be
   // directly downloaded.
   bool url_for_display() const { return url_for_display_; }
   const GURL& plugin_url() const { return plugin_url_; }
 
   // URL to open when the user clicks on the "Problems installing?" link.
   const GURL& help_url() const { return help_url_; }
 
@@ skipping 13 matching lines @@
   // Starts downloading the download URL and opens the downloaded file
   // when finished. This method should only be called if |url_for_display|
   // returns false.
   void StartInstalling(TabContents* tab_contents);
 
   // If |status_str| describes a valid security status, writes it to |status|
   // and returns true, else returns false and leaves |status| unchanged.
   static bool ParseSecurityStatus(const std::string& status_str,
                                   SecurityStatus* status);
 
+  // Returns matcher part of configured plug-in group names,
+  // or the filename without extension if the name is empty.
+  static string16 GetGroupName(const webkit::WebPluginInfo& plugin);
+
+  // Generates the (short) identifier string for the given plug-in.
+  // It searches in configured plug-in groups first, and returns the identifier
+  // if a match was found, otherwise it uses the base name of the file path.
+  static std::string GetIdentifier(const webkit::WebPluginInfo& plugin);
  private:
   struct VersionComparator {
     bool operator() (const Version& lhs, const Version& rhs) const;
   };
 
   void DownloadStarted(scoped_refptr<content::DownloadManager> dlm,
                        content::DownloadId download_id,
                        net::Error error);
   void DownloadError(const std::string& msg);
   void DownloadCancelled();
+  static PluginInstaller* MatchWithConfiguredPlugins(
+      const webkit::WebPluginInfo& plugin);
 
   std::string identifier_;
   string16 name_;
+  string16 group_name_matcher_;
   bool url_for_display_;
   GURL plugin_url_;
   GURL help_url_;
   std::map<Version, SecurityStatus, VersionComparator> versions_;
 
   InstallerState state_;
   ObserverList<PluginInstallerObserver> observers_;
   ObserverList<WeakPluginInstallerObserver> weak_observers_;
 
   DISALLOW_COPY_AND_ASSIGN(PluginInstaller);
 };
 
 #endif  // CHROME_BROWSER_PLUGIN_INSTALLER_H_