| Index: chrome/browser/content_settings/content_settings_pattern.cc
|
| diff --git a/chrome/browser/content_settings/content_settings_pattern.cc b/chrome/browser/content_settings/content_settings_pattern.cc
|
| index 47215737841739364ae216a478915165e49bdccd..70cc42ea89e23c41a6c680798ebf9de4628eaf23 100644
|
| --- a/chrome/browser/content_settings/content_settings_pattern.cc
|
| +++ b/chrome/browser/content_settings/content_settings_pattern.cc
|
| @@ -310,35 +310,6 @@ ContentSettingsPattern ContentSettingsPattern::FromURL(
|
| }
|
|
|
| // static
|
| -ContentSettingsPattern ContentSettingsPattern::LegacyFromURL(
|
| - const GURL& url) {
|
| - scoped_ptr<ContentSettingsPattern::BuilderInterface> builder(
|
| - ContentSettingsPattern::CreateBuilder(true));
|
| -
|
| - if (url.SchemeIsFile()) {
|
| - builder->WithScheme(url.scheme())->WithPath(url.path());
|
| - } else {
|
| - // Please keep the order of the ifs below as URLs with an IP as host can
|
| - // also have a "http" scheme.
|
| - // TODO(markusheintz): For HTTPS we will create scheme specific patterns as
|
| - // soon as the pattern matching code in the HostContentSettingsMap is
|
| - // replaced.
|
| - if (url.HostIsIPAddress()) {
|
| - builder->WithSchemeWildcard()->WithHost(url.host());
|
| - } else if (url.SchemeIs(chrome::kHttpScheme)) {
|
| - builder->WithSchemeWildcard()->WithDomainWildcard()->WithHost(url.host());
|
| - } else if (url.SchemeIs(chrome::kHttpsScheme)) {
|
| - builder->WithSchemeWildcard()->WithDomainWildcard()->WithHost(
|
| - url.host());
|
| - } else {
|
| - // Unsupported scheme
|
| - }
|
| - builder->WithPortWildcard();
|
| - }
|
| - return builder->Build();
|
| -}
|
| -
|
| -// static
|
| ContentSettingsPattern ContentSettingsPattern::FromURLNoWildcard(
|
| const GURL& url) {
|
| scoped_ptr<ContentSettingsPattern::BuilderInterface> builder(
|
| @@ -358,21 +329,6 @@ ContentSettingsPattern ContentSettingsPattern::FromURLNoWildcard(
|
| }
|
|
|
| // static
|
| -ContentSettingsPattern ContentSettingsPattern::LegacyFromURLNoWildcard(
|
| - const GURL& url) {
|
| - scoped_ptr<ContentSettingsPattern::BuilderInterface> builder(
|
| - ContentSettingsPattern::CreateBuilder(true));
|
| -
|
| - if (url.SchemeIsFile()) {
|
| - builder->WithScheme(url.scheme())->WithPath(url.path());
|
| - } else {
|
| - builder->WithSchemeWildcard()->WithHost(url.host());
|
| - }
|
| - builder->WithPortWildcard();
|
| - return builder->Build();
|
| -}
|
| -
|
| -// static
|
| ContentSettingsPattern ContentSettingsPattern::FromString(
|
| const std::string& pattern_spec) {
|
| scoped_ptr<ContentSettingsPattern::BuilderInterface> builder(
|
|
|