Remove dependency of plugin infobar delegates on PluginObserver.

chrome/browser/plugins/plugin_infobar_delegates.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_PLUGINS_PLUGIN_INFOBAR_DELEGATES_H_
 #define CHROME_BROWSER_PLUGINS_PLUGIN_INFOBAR_DELEGATES_H_
 
 #include "base/callback.h"
 #include "chrome/browser/api/infobars/confirm_infobar_delegate.h"
 #include "googleurl/src/gurl.h"
 
 #if defined(ENABLE_PLUGIN_INSTALLATION)
 #include "chrome/browser/plugins/plugin_installer_observer.h"
 #endif  // defined(ENABLE_PLUGIN_INSTALLATION)
 
 class InfoBarService;
 class HostContentSettingsMap;
-class PluginObserver;
+
+namespace content {
+class WebContents;
+}
 
 // Base class for blocked plug-in infobars.
 class PluginInfoBarDelegate : public ConfirmInfoBarDelegate {
  public:
   PluginInfoBarDelegate(InfoBarService* infobar_service,
                         const string16& name,
                         const std::string& identifier);
 
  protected:
   virtual ~PluginInfoBarDelegate();
@@ skipping 40 matching lines @@
   HostContentSettingsMap* content_settings_;
 
   DISALLOW_COPY_AND_ASSIGN(UnauthorizedPluginInfoBarDelegate);
 };
 
 #if defined(ENABLE_PLUGIN_INSTALLATION)
 // Infobar that's shown when a plug-in is out of date.
 class OutdatedPluginInfoBarDelegate : public PluginInfoBarDelegate,
                                       public WeakPluginInstallerObserver {
  public:
-  static InfoBarDelegate* Create(PluginObserver* observer,
+  static InfoBarDelegate* Create(content::WebContents* web_contents,
                                  PluginInstaller* installer);
 
  private:
-  OutdatedPluginInfoBarDelegate(PluginObserver* observer,
+  OutdatedPluginInfoBarDelegate(content::WebContents* web_contents,
                                 PluginInstaller* installer,
                                 const string16& message);
   virtual ~OutdatedPluginInfoBarDelegate();
 
   // PluginInfoBarDelegate:
   virtual string16 GetMessageText() const OVERRIDE;
   virtual string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
   virtual bool Accept() OVERRIDE;
   virtual bool Cancel() OVERRIDE;
   virtual void InfoBarDismissed() OVERRIDE;
   virtual bool LinkClicked(WindowOpenDisposition disposition) OVERRIDE;
   virtual std::string GetLearnMoreURL() const OVERRIDE;
 
   // PluginInstallerObserver:
   virtual void DownloadStarted() OVERRIDE;
   virtual void DownloadError(const std::string& message) OVERRIDE;
   virtual void DownloadCancelled() OVERRIDE;
   virtual void DownloadFinished() OVERRIDE;
 
   // WeakPluginInstallerObserver:
   virtual void OnlyWeakObserversLeft() OVERRIDE;
 
   // Replaces this infobar with one showing |message|. The new infobar will
   // not have any buttons (and not call the callback).
   void ReplaceWithInfoBar(const string16& message);
 
-  // Has the same lifetime as TabContents, which owns us
-  // (transitively via InfoBarService).
-  PluginObserver* observer_;
-
   string16 message_;
 
   DISALLOW_COPY_AND_ASSIGN(OutdatedPluginInfoBarDelegate);
 };
 
 // The main purpose for this class is to popup/close the infobar when there is
 // a missing plugin.
 class PluginInstallerInfoBarDelegate : public ConfirmInfoBarDelegate,
                                        public WeakPluginInstallerObserver {
  public:
@@ skipping 69 matching lines @@
   virtual string16 GetLinkText() const OVERRIDE;
   virtual bool LinkClicked(WindowOpenDisposition disposition) OVERRIDE;
 
   string16 message_;
 
   DISALLOW_COPY_AND_ASSIGN(PluginMetroModeInfoBarDelegate);
 };
 #endif  // defined(OS_WIN)
 
 #endif  // CHROME_BROWSER_PLUGINS_PLUGIN_INFOBAR_DELEGATES_H_