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

content/common/plugin_list_win.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 "webkit/plugins/npapi/plugin_list.h"
+#include "content/common/plugin_list.h"
 
 #include <set>
 
 #include "base/basictypes.h"
 #include "base/file_util.h"
 #include "base/file_version_info.h"
 #include "base/file_version_info_win.h"
 #include "base/files/memory_mapped_file.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/win/pe_image.h"
 #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[] =
     L"Software\\Microsoft\\Windows\\CurrentVersion\\App Paths";
 const char16 kRegistryFirefox[] = L"firefox.exe";
 const char16 kRegistryAcrobat[] = L"Acrobat.exe";
 const char16 kRegistryAcrobatReader[] = L"AcroRd32.exe";
 const char16 kRegistryWindowsMedia[] = L"wmplayer.exe";
 const char16 kRegistryQuickTime[] = L"QuickTimePlayer.exe";
@@ skipping 216 matching lines @@
     if (cur_a > cur_b)
       return false;
     if (cur_a < cur_b)
       return true;
   }
   return false;
 }
 
 }  // namespace
 
-namespace webkit {
-namespace npapi {
+namespace content {
 
 bool PluginList::ReadWebPluginInfo(const base::FilePath& filename,
                                    webkit::WebPluginInfo* info) {
   // On windows, the way we get the mime types for the library is
   // to check the version information in the DLL itself.  This
   // will be a string of the format:  <type1>|<type2>|<type3>|...
   // For example:
   //     video/quicktime|audio/aiff|image/jpeg
   scoped_ptr<FileVersionInfo> version_info(
       FileVersionInfo::CreateFileVersionInfo(filename));
@@ skipping 182 matching lines @@
 
 #if !defined(ARCH_CPU_X86_64)
   // The plugin in question could be a 64 bit plugin which we cannot load.
   base::FilePath plugin_path(info.path);
   if (!IsValid32BitImage(base::MakeAbsoluteFilePath(plugin_path)))
     return false;
 #endif
   return true;
 }
 
-}  // namespace npapi
-}  // namespace webkit
+}  // namespace content