Move NPAPI implementation out of webkit/plugins/npapi and into content.

content/child/npapi/plugin_host.cc

 // Copyright (c) 2012 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/plugin_host.h"
+#include "content/child/npapi/plugin_host.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
+#include "content/child/npapi/plugin_instance.h"
+#include "content/child/npapi/plugin_lib.h"
+#include "content/child/npapi/plugin_stream_url.h"
+#include "content/child/npapi/webplugin_delegate.h"
 #include "net/base/net_util.h"
 #include "third_party/WebKit/public/web/WebBindings.h"
 #include "third_party/WebKit/public/web/WebKit.h"
 #include "third_party/npapi/bindings/npruntime.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_surface.h"
 #include "webkit/common/user_agent/user_agent.h"
-#include "webkit/plugins/npapi/plugin_instance.h"
-#include "webkit/plugins/npapi/plugin_lib.h"
-#include "webkit/plugins/npapi/plugin_stream_url.h"
-#include "webkit/plugins/npapi/webplugin_delegate.h"
 #include "webkit/plugins/webplugininfo.h"
 
 #if defined(OS_MACOSX)
 #include "base/mac/mac_util.h"
 #endif
 
 using WebKit::WebBindings;
 
 // Declarations for stub implementations of deprecated functions, which are no
 // longer listed in npapi.h.
 extern "C" {
 void* NPN_GetJavaEnv();
 void* NPN_GetJavaPeer(NPP);
 }
 
-namespace webkit {
-namespace npapi {
+namespace content {
 
 // Finds a PluginInstance from an NPP.
 // The caller must take a reference if needed.
 static PluginInstance* FindInstance(NPP id) {
   if (id == NULL) {
     return NULL;
   }
   return reinterpret_cast<PluginInstance*>(id->ndata);
 }
 
@@ skipping 237 matching lines @@
           break;
       }
     }
     state = newstate;
     ptr++;
   } while (!done);
 
   return !err;
 }
 
-}  // namespace npapi
-}  // namespace webkit
+}  // namespace content
 
 extern "C" {
 
-using webkit::npapi::FindInstance;
-using webkit::npapi::PluginHost;
-using webkit::npapi::PluginInstance;
-using webkit::npapi::WebPlugin;
+using content::FindInstance;
+using content::PluginHost;
+using content::PluginInstance;
+using content::WebPlugin;
 
 // Allocates memory from the host's memory space.
 void* NPN_MemAlloc(uint32_t size) {
   // Note: We must use the same allocator/deallocator
   // that is used by the javascript library, as some of the
   // JS APIs will pass memory to the plugin which the plugin
   // will attempt to free.
   return malloc(size);
 }
 
@@ skipping 463 matching lines @@
     case NPNVsupportsCocoaBool: {
       // These drawing and event models are always supported.
       NPBool* supports_model = reinterpret_cast<NPBool*>(value);
       *supports_model = true;
       rv = NPERR_NO_ERROR;
       break;
     }
     case NPNVsupportsInvalidatingCoreAnimationBool:
     case NPNVsupportsCoreAnimationBool: {
       NPBool* supports_model = reinterpret_cast<NPBool*>(value);
-      *supports_model = webkit::npapi::SupportsCoreAnimationPlugins();
+      *supports_model = content::SupportsCoreAnimationPlugins();
       rv = NPERR_NO_ERROR;
       break;
     }
 #ifndef NP_NO_CARBON
     case NPNVsupportsCarbonBool:
 #endif
 #ifndef NP_NO_QUICKDRAW
     case NPNVsupportsQuickDrawBool:
 #endif
     case NPNVsupportsOpenGLBool: {
       // These models are never supported. OpenGL was never widely supported,
       // and QuickDraw and Carbon have been deprecated for quite some time.
       NPBool* supports_model = reinterpret_cast<NPBool*>(value);
       *supports_model = false;
       rv = NPERR_NO_ERROR;
       break;
     }
     case NPNVsupportsCompositingCoreAnimationPluginsBool: {
       NPBool* supports_compositing = reinterpret_cast<NPBool*>(value);
-      *supports_compositing =
-          webkit::npapi::SupportsCoreAnimationPlugins();
+      *supports_compositing = content::SupportsCoreAnimationPlugins();
       rv = NPERR_NO_ERROR;
       break;
     }
     case NPNVsupportsUpdatedCocoaTextInputBool: {
       // We support the clarifications to the Cocoa IME event spec.
       NPBool* supports_update = reinterpret_cast<NPBool*>(value);
       *supports_update = true;
       rv = NPERR_NO_ERROR;
       break;
     }
@@ skipping 46 matching lines @@
       // TODO: implement me
       DVLOG(1) << "NPN_SetValue(NPPVpluginKeepLibraryInMemory) is not "
                   "implemented.";
       return NPERR_GENERIC_ERROR;
   #if defined(OS_MACOSX)
     case NPPVpluginDrawingModel: {
       intptr_t model = reinterpret_cast<intptr_t>(value);
       if (model == NPDrawingModelCoreGraphics ||
           ((model == NPDrawingModelInvalidatingCoreAnimation ||
             model == NPDrawingModelCoreAnimation) &&
-           webkit::npapi::SupportsCoreAnimationPlugins())) {
+           content::SupportsCoreAnimationPlugins())) {
         plugin->set_drawing_model(static_cast<NPDrawingModel>(model));
         return NPERR_NO_ERROR;
       }
       return NPERR_GENERIC_ERROR;
     }
     case NPPVpluginEventModel: {
       // Only the Cocoa event model is supported.
       intptr_t model = reinterpret_cast<intptr_t>(value);
       if (model == NPEventModelCocoa) {
         plugin->set_event_model(static_cast<NPEventModel>(model));
@@ skipping 211 matching lines @@
 }
 
 void NPN_URLRedirectResponse(NPP instance, void* notify_data, NPBool allow) {
   scoped_refptr<PluginInstance> plugin(FindInstance(instance));
   if (plugin.get()) {
     plugin->URLRedirectResponse(!!allow, notify_data);
   }
 }
 
 }  // extern "C"