| Index: net/proxy/proxy_bypass_rules.cc
|
| diff --git a/net/proxy/proxy_bypass_rules.cc b/net/proxy/proxy_bypass_rules.cc
|
| index 239a2fe30c5f0c482f34a546aadeebcb397a11d8..debb2e8923deafd3228145ff7ccddf6eedba68c7 100644
|
| --- a/net/proxy/proxy_bypass_rules.cc
|
| +++ b/net/proxy/proxy_bypass_rules.cc
|
| @@ -27,7 +27,7 @@ class HostnamePatternRule : public ProxyBypassRules::Rule {
|
| optional_port_(optional_port) {
|
| }
|
|
|
| - virtual bool Matches(const GURL& url) const OVERRIDE {
|
| + virtual bool Matches(const GURL& url) const override {
|
| if (optional_port_ != -1 && url.EffectiveIntPort() != optional_port_)
|
| return false; // Didn't match port expectation.
|
|
|
| @@ -40,7 +40,7 @@ class HostnamePatternRule : public ProxyBypassRules::Rule {
|
| hostname_pattern_);
|
| }
|
|
|
| - virtual std::string ToString() const OVERRIDE {
|
| + virtual std::string ToString() const override {
|
| std::string str;
|
| if (!optional_scheme_.empty())
|
| base::StringAppendF(&str, "%s://", optional_scheme_.c_str());
|
| @@ -50,7 +50,7 @@ class HostnamePatternRule : public ProxyBypassRules::Rule {
|
| return str;
|
| }
|
|
|
| - virtual Rule* Clone() const OVERRIDE {
|
| + virtual Rule* Clone() const override {
|
| return new HostnamePatternRule(optional_scheme_,
|
| hostname_pattern_,
|
| optional_port_);
|
| @@ -64,18 +64,18 @@ class HostnamePatternRule : public ProxyBypassRules::Rule {
|
|
|
| class BypassLocalRule : public ProxyBypassRules::Rule {
|
| public:
|
| - virtual bool Matches(const GURL& url) const OVERRIDE {
|
| + virtual bool Matches(const GURL& url) const override {
|
| const std::string& host = url.host();
|
| if (host == "127.0.0.1" || host == "[::1]")
|
| return true;
|
| return host.find('.') == std::string::npos;
|
| }
|
|
|
| - virtual std::string ToString() const OVERRIDE {
|
| + virtual std::string ToString() const override {
|
| return "<local>";
|
| }
|
|
|
| - virtual Rule* Clone() const OVERRIDE {
|
| + virtual Rule* Clone() const override {
|
| return new BypassLocalRule();
|
| }
|
| };
|
| @@ -96,7 +96,7 @@ class BypassIPBlockRule : public ProxyBypassRules::Rule {
|
| prefix_length_in_bits_(prefix_length_in_bits) {
|
| }
|
|
|
| - virtual bool Matches(const GURL& url) const OVERRIDE {
|
| + virtual bool Matches(const GURL& url) const override {
|
| if (!url.HostIsIPAddress())
|
| return false;
|
|
|
| @@ -113,11 +113,11 @@ class BypassIPBlockRule : public ProxyBypassRules::Rule {
|
| prefix_length_in_bits_);
|
| }
|
|
|
| - virtual std::string ToString() const OVERRIDE {
|
| + virtual std::string ToString() const override {
|
| return description_;
|
| }
|
|
|
| - virtual Rule* Clone() const OVERRIDE {
|
| + virtual Rule* Clone() const override {
|
| return new BypassIPBlockRule(description_,
|
| optional_scheme_,
|
| ip_prefix_,
|
|
|