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

webkit/glue/plugins/webplugin_impl.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.
 
-#ifndef WEBKIT_PLUGINS_NPAPI_WEBPLUGIN_IMPL_H_
-#define WEBKIT_PLUGINS_NPAPI_WEBPLUGIN_IMPL_H_
+#ifndef WEBKIT_GLUE_WEBPLUGIN_IMPL_H_
+#define WEBKIT_GLUE_WEBPLUGIN_IMPL_H_
 
 #include <string>
 #include <map>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/task.h"
 #include "base/weak_ptr.h"
 #include "gfx/native_widget_types.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebPlugin.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebRect.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebString.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebURLLoaderClient.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebURLRequest.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebVector.h"
-#include "webkit/plugins/npapi/webplugin.h"
+#include "webkit/glue/plugins/webplugin.h"
 
 class WebViewDelegate;
 
 namespace WebKit {
 class WebDevToolsAgent;
 class WebFrame;
 class WebPluginContainer;
 class WebURLResponse;
 class WebURLLoader;
 class WebURLRequest;
 }
 
 namespace webkit_glue {
+
 class MultipartResponseDelegate;
-}  // namespace webkit_glue
-
-namespace webkit {
-namespace npapi {
-
 class WebPluginDelegate;
 class WebPluginPageDelegate;
 
 // This is the WebKit side of the plugin implementation that forwards calls,
 // after changing out of WebCore types, to a delegate.  The delegate may
 // be in a different process.
 class WebPluginImpl : public WebPlugin,
                       public WebKit::WebPlugin,
                       public WebKit::WebURLLoaderClient {
  public:
@@ skipping 268 matching lines @@
   // Holds the list of argument names and values passed to the plugin.  We keep
   // these so that we can re-initialize the plugin if we need to.
   std::vector<std::string> arg_names_;
   std::vector<std::string> arg_values_;
 
   ScopedRunnableMethodFactory<WebPluginImpl> method_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WebPluginImpl);
 };
 
-}  // namespace npapi
-}  // namespace webkit
+}  // namespace webkit_glue
 
-#endif  // WEBKIT_PLUGINS_NPAPI_WEBPLUGIN_IMPL_H_
+#endif  // #ifndef WEBKIT_GLUE_WEBPLUGIN_IMPL_H_