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

chrome/default_plugin/plugin_impl_win.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/default_plugin/plugin_impl_win.h"
 
 #include <shellapi.h>
 
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/default_plugin/plugin_main.h"
 #include "googleurl/src/gurl.h"
 #include "grit/webkit_strings.h"
 #include "unicode/locid.h"
 #include "webkit/glue/webkit_glue.h"
-#include "webkit/glue/plugins/default_plugin_shared.h"
+#include "webkit/plugins/npapi/default_plugin_shared.h"
 
 static const int TOOLTIP_MAX_WIDTH = 500;
 
 PluginInstallerImpl::PluginInstallerImpl(int16 mode)
     : instance_(NULL),
       mode_(mode),
       plugin_install_stream_(NULL),
       plugin_installer_state_(PluginInstallerStateUndefined),
       install_dialog_(NULL),
       enable_click_(false),
@@ skipping 214 matching lines @@
     } else {
       DLOG(WARNING) << "Failed to download plugin list";
       set_plugin_installer_state(PluginListDownloadFailed);
 
       plugin_database_handler_.Close(true);
     }
 
     if (plugin_available) {
       DVLOG(1) << "Plugin available for mime type " << mime_type_;
       DisplayAvailablePluginStatus();
-      NotifyPluginStatus(default_plugin::MISSING_PLUGIN_AVAILABLE);
+      NotifyPluginStatus(
+          webkit::npapi::default_plugin::MISSING_PLUGIN_AVAILABLE);
     } else {
       DLOG(WARNING) << "No plugin available for mime type " << mime_type_;
       DisplayStatus(IDS_DEFAULT_PLUGIN_NO_PLUGIN_AVAILABLE_MSG);
     }
   }
 }
 
 int16 PluginInstallerImpl::NPP_HandleEvent(void* event) {
   NPEvent* npp_event = static_cast<NPEvent*>(event);
-  if (npp_event->event == default_plugin::kInstallMissingPluginMessage) {
+  if (npp_event->event ==
+          webkit::npapi::default_plugin::kInstallMissingPluginMessage) {
     // We could get this message because InfoBar may not be in sync with our
     // internal processing. So we need to check the status.
     if (plugin_installer_state() == PluginListDownloaded) {
       ShowInstallDialog();
     }
   }
   return 0;
 }
 
 std::wstring PluginInstallerImpl::ReplaceStringForPossibleEmptyReplacement(
@@ skipping 246 matching lines @@
   enable_click_ = false;
   install_dialog_->ShowInstallDialog(hwnd());
 }
 
 LRESULT PluginInstallerImpl::OnLButtonDown(UINT message, WPARAM wparam,
                                            LPARAM lparam, BOOL& handled) {
   if (!enable_click_)
     return 0;
   if (plugin_installer_state() == PluginListDownloaded) {
     ShowInstallDialog();
-    NotifyPluginStatus(default_plugin::MISSING_PLUGIN_USER_STARTED_DOWNLOAD);
+    NotifyPluginStatus(
+        webkit::npapi::default_plugin::MISSING_PLUGIN_USER_STARTED_DOWNLOAD);
   } else if (plugin_installer_state_ == PluginInstallerLaunchSuccess) {
     DCHECK(default_plugin::g_browser);
     DCHECK(default_plugin::g_browser->geturl);
     default_plugin::g_browser->geturl(
         instance_,
         "javascript:navigator.plugins.refresh(true)",
         "_self");
     default_plugin::g_browser->geturl(
         instance_,
         "javascript:window.location.reload(true)",
@@ skipping 94 matching lines @@
   font_info.lfUnderline = TRUE;
   underline_font_ = CreateFontIndirect(&font_info);
   DCHECK(underline_font_ != NULL);
   return true;
 }
 
 void PluginInstallerImpl::NotifyPluginStatus(int status) {
   default_plugin::g_browser->getvalue(
       instance_,
       static_cast<NPNVariable>(
-          default_plugin::kMissingPluginStatusStart + status),
+          webkit::npapi::default_plugin::kMissingPluginStatusStart + status),
       NULL);
 }