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

content/common/plugin_list.cc

Index: content/common/plugin_list.cc
===================================================================
--- content/common/plugin_list.cc	(revision 212369)
+++ content/common/plugin_list.cc	(working copy)
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/plugins/npapi/plugin_list.h"
+#include "content/common/plugin_list.h"
 
 #include <algorithm>
 
@@ -19,13 +19,16 @@
 #include "webkit/plugins/plugin_switches.h"
 
 #if defined(OS_WIN)
-#include "webkit/plugins/npapi/plugin_constants_win.h"
+#include "content/common/plugin_constants_win.h"
 #endif
 
-namespace {
+using webkit::WebPluginInfo;
+using webkit::WebPluginMimeType;
 
-using webkit::npapi::PluginList;
+namespace content {
 
+namespace {
+
 const char kApplicationOctetStream[] = "application/octet-stream";
 
 base::LazyInstance<PluginList> g_singleton = LAZY_INSTANCE_INITIALIZER;
@@ -53,9 +56,6 @@
 
 }  // namespace
 
-namespace webkit {
-namespace npapi {
-
 // static
 PluginList* PluginList::Singleton() {
   return g_singleton.Pointer();
@@ -77,7 +77,7 @@
 }
 
 void PluginList::AddExtraPluginPath(const base::FilePath& plugin_path) {
-  if (!NPAPIPluginsSupported()) {
+  if (!webkit::npapi::NPAPIPluginsSupported()) {
     // TODO(jam): remove and just have CHECK once we're sure this doesn't get
     // triggered.
     DLOG(INFO) << "NPAPI plugins not supported";
@@ -110,7 +110,7 @@
 
 void PluginList::RegisterInternalPlugin(const webkit::WebPluginInfo& info,
                                         bool add_at_beginning) {
-  if (!NPAPIPluginsSupported() &&
+  if (!webkit::npapi::NPAPIPluginsSupported() &&
       info.type == WebPluginInfo::PLUGIN_TYPE_NPAPI) {
     DLOG(INFO) << "Don't register NPAPI plugins when they're not supported";
     return;
@@ -307,7 +307,7 @@
     plugin_paths->push_back(path);
   }
 
-  if (NPAPIPluginsSupported()) {
+  if (webkit::npapi::NPAPIPluginsSupported()) {
     // A bit confusingly, this function is used to load Pepper plugins as well.
     // Those are all internal plugins so we have to use extra_plugin_paths.
     for (size_t i = 0; i < extra_plugin_dirs.size(); ++i)
@@ -444,5 +444,4 @@
 }
 
 
-}  // namespace npapi
-}  // namespace webkit
+}  // namespace content