Revert r108760 / reland r108744, r108753 w/ fix

chrome/browser/ui/views/content_setting_bubble_contents.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/ui/views/content_setting_bubble_contents.h"
 
 #if defined(TOOLKIT_USES_GTK)
 #include <gdk/gdk.h>
 #endif
 
 #include <algorithm>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
 #include "chrome/browser/ui/views/browser_dialogs.h"
 #include "chrome/browser/ui/views/bubble/bubble.h"
+#include "content/browser/plugin_service.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "views/controls/button/radio_button.h"
 #include "views/controls/button/text_button.h"
 #include "views/controls/image_view.h"
 #include "views/controls/label.h"
 #include "views/controls/link.h"
 #include "views/controls/separator.h"
 #include "views/layout/grid_layout.h"
 #include "views/layout/layout_constants.h"
-#include "webkit/plugins/npapi/plugin_list.h"
 
 #if defined(TOOLKIT_USES_GTK)
 #include "ui/gfx/gtk_util.h"
 #endif
 
 #if defined(USE_AURA)
 #include "ui/aura/cursor.h"
 #endif
 
 // If we don't clamp the maximum width, then very long URLs and titles can make
@@ skipping 164 matching lines @@
     bubble_content_empty = false;
   }
 
   const std::set<std::string>& plugins = bubble_content.resource_identifiers;
   if (!plugins.empty()) {
     if (!bubble_content_empty)
       layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
     for (std::set<std::string>::const_iterator it = plugins.begin();
         it != plugins.end(); ++it) {
       string16 name =
-          webkit::npapi::PluginList::Singleton()->GetPluginGroupName(*it);
+          PluginService::GetInstance()->GetPluginGroupName(*it);
       if (name.empty())
         name = UTF8ToUTF16(*it);
       layout->StartRow(0, single_column_set_id);
       layout->AddView(new views::Label(name));
       bubble_content_empty = false;
     }
   }
 
   if (content_setting_bubble_model_->content_type() ==
       CONTENT_SETTINGS_TYPE_POPUPS) {
@@ skipping 102 matching lines @@
 
   layout->StartRow(0, double_column_set_id);
   manage_link_ = new views::Link(UTF8ToUTF16(bubble_content.manage_link));
   manage_link_->set_listener(this);
   layout->AddView(manage_link_);
 
   close_button_ = new views::NativeTextButton(
       this, l10n_util::GetStringUTF16(IDS_DONE));
   layout->AddView(close_button_);
 }