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

content/child/npapi/plugin_host.h

Index: content/child/npapi/plugin_host.h
===================================================================
--- content/child/npapi/plugin_host.h	(revision 0)
+++ content/child/npapi/plugin_host.h	(working copy)
@@ -4,8 +4,8 @@
 
 // TODO: Need mechanism to cleanup the static instance
 
-#ifndef WEBKIT_PLUGINS_NPAPI_PLUGIN_HOST_H_
-#define WEBKIT_PLUGINS_NPAPI_PLUGIN_HOST_H_
+#ifndef CONTENT_CHILD_NPAPI_PLUGIN_HOST_H_
+#define CONTENT_CHILD_NPAPI_PLUGIN_HOST_H_
 
 #include <string>
 #include <vector>
@@ -13,10 +13,8 @@
 #include "base/memory/ref_counted.h"
 #include "third_party/npapi/bindings/npapi.h"
 #include "third_party/npapi/bindings/nphostapi.h"
-#include "webkit/plugins/webkit_plugins_export.h"
 
-namespace webkit {
-namespace npapi {
+namespace content {
 
 // The Plugin Host implements the NPN_xxx functions for NPAPI plugins.
 // These are the functions exposed from the Plugin Host for use
@@ -29,7 +27,7 @@
  public:
   // Access the single PluginHost instance.  Callers
   // must call deref() when finished with the object.
-  WEBKIT_PLUGINS_EXPORT static PluginHost* Singleton();
+  static PluginHost* Singleton();
 
   // The table of functions provided to the plugin.
   NPNetscapeFuncs* host_functions() { return &host_funcs_; }
@@ -44,7 +42,7 @@
                           std::vector<std::string>* values,
                           std::vector<char>* body);
 
-  WEBKIT_PLUGINS_EXPORT void PatchNPNetscapeFuncs(NPNetscapeFuncs* overrides);
+  void PatchNPNetscapeFuncs(NPNetscapeFuncs* overrides);
 
  private:
   friend class base::RefCounted<PluginHost>;
@@ -57,7 +55,6 @@
   DISALLOW_COPY_AND_ASSIGN(PluginHost);
 };
 
-}  // namespace npapi
-}  // namespace webkit
+}  // namespace content
 
-#endif  // WEBKIT_PLUGINS_NPAPI_PLUGIN_HOST_H_
+#endif  // CONTENT_CHILD_NPAPI_PLUGIN_HOST_H_