| Index: net/http/http_auth_filter.cc
|
| diff --git a/net/http/http_auth_filter.cc b/net/http/http_auth_filter.cc
|
| index a61e7f7b3fbed6105270752f43424fbd7fcc5867..2109e4d7b4f8f4649d4830a2d9501595bc8454db 100644
|
| --- a/net/http/http_auth_filter.cc
|
| +++ b/net/http/http_auth_filter.cc
|
| @@ -24,21 +24,6 @@ HttpAuthFilterWhitelist::HttpAuthFilterWhitelist(
|
| HttpAuthFilterWhitelist::~HttpAuthFilterWhitelist() {
|
| }
|
|
|
| -void HttpAuthFilterWhitelist::SetWhitelist(
|
| - const std::string& server_whitelist) {
|
| - rules_.ParseFromString(server_whitelist);
|
| -}
|
| -
|
| -bool HttpAuthFilterWhitelist::IsValid(const GURL& url,
|
| - HttpAuth::Target target) const {
|
| - if ((target != HttpAuth::AUTH_SERVER) && (target != HttpAuth::AUTH_PROXY))
|
| - return false;
|
| - // All proxies pass
|
| - if (target == HttpAuth::AUTH_PROXY)
|
| - return true;
|
| - return rules_.Matches(url);
|
| -}
|
| -
|
| // Add a new domain |filter| to the whitelist, if it's not already there
|
| bool HttpAuthFilterWhitelist::AddFilter(const std::string& filter,
|
| HttpAuth::Target target) {
|
| @@ -55,4 +40,19 @@ void HttpAuthFilterWhitelist::AddRuleToBypassLocal() {
|
| rules_.AddRuleToBypassLocal();
|
| }
|
|
|
| +bool HttpAuthFilterWhitelist::IsValid(const GURL& url,
|
| + HttpAuth::Target target) const {
|
| + if ((target != HttpAuth::AUTH_SERVER) && (target != HttpAuth::AUTH_PROXY))
|
| + return false;
|
| + // All proxies pass
|
| + if (target == HttpAuth::AUTH_PROXY)
|
| + return true;
|
| + return rules_.Matches(url);
|
| +}
|
| +
|
| +void HttpAuthFilterWhitelist::SetWhitelist(
|
| + const std::string& server_whitelist) {
|
| + rules_.ParseFromString(server_whitelist);
|
| +}
|
| +
|
| } // namespace net
|
|
|