Revert "Revert 69755 - Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi"

chrome/browser/gtk/content_setting_bubble_gtk.cc

 // Copyright (c) 2010 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/gtk/content_setting_bubble_gtk.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
 #include "app/l10n_util.h"
 #include "app/text_elider.h"
 #include "base/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/blocked_content_container.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/content_setting_bubble_model.h"
 #include "chrome/browser/gtk/gtk_chrome_link_button.h"
 #include "chrome/browser/gtk/gtk_theme_provider.h"
 #include "chrome/browser/gtk/gtk_util.h"
 #include "chrome/browser/gtk/options/content_settings_window_gtk.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/content_settings.h"
 #include "chrome/common/notification_source.h"
 #include "chrome/common/notification_type.h"
 #include "gfx/gtk_util.h"
 #include "grit/app_resources.h"
 #include "grit/generated_resources.h"
-#include "webkit/glue/plugins/plugin_list.h"
+#include "webkit/plugins/npapi/plugin_list.h"
 
 namespace {
 
 // Padding between content and edge of info bubble.
 const int kContentBorder = 7;
 
 // The maximum width of a title entry in the content box. We elide anything
 // longer than this.
 const int kMaxLinkPixelSize = 500;
 
@@ skipping 61 matching lines @@
     gtk_box_pack_start(GTK_BOX(bubble_content), label, FALSE, FALSE, 0);
   }
 
   const std::set<std::string>& plugins = content.resource_identifiers;
   if (!plugins.empty()) {
     GtkWidget* list_content = gtk_vbox_new(FALSE, gtk_util::kControlSpacing);
 
     for (std::set<std::string>::const_iterator it = plugins.begin();
         it != plugins.end(); ++it) {
       std::string name = UTF16ToUTF8(
-          NPAPI::PluginList::Singleton()->GetPluginGroupName(*it));
+          webkit::npapi::PluginList::Singleton()->GetPluginGroupName(*it));
       if (name.empty())
         name = *it;
 
       GtkWidget* label = gtk_label_new(BuildElidedText(name).c_str());
       GtkWidget* label_box = gtk_hbox_new(FALSE, 0);
       gtk_box_pack_start(GTK_BOX(label_box), label, FALSE, FALSE, 0);
 
       gtk_box_pack_start(GTK_BOX(list_content),
                          label_box,
                          FALSE, FALSE, 0);
@@ skipping 184 matching lines @@
 
 void ContentSettingBubbleGtk::OnCustomLinkClicked(GtkWidget* button) {
   content_setting_bubble_model_->OnCustomLinkClicked();
   Close();
 }
 
 void ContentSettingBubbleGtk::OnManageLinkClicked(GtkWidget* button) {
   content_setting_bubble_model_->OnManageLinkClicked();
   Close();
 }