Move NPAPI implementation out of webkit/plugins/npapi and into content.

content/utility/utility_thread_impl.cc

 // Copyright (c) 2012 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 "content/utility/utility_thread_impl.h"
 
 #include <stddef.h>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/memory/scoped_vector.h"
 #include "content/child/child_process.h"
 #include "content/child/webkitplatformsupport_impl.h"
 #include "content/common/child_process_messages.h"
+#include "content/common/plugin_list.h"
 #include "content/common/utility_messages.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/utility/content_utility_client.h"
 #include "ipc/ipc_sync_channel.h"
 #include "third_party/WebKit/public/web/WebKit.h"
-#include "webkit/plugins/npapi/plugin_list.h"
 
 #if defined(TOOLKIT_GTK)
 #include <gtk/gtk.h>
 
 #include "ui/gfx/gtk_util.h"
 #endif
 
 namespace content {
 
 namespace {
@@ skipping 90 matching lines @@
   batch_mode_ = true;
 }
 
 void UtilityThreadImpl::OnBatchModeFinished() {
   ChildProcess::current()->ReleaseProcess();
 }
 
 #if defined(OS_POSIX)
 void UtilityThreadImpl::OnLoadPlugins(
     const std::vector<base::FilePath>& plugin_paths) {
-  webkit::npapi::PluginList* plugin_list =
-      webkit::npapi::PluginList::Singleton();
+  PluginList* plugin_list = PluginList::Singleton();
 
   // On Linux, some plugins expect the browser to have loaded glib/gtk. Do that
   // before attempting to call into the plugin.
   // g_thread_init API is deprecated since glib 2.31.0, please see release note:
   // http://mail.gnome.org/archives/gnome-announce-list/2011-October/msg00041.html
 #if defined(TOOLKIT_GTK)
 #if !(GLIB_CHECK_VERSION(2, 31, 0))
   if (!g_thread_get_initialized()) {
     g_thread_init(NULL);
   }
@@ skipping 12 matching lines @@
       Send(new UtilityHostMsg_LoadPluginFailed(i, plugin_paths[i]));
     else
       Send(new UtilityHostMsg_LoadedPlugin(i, plugin));
   }
 
   ReleaseProcessIfNeeded();
 }
 #endif
 
 }  // namespace content