Remove dependency of plugin infobar delegates on PluginObserver.

chrome/browser/plugins/plugin_infobar_delegates.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/plugins/plugin_infobar_delegates.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/api/infobars/infobar_service.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
-#include "chrome/browser/plugins/plugin_observer.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 125 matching lines @@
     WindowOpenDisposition disposition) {
   content::RecordAction(
       UserMetricsAction("BlockedPluginInfobar.LearnMore"));
   return PluginInfoBarDelegate::LinkClicked(disposition);
 }
 
 #if defined(ENABLE_PLUGIN_INSTALLATION)
 // OutdatedPluginInfoBarDelegate ----------------------------------------------
 
 InfoBarDelegate* OutdatedPluginInfoBarDelegate::Create(
-    PluginObserver* observer,
+    content::WebContents* web_contents,
     PluginInstaller* installer) {
   string16 message;
   switch (installer->state()) {
     case PluginInstaller::INSTALLER_STATE_IDLE:
       message = l10n_util::GetStringFUTF16(IDS_PLUGIN_OUTDATED_PROMPT,
                                            installer->name());
       break;
     case PluginInstaller::INSTALLER_STATE_DOWNLOADING:
       message = l10n_util::GetStringFUTF16(IDS_PLUGIN_DOWNLOADING,
                                            installer->name());
       break;
   }
   return new OutdatedPluginInfoBarDelegate(
-      observer, installer, message);
+      web_contents, installer, message);
 }
 
 OutdatedPluginInfoBarDelegate::OutdatedPluginInfoBarDelegate(
-    PluginObserver* observer,
+    content::WebContents* web_contents,
     PluginInstaller* installer,
     const string16& message)
     : PluginInfoBarDelegate(
           InfoBarService::FromTabContents(
-              TabContents::FromWebContents(observer->web_contents())),
+              TabContents::FromWebContents(web_contents)),
           installer->name(),
           installer->identifier()),
       WeakPluginInstallerObserver(installer),
-      observer_(observer),
       message_(message) {
   content::RecordAction(UserMetricsAction("OutdatedPluginInfobar.Shown"));
   std::string name = UTF16ToUTF8(installer->name());
   if (name == webkit::npapi::PluginGroup::kJavaGroupName)
     content::RecordAction(
         UserMetricsAction("OutdatedPluginInfobar.Shown.Java"));
   else if (name == webkit::npapi::PluginGroup::kQuickTimeGroupName)
     content::RecordAction(
         UserMetricsAction("OutdatedPluginInfobar.Shown.QuickTime"));
   else if (name == webkit::npapi::PluginGroup::kShockwaveGroupName)
@@ skipping 33 matching lines @@
   if (installer()->state() != PluginInstaller::INSTALLER_STATE_IDLE) {
     NOTREACHED();
     return false;
   }
 
   content::WebContents* web_contents = owner()->GetWebContents();
   if (installer()->url_for_display()) {
     installer()->OpenDownloadURL(web_contents);
   } else {
     installer()->StartInstalling(
-        TabContents::FromWebContents(observer_->web_contents()));
+        TabContents::FromWebContents(web_contents));
   }
   return false;
 }
 
 bool OutdatedPluginInfoBarDelegate::Cancel() {
   content::RecordAction(
       UserMetricsAction("OutdatedPluginInfobar.AllowThisTime"));
   LoadBlockedPlugins();
   return true;
 }
@@ skipping 235 matching lines @@
       "https://support.google.com/chrome/?ib_display_in_desktop"));
   OpenURLParams params(
       url, Referrer(),
       (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
       content::PAGE_TRANSITION_LINK, false);
   owner()->GetWebContents()->OpenURL(params);
   return false;
 }
 #endif  // defined(OS_WIN)
 #endif  // defined(ENABLE_PLUGIN_INSTALLATION)