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

webkit/glue/plugins/webview_plugin.cc

 // 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.
 
-#include "webkit/plugins/npapi/webview_plugin.h"
+#include "webkit/glue/plugins/webview_plugin.h"
 
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebCursorInfo.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebElement.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebPluginContainer.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebSize.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebURL.h"
@@ skipping 20 matching lines @@
 using WebKit::WebPluginContainer;
 using WebKit::WebPoint;
 using WebKit::WebRect;
 using WebKit::WebSize;
 using WebKit::WebURLError;
 using WebKit::WebURLRequest;
 using WebKit::WebURLResponse;
 using WebKit::WebVector;
 using WebKit::WebView;
 
-namespace webkit {
-namespace npapi {
-
 WebViewPlugin::WebViewPlugin(WebViewPlugin::Delegate* delegate)
     : delegate_(delegate),
       container_(NULL),
       finished_loading_(false) {
   web_view_ = WebView::create(this, NULL);
   web_view_->initializeMainFrame(this);
 }
 
 // static
 WebViewPlugin* WebViewPlugin::Create(WebViewPlugin::Delegate* delegate,
@@ skipping 170 matching lines @@
 WebURLError WebViewPlugin::cancelledError(WebFrame* frame,
                                           const WebURLRequest& request) {
   // Return an error with a non-zero reason so isNull() on the corresponding
   // ResourceError is false.
   WebURLError error;
   error.domain = "WebViewPlugin";
   error.reason = -1;
   error.unreachableURL = request.url();
   return error;
 }
-
-}  // namespace npapi
-}  // namespace webkit