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

webkit/glue/plugins/plugin_group.h

 // 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.
 
-#ifndef WEBKIT_PLUGINS_NPAPI_PLUGIN_GROUP_H_
-#define WEBKIT_PLUGINS_NPAPI_PLUGIN_GROUP_H_
+#ifndef WEBKIT_GLUE_PLUGINS_PLUGIN_GROUP_H_
+#define WEBKIT_GLUE_PLUGINS_PLUGIN_GROUP_H_
 #pragma once
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/gtest_prod_util.h"
 #include "base/scoped_ptr.h"
 #include "base/string16.h"
 
 class DictionaryValue;
 class FilePath;
-class TableModelArrayControllerTest;
-class PluginExceptionsTableModelTest;
 class Version;
+struct WebPluginInfo;
 
-namespace webkit {
-namespace npapi {
-
+namespace NPAPI {
 class PluginList;
-struct WebPluginInfo;
+};
 
 // Hard-coded version ranges for plugin groups.
 struct VersionRangeDefinition {
   // Matcher for lowest version matched by this range (inclusive). May be empty
   // to match everything iff |version_matcher_high| is also empty.
   const char* version_matcher_low;
   // Matcher for highest version matched by this range (exclusive). May be empty
   // to match anything higher than |version_matcher_low|.
   const char* version_matcher_high;
   const char* min_version;  // Minimum secure version.
@@ skipping 100 matching lines @@
   // minimum version.
   void DisableOutdatedPlugins();
 
   // Parse a version string as used by a plug-in. This method is more lenient
   // in accepting weird version strings than Version::GetFromString().
   static Version* CreateVersionFromString(const string16& version_string);
 
  private:
   typedef std::map<std::string, PluginGroup*> PluginMap;
 
-  friend class PluginList;
+  friend class NPAPI::PluginList;
   friend class PluginGroupTest;
-  friend class ::TableModelArrayControllerTest;
-  friend class ::PluginExceptionsTableModelTest;
+  friend class TableModelArrayControllerTest;
+  friend class PluginExceptionsTableModelTest;
 
   // Generates the (short) identifier string for the given plugin.
   static std::string GetIdentifier(const WebPluginInfo& wpi);
 
   // Generates the long identifier (based on the full file path) for the given
   // plugin, to be called when the short identifier is not unique.
   static std::string GetLongIdentifier(const WebPluginInfo& wpi);
 
   // Creates a PluginGroup from a PluginGroupDefinition. The caller takes
   // ownership of the created PluginGroup.
@@ skipping 35 matching lines @@
   string16 name_matcher_;
   string16 description_;
   std::string update_url_;
   bool enabled_;
   std::vector<VersionRange> version_ranges_;
   scoped_ptr<Version> version_;
   std::vector<WebPluginInfo> web_plugin_infos_;
   std::vector<int> web_plugin_positions_;
 };
 
-}  // namespace npapi
-}  // namespace webkit
-
-#endif  // WEBKIT_PLUGINS_NPAPI_PLUGIN_GROUP_H_
+#endif  // WEBKIT_GLUE_PLUGINS_PLUGIN_GROUP_H_