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

webkit/glue/plugins/webplugin_impl.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/webplugin_impl.h"
+#include "webkit/glue/plugins/webplugin_impl.h"
 
 #include "base/linked_ptr.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/rect.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/escape.h"
@@ skipping 16 matching lines @@
 #include "third_party/WebKit/WebKit/chromium/public/WebPluginContainer.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebPluginParams.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebURL.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebURLError.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebURLLoader.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebURLLoaderClient.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebURLResponse.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebView.h"
 #include "webkit/appcache/web_application_cache_host_impl.h"
 #include "webkit/glue/multipart_response_delegate.h"
-#include "webkit/plugins/npapi/plugin_host.h"
-#include "webkit/plugins/npapi/plugin_instance.h"
-#include "webkit/plugins/npapi/webplugin_delegate.h"
-#include "webkit/plugins/npapi/webplugin_page_delegate.h"
+#include "webkit/glue/plugins/plugin_host.h"
+#include "webkit/glue/plugins/plugin_instance.h"
+#include "webkit/glue/plugins/webplugin_delegate.h"
+#include "webkit/glue/plugins/webplugin_page_delegate.h"
 
 using appcache::WebApplicationCacheHostImpl;
 using WebKit::WebCanvas;
 using WebKit::WebConsoleMessage;
 using WebKit::WebCookieJar;
 using WebKit::WebCString;
 using WebKit::WebCursorInfo;
 using WebKit::WebData;
 using WebKit::WebDataSource;
 using WebKit::WebDevToolsAgent;
@@ skipping 10 matching lines @@
 using WebKit::WebURL;
 using WebKit::WebURLError;
 using WebKit::WebURLLoader;
 using WebKit::WebURLLoaderClient;
 using WebKit::WebURLRequest;
 using WebKit::WebURLResponse;
 using WebKit::WebVector;
 using WebKit::WebView;
 using webkit_glue::MultipartResponseDelegate;
 
-namespace webkit {
-namespace npapi {
-
+namespace webkit_glue {
 namespace {
 
 // This class handles individual multipart responses. It is instantiated when
 // we receive HTTP status code 206 in the HTTP response. This indicates
 // that the response could have multiple parts each separated by a boundary
 // specified in the response header.
 class MultiPartResponseClient : public WebURLLoaderClient {
  public:
   explicit MultiPartResponseClient(WebPluginResourceClient* resource_client)
       : resource_client_(resource_client) {
@@ skipping 507 matching lines @@
     }
   }
 }
 
 bool WebPluginImpl::SetPostData(WebURLRequest* request,
                                 const char *buf,
                                 uint32 length) {
   std::vector<std::string> names;
   std::vector<std::string> values;
   std::vector<char> body;
-  bool rv = PluginHost::SetPostData(buf, length, &names, &values, &body);
+  bool rv = NPAPI::PluginHost::SetPostData(buf, length, &names, &values, &body);
 
   for (size_t i = 0; i < names.size(); ++i) {
     request->addHTTPHeaderField(WebString::fromUTF8(names[i]),
                                 WebString::fromUTF8(values[i]));
   }
 
   WebString content_type_header = WebString::fromUTF8("Content-Type");
   const WebString& content_type =
       request->httpHeaderField(content_type_header);
   if (content_type.isEmpty()) {
@@ skipping 768 matching lines @@
 
 WebDevToolsAgent* WebPluginImpl::GetDevToolsAgent() {
   if (!webframe_)
     return NULL;
   WebView* view = webframe_->view();
   if (!view)
     return NULL;
   return view->devToolsAgent();
 }
 
-}  // namespace npapi
-}  // namespace webkit
+}  // namespace webkit_glue