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

chrome/plugin/webplugin_proxy.cc

 // 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.
 
 #include "chrome/plugin/webplugin_proxy.h"
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include "app/win_util.h"
@@ skipping 16 matching lines @@
 #if defined(OS_MACOSX)
 #include "chrome/plugin/webplugin_accelerated_surface_proxy_mac.h"
 #endif
 #include "gfx/blit.h"
 #include "gfx/canvas.h"
 #if defined(OS_WIN)
 #include "gfx/gdi_util.h"
 #endif
 #include "skia/ext/platform_device.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebBindings.h"
-#include "webkit/glue/plugins/webplugin_delegate_impl.h"
+#include "webkit/plugins/npapi/webplugin_delegate_impl.h"
 
 #if defined(USE_X11)
 #include "app/x11_util_internal.h"
 #endif
 
 using WebKit::WebBindings;
-using webkit_glue::WebPluginResourceClient;
+
+using webkit::npapi::WebPluginResourceClient;
 #if defined(OS_MACOSX)
-using webkit_glue::WebPluginAcceleratedSurface;
+using webkit::npapi::WebPluginAcceleratedSurface;
 #endif
 
 typedef std::map<CPBrowsingContext, WebPluginProxy*> ContextMap;
 static base::LazyInstance<ContextMap> g_context_map(base::LINKER_INITIALIZED);
 
 WebPluginProxy::WebPluginProxy(
     PluginChannel* channel,
     int route_id,
     const GURL& page_url,
     gfx::NativeViewId containing_window,
@@ skipping 259 matching lines @@
                                       const char* target,
                                       const char* buf,
                                       unsigned int len,
                                       int notify_id,
                                       bool popups_allowed,
                                       bool notify_redirects) {
  if (!target && (0 == base::strcasecmp(method, "GET"))) {
     // Please refer to https://bugzilla.mozilla.org/show_bug.cgi?id=366082
     // for more details on this.
     if (delegate_->GetQuirks() &
-        WebPluginDelegateImpl::PLUGIN_QUIRK_BLOCK_NONSTANDARD_GETURL_REQUESTS) {
+        webkit::npapi::WebPluginDelegateImpl::
+            PLUGIN_QUIRK_BLOCK_NONSTANDARD_GETURL_REQUESTS) {
       GURL request_url(url);
       if (!request_url.SchemeIs(chrome::kHttpScheme) &&
           !request_url.SchemeIs(chrome::kHttpsScheme) &&
           !request_url.SchemeIs(chrome::kFtpScheme)) {
         return;
       }
     }
   }
 
   PluginHostMsg_URLRequest_Params params;
@@ skipping 390 matching lines @@
     } else {
       index++;
     }
   }
 }
 
 void WebPluginProxy::URLRedirectResponse(bool allow, int resource_id) {
   Send(new PluginHostMsg_URLRedirectResponse(route_id_, allow, resource_id));
 }