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

chrome/browser/plugin_service.h

Index: chrome/browser/plugin_service.h
diff --git a/chrome/browser/plugin_service.h b/chrome/browser/plugin_service.h
index e83e8041cf83ec0f1ce0fb606c25a5c61ba1adee..a66d76acc3751cd13cd86b27699c66fd20522fec 100644
--- a/chrome/browser/plugin_service.h
+++ b/chrome/browser/plugin_service.h
@@ -41,7 +41,13 @@ class MessageLoop;
 class Profile;
 class ResourceDispatcherHost;
 class URLRequestContext;
+
+
+namespace webkit {
+namespace npapi {
 struct WebPluginInfo;
+}
+}
 
 // This must be created on the main thread but it's only called on the IO/file
 // thread.
@@ -90,7 +96,7 @@ class PluginService
   // the given url and mime type.  Must be called on the FILE thread.
   bool GetFirstAllowedPluginInfo(const GURL& url,
                                  const std::string& mime_type,
-                                 WebPluginInfo* info,
+                                 webkit::npapi::WebPluginInfo* info,
                                  std::string* actual_mime_type);
 
   // Returns true if the given plugin is allowed to be used by a page with