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

chrome/plugin/npobject_proxy.cc

 // Copyright (c) 2006-2008 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_proxy.h"
 
 #include "chrome/common/plugin_messages.h"
 #include "chrome/plugin/npobject_util.h"
 #include "chrome/plugin/plugin_channel.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebBindings.h"
 #include "webkit/glue/webkit_glue.h"
-#include "webkit/plugins/npapi/plugin_instance.h"
+#include "webkit/glue/plugins/plugin_instance.h"
 
 using WebKit::WebBindings;
 
 struct NPObjectWrapper {
     NPObject object;
     NPObjectProxy* proxy;
 };
 
 NPClass NPObjectProxy::npclass_proxy_ = {
   NP_CLASS_STRUCT_VERSION,
@@ skipping 430 matching lines @@
   NPObjectProxy* proxy = GetProxy(obj);
   if (!proxy) {
     return false;
   }
 
   bool result = false;
   gfx::NativeViewId containing_window = proxy->containing_window_;
   bool popups_allowed = false;
 
   if (npp) {
-    webkit::npapi::PluginInstance* plugin_instance =
-        reinterpret_cast<webkit::npapi::PluginInstance*>(npp->ndata);
+    NPAPI::PluginInstance* plugin_instance =
+        reinterpret_cast<NPAPI::PluginInstance*>(npp->ndata);
     if (plugin_instance)
       popups_allowed = plugin_instance->popups_allowed();
   }
 
   NPVariant_Param result_param;
   std::string script_str = std::string(
       script->UTF8Characters, script->UTF8Length);
 
   NPObjectMsg_Evaluate* msg = new NPObjectMsg_Evaluate(proxy->route_id(),
                                                        script_str,
@@ skipping 15 matching lines @@
   proxy->Send(msg);
   // Send may delete proxy.
   proxy = NULL;
   if (!result)
     return false;
 
   CreateNPVariant(
       result_param, channel.get(), result_var, containing_window, page_url);
   return true;
 }