| Index: net/proxy/proxy_info.cc
|
| diff --git a/net/proxy/proxy_info.cc b/net/proxy/proxy_info.cc
|
| index dd68820c1dec06876f793a44bf554d2300cbf659..b6fcc86767f14350581bc8e23788cb9bbcd12d51 100644
|
| --- a/net/proxy/proxy_info.cc
|
| +++ b/net/proxy/proxy_info.cc
|
| @@ -49,6 +49,16 @@ void ProxyInfo::UseProxyServer(const ProxyServer& proxy_server) {
|
| proxy_list_.SetSingleProxyServer(proxy_server);
|
| }
|
|
|
| +void ProxyInfo::UsePacString(const std::string& pac_string) {
|
| + Reset();
|
| + proxy_list_.SetFromPacString(pac_string);
|
| +}
|
| +
|
| +void ProxyInfo::UseProxyList(const ProxyList& proxy_list) {
|
| + Reset();
|
| + proxy_list_ = proxy_list;
|
| +}
|
| +
|
| std::string ProxyInfo::ToPacString() const {
|
| return proxy_list_.ToPacString();
|
| }
|
|
|