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

chrome/browser/plugin_service.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.
 
 // This class responds to requests from renderers for the list of plugins, and
 // also a proxy object for plugin instances.
 
 #ifndef CHROME_BROWSER_PLUGIN_SERVICE_H_
 #define CHROME_BROWSER_PLUGIN_SERVICE_H_
 #pragma once
@@ skipping 23 matching lines @@
 #endif
 
 namespace IPC {
 class Message;
 }
 
 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.
 class PluginService
     : public base::WaitableEventWatcher::Delegate,
       public NotificationObserver {
  public:
   // Initializes the global instance; should be called on startup from the main
   // thread.
   static void InitGlobalInstance(Profile* profile);
@@ skipping 28 matching lines @@
   // a new plugin process if necessary.  This must be called on the IO thread
   // or else a deadlock can occur.
   void OpenChannelToPlugin(const GURL& url,
                            const std::string& mime_type,
                            PluginProcessHost::Client* client);
 
   // Gets the first allowed plugin in the list of plugins that matches
   // 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
   // the given URL.
   bool PrivatePluginAllowedForURL(const FilePath& plugin_path, const GURL& url);
 
   // The UI thread's message loop
   MessageLoop* main_message_loop() { return main_message_loop_; }
 
   ResourceDispatcherHost* resource_dispatcher_host() const {
@@ skipping 70 matching lines @@
 
   // Set to true if chrome plugins are enabled. Defaults to true.
   static bool enable_chrome_plugins_;
 
   DISALLOW_COPY_AND_ASSIGN(PluginService);
 };
 
 DISABLE_RUNNABLE_METHOD_REFCOUNT(PluginService);
 
 #endif  // CHROME_BROWSER_PLUGIN_SERVICE_H_