Index: webkit/plugins/npapi/plugin_group.cc |
diff --git a/webkit/plugins/npapi/plugin_group.cc b/webkit/plugins/npapi/plugin_group.cc |
index fa08962da42e41888809c4f7f22de4953a357a80..aa8be2f12aec2e9eb9685d26c846815d590ed252 100644 |
--- a/webkit/plugins/npapi/plugin_group.cc |
+++ b/webkit/plugins/npapi/plugin_group.cc |
@@ -1,4 +1,4 @@ |
-// Copyright (c) 2011 The Chromium Authors. All rights reserved. |
+// 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. |
@@ -20,8 +20,6 @@ namespace npapi { |
// static |
const char PluginGroup::kAdobeReaderGroupName[] = "Adobe Acrobat"; |
-const char PluginGroup::kAdobeReaderUpdateURL[] = |
- "http://get.adobe.com/reader/"; |
const char PluginGroup::kJavaGroupName[] = "Java"; |
const char PluginGroup::kQuickTimeGroupName[] = "QuickTime"; |
const char PluginGroup::kShockwaveGroupName[] = "Shockwave"; |
@@ -32,8 +30,7 @@ const char PluginGroup::kWindowsMediaPlayerGroupName[] = "Windows Media Player"; |
VersionRange::VersionRange(const VersionRangeDefinition& definition) |
: low_str(definition.version_matcher_low), |
high_str(definition.version_matcher_high), |
- min_str(definition.min_version), |
- requires_authorization(definition.requires_authorization) { |
+ min_str(definition.min_version) { |
if (!low_str.empty()) |
low.reset(Version::GetVersionFromString(low_str)); |
if (!high_str.empty()) |
@@ -60,24 +57,20 @@ void VersionRange::InitFrom(const VersionRange& other) { |
low.reset(Version::GetVersionFromString(other.low_str)); |
high.reset(Version::GetVersionFromString(other.high_str)); |
min.reset(Version::GetVersionFromString(other.min_str)); |
- requires_authorization = other.requires_authorization; |
} |
PluginGroup::PluginGroup(const string16& group_name, |
const string16& name_matcher, |
- const std::string& update_url, |
const std::string& identifier) |
: identifier_(identifier), |
group_name_(group_name), |
- name_matcher_(name_matcher), |
- update_url_(update_url) { |
+ name_matcher_(name_matcher) { |
} |
void PluginGroup::InitFrom(const PluginGroup& other) { |
identifier_ = other.identifier_; |
group_name_ = other.group_name_; |
name_matcher_ = other.name_matcher_; |
- update_url_ = other.update_url_; |
version_ranges_ = other.version_ranges_; |
web_plugin_infos_ = other.web_plugin_infos_; |
} |
@@ -96,7 +89,6 @@ PluginGroup* PluginGroup::FromPluginGroupDefinition( |
const PluginGroupDefinition& definition) { |
PluginGroup* group = new PluginGroup(ASCIIToUTF16(definition.name), |
ASCIIToUTF16(definition.name_matcher), |
- definition.update_url, |
definition.identifier); |
for (size_t i = 0; i < definition.num_versions; ++i) |
group->version_ranges_.push_back(VersionRange(definition.versions[i])); |
@@ -126,7 +118,7 @@ std::string PluginGroup::GetLongIdentifier(const WebPluginInfo& wpi) { |
/*static*/ |
PluginGroup* PluginGroup::FromWebPluginInfo(const WebPluginInfo& wpi) { |
// Create a matcher from the name of this plugin. |
- return new PluginGroup(wpi.name, wpi.name, std::string(), |
+ return new PluginGroup(wpi.name, wpi.name, |
GetIdentifier(wpi)); |
} |
@@ -256,19 +248,6 @@ bool PluginGroup::IsVulnerable(const WebPluginInfo& plugin) const { |
return false; |
} |
-bool PluginGroup::RequiresAuthorization(const WebPluginInfo& plugin) const { |
- scoped_ptr<Version> version(CreateVersionFromString(plugin.version)); |
- if (!version.get()) |
- return false; |
- |
- for (size_t i = 0; i < version_ranges_.size(); ++i) { |
- if (IsVersionInRange(*version, version_ranges_[i]) && |
- version_ranges_[i].requires_authorization) |
- return true; |
- } |
- return false; |
-} |
- |
bool PluginGroup::IsEmpty() const { |
return web_plugin_infos_.empty(); |
} |