Index: net/proxy/proxy_list.cc |
diff --git a/net/proxy/proxy_list.cc b/net/proxy/proxy_list.cc |
index 236e7078f9a46745a57dd306e02ef543afa45f30..011aab90ca1be6d983b48e82613de2f20caf51e8 100644 |
--- a/net/proxy/proxy_list.cc |
+++ b/net/proxy/proxy_list.cc |
@@ -86,17 +86,6 @@ const ProxyServer& ProxyList::Get() const { |
return proxies_[0]; |
} |
-std::string ProxyList::ToPacString() const { |
- std::string proxy_list; |
- std::vector<ProxyServer>::const_iterator iter = proxies_.begin(); |
- for (; iter != proxies_.end(); ++iter) { |
- if (!proxy_list.empty()) |
- proxy_list += ";"; |
- proxy_list += iter->ToPacString(); |
- } |
- return proxy_list.empty() ? std::string() : proxy_list; |
-} |
- |
void ProxyList::SetFromPacString(const std::string& pac_string) { |
StringTokenizer entry_tok(pac_string, ";"); |
proxies_.clear(); |
@@ -115,6 +104,17 @@ void ProxyList::SetFromPacString(const std::string& pac_string) { |
} |
} |
+std::string ProxyList::ToPacString() const { |
+ std::string proxy_list; |
+ std::vector<ProxyServer>::const_iterator iter = proxies_.begin(); |
+ for (; iter != proxies_.end(); ++iter) { |
+ if (!proxy_list.empty()) |
+ proxy_list += ";"; |
+ proxy_list += iter->ToPacString(); |
+ } |
+ return proxy_list.empty() ? std::string() : proxy_list; |
+} |
+ |
bool ProxyList::Fallback(ProxyRetryInfoMap* proxy_retry_info) { |
// Number of minutes to wait before retrying a bad proxy server. |
const TimeDelta kProxyRetryDelay = TimeDelta::FromMinutes(5); |