Chromium Code Reviews| Index: net/proxy/proxy_bypass_rules.cc |
| diff --git a/net/proxy/proxy_bypass_rules.cc b/net/proxy/proxy_bypass_rules.cc |
| index 3d622a8978575f0f51f2ffa2ac3b9fb320110563..bc9fc331616493b4bc51f61d01bcda11dc8956d8 100644 |
| --- a/net/proxy/proxy_bypass_rules.cc |
| +++ b/net/proxy/proxy_bypass_rules.cc |
| @@ -7,10 +7,13 @@ |
| #include "base/stl_util.h" |
| #include "base/stringprintf.h" |
| #include "base/string_number_conversions.h" |
| +#include "base/string_piece.h" |
| #include "base/string_tokenizer.h" |
| #include "base/string_util.h" |
| #include "net/base/net_util.h" |
| +using base::StringPiece; |
|
cbentzel
2011/12/14 18:15:03
Remove this using declaration.
|
| + |
| namespace net { |
| namespace { |
| @@ -315,7 +318,9 @@ bool ProxyBypassRules::AddRuleFromStringInternal( |
| host = raw; |
| port = -1; |
| if (pos_colon != std::string::npos) { |
| - if (!base::StringToInt(raw.begin() + pos_colon + 1, raw.end(), &port) || |
| + if (!base::StringToInt(StringPiece(raw.begin() + pos_colon + 1, |
| + raw.end()), |
| + &port) || |
| (port < 0 || port > 0xFFFF)) { |
| return false; // Port was invalid. |
| } |