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

webkit/glue/plugins/webplugin.h

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2006-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_H_
-#define WEBKIT_PLUGINS_NPAPI_WEBPLUGIN_H_
+#ifndef WEBKIT_GLUE_WEBPLUGIN_H_
+#define WEBKIT_GLUE_WEBPLUGIN_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "gfx/native_widget_types.h"
 #include "gfx/rect.h"
 
 // TODO(port): this typedef is obviously incorrect on non-Windows
 // platforms, but now a lot of code now accidentally depends on them
 // existing.  #ifdef out these declarations and fix all the users.
 typedef void* HANDLE;
 
 class GURL;
 struct NPObject;
 
 namespace WebKit {
 class WebFrame;
 }
 
-namespace webkit {
-namespace npapi {
+namespace webkit_glue {
 
 class WebPluginDelegate;
 class WebPluginParentView;
 class WebPluginResourceClient;
 #if defined(OS_MACOSX)
 class WebPluginAcceleratedSurface;
 #endif
 
 // Describes the new location for a plugin window.
 struct WebPluginGeometry {
@@ skipping 150 matching lines @@
                                   uint32 last_modified,
                                   bool request_is_seekable) = 0;
   virtual void DidReceiveData(const char* buffer, int length,
                               int data_offset) = 0;
   virtual void DidFinishLoading() = 0;
   virtual void DidFail() = 0;
   virtual bool IsMultiByteResponseExpected() = 0;
   virtual int ResourceId() = 0;
 };
 
-}  // namespace npapi
-}  // namespace webkit
+}  // namespace webkit_glue
 
-#endif  // WEBKIT_PLUGINS_NPAPI_WEBPLUGIN_H_
+#endif  // #ifndef WEBKIT_GLUE_WEBPLUGIN_H_