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

webkit/glue/plugins/webplugin_page_delegate.h

 // Copyright (c) 2009 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_PLUGINS_NPAPI_WEBPLUGIN_PAGE_DELEGATE_
-#define WEBKIT_PLUGINS_NPAPI_WEBPLUGIN_PAGE_DELEGATE_
+#ifndef WEBKIT_GLUE_WEBPLUGIN_PAGE_DELEGATE_
+#define WEBKIT_GLUE_WEBPLUGIN_PAGE_DELEGATE_
 
 #include "gfx/native_widget_types.h"
 
 class FilePath;
 class GURL;
 
 namespace WebKit {
 class WebCookieJar;
 }
 
-namespace webkit {
-namespace npapi {
+namespace webkit_glue {
 
 class WebPluginDelegate;
 struct WebPluginGeometry;
 
 // Used by the WebPlugin to communicate back to the containing page.
 class WebPluginPageDelegate {
  public:
   // This method is called to create a WebPluginDelegate implementation when a
-  // new plugin is instanced.  See CreateWebPluginDelegateHelper
+  // new plugin is instanced.  See webkit_glue::CreateWebPluginDelegateHelper
   // for a default WebPluginDelegate implementation.
   virtual WebPluginDelegate* CreatePluginDelegate(
       const FilePath& file_path,
       const std::string& mime_type) = 0;
 
   // Called when a windowed plugin is created.
   // Lets the view delegate create anything it is using to wrap the plugin.
   virtual void CreatedPluginWindow(
       gfx::PluginWindowHandle handle) = 0;
 
@@ skipping 20 matching lines @@
   virtual void ShowModalHTMLDialogForPlugin(
       const GURL& url,
       const gfx::Size& size,
       const std::string& json_arguments,
       std::string* json_retval) = 0;
 
   // The WebCookieJar to use for this plugin.
   virtual WebKit::WebCookieJar* GetCookieJar() = 0;
 };
 
-}  // namespace npapi
-}  // namespace webkit
+}  // namespace webkit_glue
 
-#endif  // WEBKIT_PLUGINS_NPAPI_WEBPLUGIN_PAGE_DELEGATE_H_
+#endif  // WEBKIT_GLUE_WEBPLUGIN_PAGE_DELEGATE_H_