Move NPAPI implementation out of webkit/plugins/npapi and into content.

content/common/plugin_list.h

Index: content/common/plugin_list.h
===================================================================
--- content/common/plugin_list.h	(revision 212369)
+++ content/common/plugin_list.h	(working copy)
@@ -2,8 +2,8 @@
 // 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_LIST_H_
-#define WEBKIT_PLUGINS_NPAPI_PLUGIN_LIST_H_
+#ifndef CONTENT_COMMON_PLUGIN_LIST_H_
+#define CONTENT_COMMON_PLUGIN_LIST_H_
 
 #include <set>
 #include <string>
@@ -17,13 +17,12 @@
 #include "base/memory/linked_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/synchronization/lock.h"
-#include "webkit/plugins/webkit_plugins_export.h"
+#include "content/common/content_export.h"
 #include "webkit/plugins/webplugininfo.h"
 
 class GURL;
 
-namespace webkit {
-namespace npapi {
+namespace content {
 
 // The PluginList is responsible for loading our NPAPI based plugins. It does
 // so in whatever manner is appropriate for the platform. On Windows, it loads
@@ -33,7 +32,7 @@
 // the correct types. On Linux, it walks the plugin directories as well
 // (e.g. /usr/lib/browser-plugins/).
 // This object is thread safe.
-class PluginList {
+class CONTENT_EXPORT PluginList {
  public:
 
   // Gets the one instance of the PluginList.
@@ -247,7 +246,6 @@
   DISALLOW_COPY_AND_ASSIGN(PluginList);
 };
 
-}  // namespace npapi
-}  // namespace webkit
+}  // namespace content
 
-#endif  // WEBKIT_PLUGINS_NPAPI_PLUGIN_LIST_H_
+#endif  // CONTENT_COMMON_PLUGIN_LIST_H_