Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi and put...

webkit/glue/plugins/webplugininfo.h

Index: webkit/glue/plugins/webplugininfo.h
===================================================================
--- webkit/glue/plugins/webplugininfo.h	(revision 69426)
+++ webkit/glue/plugins/webplugininfo.h	(working copy)
@@ -1,60 +0,0 @@
-// Copyright (c) 2006-2008 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_GLUE_WEBPLUGININFO_H_
-#define WEBKIT_GLUE_WEBPLUGININFO_H_
-
-#include <string>
-#include <vector>
-
-#include "base/basictypes.h"
-#include "base/file_path.h"
-
-// Describes a mime type entry for a plugin.
-struct WebPluginMimeType {
-  WebPluginMimeType();
-  ~WebPluginMimeType();
-
-  // The name of the mime type (e.g., "application/x-shockwave-flash").
-  std::string mime_type;
-
-  // A list of all the file extensions for this mime type.
-  std::vector<std::string> file_extensions;
-
-  // Description of the mime type.
-  string16 description;
-};
-
-// Describes an available NPAPI plugin.
-struct WebPluginInfo {
-  WebPluginInfo();
-  WebPluginInfo(const WebPluginInfo& rhs);
-  ~WebPluginInfo();
-  WebPluginInfo& operator=(const WebPluginInfo& rhs);
-
-  // Special constructor only used during unit testing:
-  WebPluginInfo(const string16& fake_name,
-                const string16& fake_version,
-                const string16& fake_desc);
-
-  // The name of the plugin (i.e. Flash).
-  string16 name;
-
-  // The path to the plugin file (DLL/bundle/library).
-  FilePath path;
-
-  // The version number of the plugin file (may be OS-specific)
-  string16 version;
-
-  // A description of the plugin that we get from its version info.
-  string16 desc;
-
-  // A list of all the mime types that this plugin supports.
-  std::vector<WebPluginMimeType> mime_types;
-
-  // Whether the plugin is enabled.
-  bool enabled;
-};
-
-#endif  // WEBKIT_GLUE_WEBPLUGININFO_H_