| Index: chrome/browser/plugins/plugin_metadata.cc
|
| ===================================================================
|
| --- chrome/browser/plugins/plugin_metadata.cc (revision 212806)
|
| +++ chrome/browser/plugins/plugin_metadata.cc (working copy)
|
| @@ -8,7 +8,7 @@
|
|
|
| #include "base/logging.h"
|
| #include "base/strings/string_util.h"
|
| -#include "webkit/plugins/webplugininfo.h"
|
| +#include "content/public/common/webplugininfo.h"
|
|
|
| // static
|
| const char PluginMetadata::kAdobeReaderGroupName[] = "Adobe Reader";
|
| @@ -58,7 +58,7 @@
|
| all_mime_types_.end();
|
| }
|
|
|
| -bool PluginMetadata::MatchesPlugin(const webkit::WebPluginInfo& plugin) {
|
| +bool PluginMetadata::MatchesPlugin(const content::WebPluginInfo& plugin) {
|
| for (size_t i = 0; i < matching_mime_types_.size(); ++i) {
|
| // To have a match, every one of the |matching_mime_types_|
|
| // must be handled by the plug-in.
|
| @@ -91,7 +91,7 @@
|
| }
|
|
|
| PluginMetadata::SecurityStatus PluginMetadata::GetSecurityStatus(
|
| - const webkit::WebPluginInfo& plugin) const {
|
| + const content::WebPluginInfo& plugin) const {
|
| if (versions_.empty()) {
|
| #if defined(OS_LINUX)
|
| // On Linux, unknown plugins require authorization.
|
| @@ -102,7 +102,7 @@
|
| }
|
|
|
| Version version;
|
| - webkit::WebPluginInfo::CreateVersionFromString(plugin.version, &version);
|
| + content::WebPluginInfo::CreateVersionFromString(plugin.version, &version);
|
| if (!version.IsValid())
|
| version = Version("0");
|
|
|
|
|