Revert 138502 - Move version metadata from PluginGroup into PluginInstaller.

chrome/browser/plugin_installer.h

Index: chrome/browser/plugin_installer.h
===================================================================
--- chrome/browser/plugin_installer.h	(revision 138513)
+++ chrome/browser/plugin_installer.h	(working copy)
@@ -8,7 +8,6 @@
 
 #include "base/observer_list.h"
 #include "base/string16.h"
-#include "base/version.h"
 #include "googleurl/src/gurl.h"
 #include "content/public/browser/download_id.h"
 #include "content/public/browser/download_item.h"
@@ -23,29 +22,19 @@
 class WebContents;
 }
 
-namespace webkit {
-struct WebPluginInfo;
-}
-
 class PluginInstaller : public content::DownloadItem::Observer {
  public:
-  enum InstallerState {
-    INSTALLER_STATE_IDLE,
-    INSTALLER_STATE_DOWNLOADING,
+  enum State {
+    kStateIdle,
+    kStateDownloading,
   };
 
-  // Information about a certain version of the plug-in.
-  enum SecurityStatus {
-    SECURITY_STATUS_UP_TO_DATE,
-    SECURITY_STATUS_OUT_OF_DATE,
-    SECURITY_STATUS_REQUIRES_AUTHORIZATION,
-  };
-
   PluginInstaller(const std::string& identifier,
+                  const GURL& plugin_url,
+                  const GURL& help_url,
                   const string16& name,
                   bool url_for_display,
-                  const GURL& plugin_url,
-                  const GURL& help_url);
+                  bool requires_authorization);
   virtual ~PluginInstaller();
 
   virtual void OnDownloadUpdated(content::DownloadItem* download) OVERRIDE;
@@ -58,12 +47,18 @@
   void AddWeakObserver(WeakPluginInstallerObserver* observer);
   void RemoveWeakObserver(WeakPluginInstallerObserver* observer);
 
-  // Unique identifier for the plug-in.
+  State state() const { return state_; }
+
+  // Unique identifier for the plug-in. Should be kept in sync with the
+  // identifier in plugin_list.cc.
   const std::string& identifier() const { return identifier_; }
 
   // Human-readable name of the plug-in.
   const string16& name() const { return name_; }
 
+  // Whether the plug-in requires user authorization to run.
+  bool requires_authorization() const { return requires_authorization_; }
+
   // 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
@@ -74,15 +69,6 @@
   // URL to open when the user clicks on the "Problems installing?" link.
   const GURL& help_url() const { return help_url_; }
 
-  InstallerState state() const { return state_; }
-
-  // Adds information about a plug-in version.
-  void AddVersion(const Version& version, SecurityStatus status);
-
-  // Returns the security status for the given plug-in (i.e. whether it is
-  // considered out-of-date, etc.)
-  SecurityStatus GetSecurityStatus(const webkit::WebPluginInfo& plugin) const;
-
   // Opens the download URL in a new tab. This method should only be called if
   // |url_for_display| returns true.
   void OpenDownloadURL(content::WebContents* web_contents);
@@ -92,33 +78,24 @@
   // returns false.
   void StartInstalling(TabContentsWrapper* wrapper);
 
-  // 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);
-
  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();
 
+  State state_;
+  ObserverList<PluginInstallerObserver> observers_;
+  ObserverList<WeakPluginInstallerObserver> weak_observers_;
+
   std::string identifier_;
-  string16 name_;
-  bool url_for_display_;
   GURL plugin_url_;
   GURL help_url_;
-  std::map<Version, SecurityStatus, VersionComparator> versions_;
+  string16 name_;
+  bool url_for_display_;
+  bool requires_authorization_;
 
-  InstallerState state_;
-  ObserverList<PluginInstallerObserver> observers_;
-  ObserverList<WeakPluginInstallerObserver> weak_observers_;
-
   DISALLOW_COPY_AND_ASSIGN(PluginInstaller);
 };