Move webplugininfo.h to content/public.

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 "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 "content/common/plugin_constants_win.h"
 
-using webkit::WebPluginInfo;
-
+namespace content {
 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";
 const char16 kRegistryPath[] = L"Path";
@@ skipping 176 matching lines @@
 
   base::win::PEImage image(plugin_image.data());
 
   PIMAGE_NT_HEADERS nt_headers = image.GetNTHeaders();
   return (nt_headers->FileHeader.Machine == IMAGE_FILE_MACHINE_I386);
 }
 
 // Returns true if the given plugins share at least one mime type.  This is used
 // to differentiate newer versions of a plugin vs two plugins which happen to
 // have the same filename.
-bool HaveSharedMimeType(const webkit::WebPluginInfo& plugin1,
-                        const webkit::WebPluginInfo& plugin2) {
+bool HaveSharedMimeType(const WebPluginInfo& plugin1,
+                        const WebPluginInfo& plugin2) {
   for (size_t i = 0; i < plugin1.mime_types.size(); ++i) {
     for (size_t j = 0; j < plugin2.mime_types.size(); ++j) {
       if (plugin1.mime_types[i].mime_type == plugin2.mime_types[j].mime_type)
         return true;
     }
   }
 
   return false;
 }
 
@@ skipping 17 matching lines @@
     if (cur_a > cur_b)
       return false;
     if (cur_a < cur_b)
       return true;
   }
   return false;
 }
 
 }  // namespace
 
-namespace content {
-
 bool PluginList::ReadWebPluginInfo(const base::FilePath& filename,
-                                   webkit::WebPluginInfo* info) {
+                                   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));
   if (!version_info) {
     LOG_IF(ERROR, PluginList::DebugPluginLoading())
         << "Could not get version info for plugin "
@@ skipping 90 matching lines @@
   GetPluginsInRegistryDirectory(
       HKEY_LOCAL_MACHINE, kRegistryMozillaPlugins, &plugin_dirs);
 
   for (std::set<base::FilePath>::iterator i = plugin_dirs.begin();
        i != plugin_dirs.end(); ++i) {
     plugins->push_back(*i);
   }
 }
 
 bool PluginList::ShouldLoadPluginUsingPluginList(
-    const webkit::WebPluginInfo& info,
-    std::vector<webkit::WebPluginInfo>* plugins) {
+    const WebPluginInfo& info,
+    std::vector<WebPluginInfo>* plugins) {
   // Version check
   for (size_t j = 0; j < plugins->size(); ++j) {
     base::FilePath::StringType plugin1 =
         StringToLowerASCII((*plugins)[j].path.BaseName().value());
     base::FilePath::StringType plugin2 =
         StringToLowerASCII(info.path.BaseName().value());
     if ((plugin1 == plugin2 && HaveSharedMimeType((*plugins)[j], info)) ||
         (plugin1 == kJavaDeploy1 && plugin2 == kJavaDeploy2) ||
         (plugin1 == kJavaDeploy2 && plugin2 == kJavaDeploy1)) {
       if (IsNewerVersion(info.version, (*plugins)[j].version))
@@ skipping 68 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 content