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

webkit/glue/plugins/plugin_group.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 "webkit/plugins/npapi/plugin_group.h"
+#include "webkit/glue/plugins/plugin_group.h"
 
 #include "base/linked_ptr.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "base/version.h"
-#include "webkit/plugins/npapi/plugin_list.h"
-#include "webkit/plugins/npapi/webplugininfo.h"
-
-namespace webkit {
-namespace npapi {
+#include "webkit/glue/plugins/plugin_list.h"
+#include "webkit/glue/plugins/webplugininfo.h"
 
 const char* PluginGroup::kAdobeReaderGroupName = "Adobe Reader";
 
 /*static*/
 std::set<string16>* PluginGroup::policy_disabled_plugin_patterns_;
 
 /*static*/
 void PluginGroup::SetPolicyDisabledPluginPatterns(
     const std::set<string16>& set) {
   if (!policy_disabled_plugin_patterns_)
@@ skipping 14 matching lines @@
       return true;
     ++pattern;
   }
 
   return false;
 }
 
 /*static*/
 bool PluginGroup::IsPluginPathDisabledByPolicy(const FilePath& plugin_path) {
   std::vector<WebPluginInfo> plugins;
-  PluginList::Singleton()->GetPlugins(false, &plugins);
+  NPAPI::PluginList::Singleton()->GetPlugins(false, &plugins);
   for (std::vector<WebPluginInfo>::const_iterator it = plugins.begin();
        it != plugins.end();
        ++it) {
     if (FilePath::CompareEqualIgnoreCase(it->path.value(),
         plugin_path.value()) && IsPluginNameDisabledByPolicy(it->name)) {
       return true;
     }
   }
   return false;
 }
@@ skipping 314 matching lines @@
   enabled_ = false;
 
   for (std::vector<WebPluginInfo>::iterator it =
            web_plugin_infos_.begin();
        it != web_plugin_infos_.end(); ++it) {
     scoped_ptr<Version> version(CreateVersionFromString(it->version));
     if (version.get()) {
       for (size_t i = 0; i < version_ranges_.size(); ++i) {
         if (IsPluginOutdated(*version, version_ranges_[i])) {
           it->enabled = false;
-          PluginList::Singleton()->DisablePlugin(it->path);
+          NPAPI::PluginList::Singleton()->DisablePlugin(it->path);
         }
       }
     }
     UpdateActivePlugin(*it);
   }
 }
 
 void PluginGroup::Enable(bool enable) {
   bool enabled_plugin_exists = false;
   for (std::vector<WebPluginInfo>::iterator it =
        web_plugin_infos_.begin();
        it != web_plugin_infos_.end(); ++it) {
     if (enable && !IsPluginNameDisabledByPolicy(it->name)) {
-      PluginList::Singleton()->EnablePlugin(it->path);
+      NPAPI::PluginList::Singleton()->EnablePlugin(it->path);
       it->enabled = true;
       enabled_plugin_exists = true;
     } else {
       it->enabled = false;
-      PluginList::Singleton()->DisablePlugin(it->path);
+      NPAPI::PluginList::Singleton()->DisablePlugin(it->path);
     }
   }
   enabled_ = enabled_plugin_exists;
 }
-
-}  // namespace npapi
-}  // namespace webkit