Switch PluginObserver to use WebContentsUserData.

chrome/browser/plugins/plugin_observer.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_observer.h"
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/stl_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 28 matching lines @@
 
 #if defined(OS_WIN)
 #include "base/win/metro.h"
 #endif
 
 using content::OpenURLParams;
 using content::PluginService;
 using content::Referrer;
 using content::WebContents;
 
+int PluginObserver::kUserDataKey;
+
 namespace {
 
 #if defined(ENABLE_PLUGIN_INSTALLATION)
 
 // ConfirmInstallDialogDelegate ------------------------------------------------
 
 class ConfirmInstallDialogDelegate : public TabModalConfirmDialogDelegate,
                                      public WeakPluginInstallerObserver {
  public:
-  ConfirmInstallDialogDelegate(TabContents* tab_contents,
+  ConfirmInstallDialogDelegate(content::WebContents* web_contents,
                                PluginInstaller* installer);
 
   // TabModalConfirmDialogDelegate methods:
   virtual string16 GetTitle() OVERRIDE;
   virtual string16 GetMessage() OVERRIDE;
   virtual string16 GetAcceptButtonTitle() OVERRIDE;
   virtual void OnAccepted() OVERRIDE;
   virtual void OnCanceled() OVERRIDE;
 
   // WeakPluginInstallerObserver methods:
   virtual void DownloadStarted() OVERRIDE;
   virtual void OnlyWeakObserversLeft() OVERRIDE;
 
  private:
-  TabContents* tab_contents_;
+  content::WebContents* web_contents_;
 };
 
 ConfirmInstallDialogDelegate::ConfirmInstallDialogDelegate(
-    TabContents* tab_contents,
+    content::WebContents* web_contents,
     PluginInstaller* installer)
-    : TabModalConfirmDialogDelegate(tab_contents->web_contents()),
+    : TabModalConfirmDialogDelegate(web_contents),
       WeakPluginInstallerObserver(installer),
-      tab_contents_(tab_contents) {
+      web_contents_(web_contents) {
 }
 
 string16 ConfirmInstallDialogDelegate::GetTitle() {
   return l10n_util::GetStringFUTF16(
       IDS_PLUGIN_CONFIRM_INSTALL_DIALOG_TITLE, installer()->name());
 }
 
 string16 ConfirmInstallDialogDelegate::GetMessage() {
   return l10n_util::GetStringFUTF16(IDS_PLUGIN_CONFIRM_INSTALL_DIALOG_MSG,
                                     installer()->name());
 }
 
 string16 ConfirmInstallDialogDelegate::GetAcceptButtonTitle() {
   return l10n_util::GetStringUTF16(
       IDS_PLUGIN_CONFIRM_INSTALL_DIALOG_ACCEPT_BUTTON);
 }
 
 void ConfirmInstallDialogDelegate::OnAccepted() {
-  installer()->StartInstalling(tab_contents_);
+  installer()->StartInstalling(TabContents::FromWebContents(web_contents_));
 }
 
 void ConfirmInstallDialogDelegate::OnCanceled() {
 }
 
 void ConfirmInstallDialogDelegate::DownloadStarted() {
   Cancel();
 }
 
 void ConfirmInstallDialogDelegate::OnlyWeakObserversLeft() {
@@ skipping 46 matching lines @@
   }
 
  private:
   // Weak pointer; owns us.
   PluginObserver* observer_;
 
   int routing_id_;
 };
 #endif  // defined(ENABLE_PLUGIN_INSTALLATION)
 
-PluginObserver::PluginObserver(TabContents* tab_contents)
-    : content::WebContentsObserver(tab_contents->web_contents()),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)),
-      tab_contents_(tab_contents) {
+PluginObserver::PluginObserver(content::WebContents* web_contents)
+    : content::WebContentsObserver(web_contents),
+      ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {
 }
 
 PluginObserver::~PluginObserver() {
 #if defined(ENABLE_PLUGIN_INSTALLATION)
   STLDeleteValues(&plugin_placeholders_);
 #endif
 }
 
 void PluginObserver::PluginCrashed(const FilePath& plugin_path) {
   DCHECK(!plugin_path.value().empty());
 
   string16 plugin_name =
       PluginService::GetInstance()->GetPluginDisplayNameByPath(plugin_path);
   gfx::Image* icon = &ResourceBundle::GetSharedInstance().GetNativeImageNamed(
       IDR_INFOBAR_PLUGIN_CRASHED);
-  InfoBarTabHelper* infobar_helper = tab_contents_->infobar_tab_helper();
+  TabContents* tab_contents = TabContents::FromWebContents(web_contents());
+  InfoBarTabHelper* infobar_helper = tab_contents->infobar_tab_helper();
   infobar_helper->AddInfoBar(
       new SimpleAlertInfoBarDelegate(
           infobar_helper,
           icon,
           l10n_util::GetStringFUTF16(IDS_PLUGIN_CRASHED_PROMPT, plugin_name),
           true));
 }
 
 bool PluginObserver::OnMessageReceived(const IPC::Message& message) {
   IPC_BEGIN_MESSAGE_MAP(PluginObserver, message)
@@ skipping 14 matching lines @@
 
     IPC_MESSAGE_UNHANDLED(return false)
   IPC_END_MESSAGE_MAP()
 
   return true;
 }
 
 void PluginObserver::OnBlockedUnauthorizedPlugin(
     const string16& name,
     const std::string& identifier) {
-  InfoBarTabHelper* infobar_helper = tab_contents_->infobar_tab_helper();
+  TabContents* tab_contents = TabContents::FromWebContents(web_contents());
+  InfoBarTabHelper* infobar_helper = tab_contents->infobar_tab_helper();
   infobar_helper->AddInfoBar(
       new UnauthorizedPluginInfoBarDelegate(
           infobar_helper,
-          tab_contents_->profile()->GetHostContentSettingsMap(),
+          tab_contents->profile()->GetHostContentSettingsMap(),
           name, identifier));
 }
 
 void PluginObserver::OnBlockedOutdatedPlugin(int placeholder_id,
                                              const std::string& identifier) {
 #if defined(ENABLE_PLUGIN_INSTALLATION)
   PluginFinder::Get(base::Bind(&PluginObserver::FindPluginToUpdate,
                                weak_ptr_factory_.GetWeakPtr(),
                                placeholder_id, identifier));
 #else
   // If we don't support third-party plug-in installation, we shouldn't have
   // outdated plug-ins.
   NOTREACHED();
 #endif  // defined(ENABLE_PLUGIN_INSTALLATION)
 }
 
 #if defined(ENABLE_PLUGIN_INSTALLATION)
 void PluginObserver::FindPluginToUpdate(int placeholder_id,
                                         const std::string& identifier,
                                         PluginFinder* plugin_finder) {
   PluginInstaller* installer =
       plugin_finder->FindPluginWithIdentifier(identifier);
   DCHECK(installer) << "Couldn't find PluginInstaller for identifier "
                     << identifier;
   plugin_placeholders_[placeholder_id] =
       new PluginPlaceholderHost(this, placeholder_id, installer);
-  InfoBarTabHelper* infobar_helper = tab_contents_->infobar_tab_helper();
+  TabContents* tab_contents = TabContents::FromWebContents(web_contents());
+  InfoBarTabHelper* infobar_helper = tab_contents->infobar_tab_helper();
   infobar_helper->AddInfoBar(
       OutdatedPluginInfoBarDelegate::Create(this, installer));
 }
 
 void PluginObserver::OnFindMissingPlugin(int placeholder_id,
                                          const std::string& mime_type) {
 PluginFinder::Get(base::Bind(&PluginObserver::FindMissingPlugin,
                              weak_ptr_factory_.GetWeakPtr(),
                              placeholder_id, mime_type));
 }
 
 void PluginObserver::FindMissingPlugin(int placeholder_id,
                                        const std::string& mime_type,
                                        PluginFinder* plugin_finder) {
   std::string lang = "en-US";  // Oh yes.
   PluginInstaller* installer = plugin_finder->FindPlugin(mime_type, lang);
   if (!installer) {
     Send(new ChromeViewMsg_DidNotFindMissingPlugin(placeholder_id));
     return;
   }
 
   plugin_placeholders_[placeholder_id] =
       new PluginPlaceholderHost(this, placeholder_id, installer);
-  InfoBarTabHelper* infobar_helper = tab_contents_->infobar_tab_helper();
+  TabContents* tab_contents = TabContents::FromWebContents(web_contents());
+  InfoBarTabHelper* infobar_helper = tab_contents->infobar_tab_helper();
   InfoBarDelegate* delegate;
 #if !defined(OS_WIN)
   delegate = PluginInstallerInfoBarDelegate::Create(
       infobar_helper, installer,
       base::Bind(&PluginObserver::InstallMissingPlugin,
                  weak_ptr_factory_.GetWeakPtr(), installer));
 #else
   delegate = base::win::IsMetroProcess() ?
       PluginMetroModeInfoBarDelegate::Create(
           infobar_helper, installer->name()) :
       PluginInstallerInfoBarDelegate::Create(
           infobar_helper, installer,
           base::Bind(&PluginObserver::InstallMissingPlugin,
               weak_ptr_factory_.GetWeakPtr(), installer));
 #endif
   infobar_helper->AddInfoBar(delegate);
 }
 
 void PluginObserver::InstallMissingPlugin(PluginInstaller* installer) {
   if (installer->url_for_display()) {
     installer->OpenDownloadURL(web_contents());
   } else {
     chrome::ShowTabModalConfirmDialog(
-        new ConfirmInstallDialogDelegate(tab_contents_, installer),
-        tab_contents_);
+        new ConfirmInstallDialogDelegate(web_contents(), installer),
+        TabContents::FromWebContents(web_contents()));
   }
 }
 
 void PluginObserver::OnRemovePluginPlaceholderHost(int placeholder_id) {
   std::map<int, PluginPlaceholderHost*>::iterator it =
       plugin_placeholders_.find(placeholder_id);
   if (it == plugin_placeholders_.end()) {
     NOTREACHED();
     return;
   }
   delete it->second;
   plugin_placeholders_.erase(it);
 }
 #endif  // defined(ENABLE_PLUGIN_INSTALLATION)
 
 void PluginObserver::OnOpenAboutPlugins() {
   web_contents()->OpenURL(OpenURLParams(
       GURL(chrome::kAboutPluginsURL),
       content::Referrer(web_contents()->GetURL(),
                         WebKit::WebReferrerPolicyDefault),
       NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_AUTO_BOOKMARK, false));
 }
 
 void PluginObserver::OnCouldNotLoadPlugin(const FilePath& plugin_path) {
   g_browser_process->metrics_service()->LogPluginLoadingError(plugin_path);
   string16 plugin_name =
       PluginService::GetInstance()->GetPluginDisplayNameByPath(plugin_path);
-  InfoBarTabHelper* infobar_helper = tab_contents_->infobar_tab_helper();
+  TabContents* tab_contents = TabContents::FromWebContents(web_contents());
+  InfoBarTabHelper* infobar_helper = tab_contents->infobar_tab_helper();
   infobar_helper->AddInfoBar(new SimpleAlertInfoBarDelegate(
       infobar_helper,
       &ResourceBundle::GetSharedInstance().GetNativeImageNamed(
           IDR_INFOBAR_PLUGIN_CRASHED),
       l10n_util::GetStringFUTF16(IDS_PLUGIN_INITIALIZATION_ERROR_PROMPT,
                                  plugin_name),
       true  /* auto_expire */));
 }