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

chrome/plugin/npobject_util.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 "chrome/plugin/npobject_util.h"
 
 #include "base/string_util.h"
 #include "chrome/common/plugin_messages.h"
 #include "chrome/plugin/npobject_proxy.h"
 #include "chrome/plugin/plugin_channel_base.h"
 #include "third_party/npapi/bindings/nphostapi.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebBindings.h"
-#include "webkit/glue/plugins/plugin_host.h"
+#include "webkit/plugins/npapi/plugin_host.h"
 #include "webkit/glue/webkit_glue.h"
 
 using WebKit::WebBindings;
 
 // true if the current process is a plugin process, false if it's a renderer
 // process.
 static bool g_plugin_process;
 
 namespace {
 // The next 7 functions are called by the plugin code when it's using the
@@ skipping 98 matching lines @@
 
   init = true;
   return &host_funcs;
 }
 
 }
 
 void PatchNPNFunctions() {
   g_plugin_process = true;
   NPNetscapeFuncs* funcs = GetHostFunctions();
-  NPAPI::PluginHost::Singleton()->PatchNPNetscapeFuncs(funcs);
+  webkit::npapi::PluginHost::Singleton()->PatchNPNetscapeFuncs(funcs);
 }
 
 bool IsPluginProcess() {
   return g_plugin_process;
 }
 
 void CreateNPIdentifierParam(NPIdentifier id, NPIdentifier_Param* param) {
   param->identifier = id;
 }
 
@@ skipping 121 matching lines @@
       result->type = NPVariantType_Object;
       result->value.objectValue = npobject_base->GetUnderlyingNPObject();
       WebBindings::retainObject(result->value.objectValue);
       break;
     }
     default:
       NOTREACHED();
   }
   return true;
 }