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

chrome/browser/plugin_exceptions_table_model.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/plugin_exceptions_table_model.h"
 
 #include "app/l10n_util.h"
 #include "app/table_model_observer.h"
 #include "base/auto_reset.h"
 #include "base/sys_string_conversions.h"
@@ skipping 116 matching lines @@
 }
 
 void PluginExceptionsTableModel::ClearSettings() {
   settings_.clear();
   groups_.clear();
   row_counts_.clear();
   resources_.clear();
 }
 
 void PluginExceptionsTableModel::GetPlugins(
-    std::vector<PluginGroup>* plugin_groups) {
-  NPAPI::PluginList::Singleton()->GetPluginGroups(false, plugin_groups);
+    std::vector<webkit::npapi::PluginGroup>* plugin_groups) {
+  webkit::npapi::PluginList::Singleton()->GetPluginGroups(false, plugin_groups);
 }
 
 void PluginExceptionsTableModel::LoadSettings() {
   int group_id = 0;
-  std::vector<PluginGroup> plugins;
+  std::vector<webkit::npapi::PluginGroup> plugins;
   GetPlugins(&plugins);
   for (size_t i = 0; i < plugins.size(); ++i) {
     std::string plugin = plugins[i].identifier();
     HostContentSettingsMap::SettingsForOneType settings;
     map_->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_PLUGINS,
                                 plugin,
                                 &settings);
     HostContentSettingsMap::SettingsForOneType otr_settings;
     if (otr_map_) {
       otr_map_->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_PLUGINS,
@@ skipping 33 matching lines @@
 }
 
 void PluginExceptionsTableModel::ReloadSettings() {
   ClearSettings();
   LoadSettings();
 
   if (observer_)
     observer_->OnModelChanged();
 }