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

chrome/plugin/plugin_thread.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/plugin_thread.h"
 
 #include "build/build_config.h"
 
 #if defined(USE_X11)
 #include <gtk/gtk.h>
@@ skipping 11 matching lines @@
 #include "chrome/common/child_process.h"
 #include "chrome/common/chrome_plugin_lib.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/plugin_messages.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/plugin/chrome_plugin_host.h"
 #include "chrome/plugin/npobject_util.h"
 #include "chrome/renderer/render_thread.h"
 #include "ipc/ipc_channel_handle.h"
 #include "net/base/net_errors.h"
-#include "webkit/glue/plugins/plugin_lib.h"
 #include "webkit/glue/webkit_glue.h"
-#include "webkit/glue/plugins/webplugin_delegate_impl.h"
+#include "webkit/plugins/npapi/plugin_lib.h"
+#include "webkit/plugins/npapi/webplugin_delegate_impl.h"
 
 #if defined(TOOLKIT_USES_GTK)
 #include "gfx/gtk_util.h"
 #endif
 
 #if defined(USE_X11)
 #include "app/x11_util.h"
 #elif defined(OS_MACOSX)
 #include "app/l10n_util.h"
 #include "base/mac_util.h"
@@ skipping 34 matching lines @@
   x11_util::SetDefaultX11ErrorHandlers();
 #endif
 
   PatchNPNFunctions();
 
   // Preload the library to avoid loading, unloading then reloading
   preloaded_plugin_module_ = base::LoadNativeLibrary(plugin_path_);
 
   ChromePluginLib::Create(plugin_path_, GetCPBrowserFuncsForPlugin());
 
-  scoped_refptr<NPAPI::PluginLib> plugin(
-      NPAPI::PluginLib::CreatePluginLib(plugin_path_));
+  scoped_refptr<webkit::npapi::PluginLib> plugin(
+      webkit::npapi::PluginLib::CreatePluginLib(plugin_path_));
   if (plugin.get()) {
     plugin->NP_Initialize();
 
 #if defined(OS_MACOSX)
     base::mac::ScopedCFTypeRef<CFStringRef> plugin_name(
         base::SysUTF16ToCFStringRef(plugin->plugin_info().name));
     base::mac::ScopedCFTypeRef<CFStringRef> app_name(
         base::SysUTF16ToCFStringRef(
             l10n_util::GetStringUTF16(IDS_SHORT_PLUGIN_APP_NAME)));
     base::mac::ScopedCFTypeRef<CFStringRef> process_name(
         CFStringCreateWithFormat(kCFAllocatorDefault, NULL, CFSTR("%@ (%@)"),
                                  plugin_name.get(), app_name.get()));
     mac_util::SetProcessName(process_name);
 #endif
   }
 
   // Certain plugins, such as flash, steal the unhandled exception filter
   // thus we never get crash reports when they fault. This call fixes it.
   message_loop()->set_exception_restoration(true);
 }
 
 PluginThread::~PluginThread() {
   if (preloaded_plugin_module_) {
     base::UnloadNativeLibrary(preloaded_plugin_module_);
     preloaded_plugin_module_ = NULL;
   }
   PluginChannelBase::CleanupChannels();
-  NPAPI::PluginLib::UnloadAllPlugins();
+  webkit::npapi::PluginLib::UnloadAllPlugins();
   ChromePluginLib::UnloadAllPlugins();
 
   if (webkit_glue::ShouldForcefullyTerminatePluginProcess())
     base::KillProcess(base::GetCurrentProcessHandle(), 0, /* wait= */ false);
 
   lazy_tls.Pointer()->Set(NULL);
 }
 
 PluginThread* PluginThread::current() {
   return lazy_tls.Pointer()->Get();
@@ skipping 96 matching lines @@
   }
 
   if (!result || net_error != net::OK)
     return false;
 
   *proxy_list = proxy_result;
   return true;
 }
 
 }  // namespace webkit_glue