Move webplugininfo.h to content/public.

content/common/plugin_list_posix.cc

 // Copyright (c) 2011 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 <algorithm>
 #include <dlfcn.h>
 #if defined(OS_OPENBSD)
 #include <sys/exec_elf.h>
@@ skipping 17 matching lines @@
 #include "base/strings/stringprintf.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "third_party/npapi/bindings/nphostapi.h"
 
 // These headers must be included in this order to make the declaration gods
 // happy.
 #include "base/third_party/nspr/prcpucfg_linux.h"
 
-using webkit::WebPluginInfo;
-using webkit::WebPluginMimeType;
-
 namespace content {
 
 namespace {
 
 // We build up a list of files and mtimes so we can sort them.
 typedef std::pair<base::FilePath, base::Time> FileAndTime;
 typedef std::vector<FileAndTime> FileTimeList;
 
 enum PluginQuirk {
   // No quirks - plugin is outright banned.
@@ skipping 506 matching lines @@
   // Sort the file list by time (and filename).
   std::sort(files.begin(), files.end(), CompareTime);
 
   // Load the files in order.
   for (FileTimeList::const_iterator i = files.begin(); i != files.end(); ++i) {
     plugins->push_back(i->first);
   }
 }
 
 bool PluginList::ShouldLoadPluginUsingPluginList(
-    const WebPluginInfo& info, std::vector<webkit::WebPluginInfo>* plugins) {
+    const WebPluginInfo& info, std::vector<WebPluginInfo>* plugins) {
   LOG_IF(ERROR, PluginList::DebugPluginLoading())
       << "Considering " << info.path.value() << " (" << info.name << ")";
 
   if (IsUndesirablePlugin(info)) {
     LOG_IF(ERROR, PluginList::DebugPluginLoading())
         << info.path.value() << " is undesirable.";
 
     // See if we have a better version of this plugin.
     for (size_t j = 0; j < plugins->size(); ++j) {
       if ((*plugins)[j].name == info.name &&
           !IsUndesirablePlugin((*plugins)[j])) {
         // Skip the current undesirable one so we can use the better one
         // we just found.
         LOG_IF(ERROR, PluginList::DebugPluginLoading())
             << "Skipping " << info.path.value() << ", preferring "
             << (*plugins)[j].path.value();
         return false;
       }
     }
   }
 
   // TODO(evanm): prefer the newest version of flash, etc. here?
 
   VLOG_IF(1, PluginList::DebugPluginLoading()) << "Using " << info.path.value();
 
   return true;
 }
 
 }  // namespace content