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

chrome/plugin/npobject_stub.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_stub.h"
 
 #include "chrome/common/child_process_logging.h"
 #include "chrome/common/plugin_messages.h"
 #include "chrome/plugin/npobject_util.h"
 #include "chrome/plugin/plugin_channel_base.h"
 #include "chrome/plugin/plugin_thread.h"
 #include "third_party/npapi/bindings/npapi.h"
 #include "third_party/npapi/bindings/npruntime.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebBindings.h"
-#include "webkit/glue/plugins/plugin_constants_win.h"
+#include "webkit/plugins/npapi/plugin_constants_win.h"
 
 using WebKit::WebBindings;
 
 NPObjectStub::NPObjectStub(
     NPObject* npobject,
     PluginChannelBase* channel,
     int route_id,
     gfx::NativeViewId containing_window,
     const GURL& page_url)
     : npobject_(npobject),
@@ skipping 210 matching lines @@
     return;
   }
 
   if (IsPluginProcess()) {
     if (npobject_->_class->setProperty) {
 #if defined(OS_WIN)
       static std::wstring filename = StringToLowerASCII(
           PluginThread::current()->plugin_path().BaseName().value());
       static NPIdentifier fullscreen =
           WebBindings::getStringIdentifier("fullScreen");
-      if (filename == kNewWMPPlugin && id == fullscreen) {
+      if (filename == webkit::npapi::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 133 matching lines @@
   bool return_value = WebBindings::evaluateHelper(0, popups_allowed, npobject_,
                                                   &script_string, &result_var);
 
   NPVariant_Param result_param;
   CreateNPVariantParam(
       result_var, local_channel, &result_param, true, containing_window_,
       page_url_);
   NPObjectMsg_Evaluate::WriteReplyParams(reply_msg, result_param, return_value);
   local_channel->Send(reply_msg);
 }