Revert r108760 / reland r108744, r108753 w/ fix

chrome/browser/plugin_observer.cc

 // Copyright (c) 2011 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/plugin_observer.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/confirm_infobar_delegate.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/user_metrics.h"
 #include "content/common/view_messages.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "webkit/plugins/npapi/plugin_group.h"
-#include "webkit/plugins/npapi/plugin_list.h"
 #include "webkit/plugins/webplugininfo.h"
 
 namespace {
 
 // PluginInfoBarDelegate ------------------------------------------------------
 
 class PluginInfoBarDelegate : public ConfirmInfoBarDelegate {
  public:
   PluginInfoBarDelegate(InfoBarTabHelper* infobar_helper, const string16& name);
 
@@ skipping 267 matching lines @@
 void PluginObserver::OnBlockedOutdatedPlugin(const string16& name,
                                              const GURL& update_url) {
   InfoBarTabHelper* infobar_helper = tab_contents_->infobar_tab_helper();
   infobar_helper->AddInfoBar(update_url.is_empty() ?
       static_cast<InfoBarDelegate*>(new BlockedPluginInfoBarDelegate(
           infobar_helper,
           tab_contents_->profile()->GetHostContentSettingsMap(),
           name)) :
       new OutdatedPluginInfoBarDelegate(infobar_helper, name, update_url));
 }