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

content/child/npobject_stub.cc

 // Copyright 2013 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 "content/child/npobject_stub.h"
 
 #include "content/child/np_channel_base.h"
+#include "content/child/npapi/plugin_host.h"
 #include "content/child/npobject_util.h"
 #include "content/child/plugin_messages.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
 #include "third_party/WebKit/public/web/WebBindings.h"
 #include "third_party/npapi/bindings/npapi.h"
 #include "third_party/npapi/bindings/npruntime.h"
-#include "webkit/plugins/npapi/plugin_host.h"
 
 #if defined(OS_WIN)
 #include "base/command_line.h"
-#include "webkit/plugins/npapi/plugin_constants_win.h"
+#include "content/common/plugin_constants_win.h"
 #endif
 
 using WebKit::WebBindings;
 
 namespace content {
 
 NPObjectStub::NPObjectStub(
     NPObject* npobject,
     NPChannelBase* channel,
     int route_id,
@@ skipping 227 matching lines @@
   if (IsPluginProcess()) {
     if (npobject_->_class->setProperty) {
 #if defined(OS_WIN)
       static base::FilePath plugin_path =
           CommandLine::ForCurrentProcess()->GetSwitchValuePath(
               switches::kPluginPath);
       static std::wstring filename = StringToLowerASCII(
           plugin_path.BaseName().value());
       static NPIdentifier fullscreen =
           WebBindings::getStringIdentifier("fullScreen");
-      if (filename == webkit::npapi::kNewWMPPlugin && id == fullscreen) {
+      if (filename == kNewWMPPlugin && id == fullscreen) {
         // Workaround for bug 15985, which is if Flash causes WMP to go
         // full screen a deadlock can occur when WMP calls SetFocus.
         NPObjectMsg_SetProperty::WriteReplyParams(reply_msg, true);
         Send(reply_msg);
         reply_msg = NULL;
       }
 #endif
       result = npobject_->_class->setProperty(npobject_, id, &property_var);
     } else {
       result = false;
@@ skipping 54 matching lines @@
 
   if (!*result)
     return;
 
   for (unsigned int i = 0; i < count; ++i) {
     NPIdentifier_Param param;
     CreateNPIdentifierParam(value_np[i], &param);
     value->push_back(param);
   }
 
-  webkit::npapi::PluginHost::Singleton()->host_functions()->memfree(value_np);
+  PluginHost::Singleton()->host_functions()->memfree(value_np);
 }
 
 void NPObjectStub::OnConstruct(const std::vector<NPVariant_Param>& args,
                                IPC::Message* reply_msg) {
   bool return_value = false;
   NPVariant_Param result_param;
   NPVariant result_var;
 
   VOID_TO_NPVARIANT(result_var);
 
@@ skipping 62 matching lines @@
                        channel_.get(),
                        &result_param,
                        true,
                        render_view_id_,
                        page_url_);
   NPObjectMsg_Evaluate::WriteReplyParams(reply_msg, result_param, return_value);
   channel_->Send(reply_msg);
 }
 
 }  // namespace content