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

content/common/plugin_list_win.cc

Index: content/common/plugin_list_win.cc
===================================================================
--- content/common/plugin_list_win.cc	(revision 212369)
+++ content/common/plugin_list_win.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 <set>
 
@@ -20,8 +20,10 @@
 #include "base/win/registry.h"
 #include "base/win/scoped_handle.h"
 #include "base/win/windows_version.h"
-#include "webkit/plugins/npapi/plugin_constants_win.h"
+#include "content/common/plugin_constants_win.h"
 
+using webkit::WebPluginInfo;
+
 namespace {
 
 const char16 kRegistryApps[] =
@@ -257,8 +259,7 @@
 
 }  // namespace
 
-namespace webkit {
-namespace npapi {
+namespace content {
 
 bool PluginList::ReadWebPluginInfo(const base::FilePath& filename,
                                    webkit::WebPluginInfo* info) {
@@ -461,5 +462,4 @@
   return true;
 }
 
-}  // namespace npapi
-}  // namespace webkit
+}  // namespace content