| Index: net/proxy/proxy_config_service_win.cc
|
| diff --git a/net/proxy/proxy_config_service_win.cc b/net/proxy/proxy_config_service_win.cc
|
| index 60f6f749c5d98d2c35869382b4b2c658d5ad30e6..49fd60f66f70b8b8264cd211aef4b5f124a51785 100644
|
| --- a/net/proxy/proxy_config_service_win.cc
|
| +++ b/net/proxy/proxy_config_service_win.cc
|
| @@ -9,8 +9,8 @@
|
|
|
| #include "base/logging.h"
|
| #include "base/memory/scoped_ptr.h"
|
| -#include "base/string_tokenizer.h"
|
| #include "base/string_util.h"
|
| +#include "base/strings/string_tokenizer.h"
|
| #include "base/stl_util.h"
|
| #include "base/threading/thread_restrictions.h"
|
| #include "base/win/registry.h"
|
| @@ -180,7 +180,7 @@ void ProxyConfigServiceWin::SetFromIEConfig(
|
| if (ie_config.lpszProxyBypass) {
|
| std::string proxy_bypass = WideToASCII(ie_config.lpszProxyBypass);
|
|
|
| - StringTokenizer proxy_server_bypass_list(proxy_bypass, ";, \t\n\r");
|
| + base::StringTokenizer proxy_server_bypass_list(proxy_bypass, ";, \t\n\r");
|
| while (proxy_server_bypass_list.GetNext()) {
|
| std::string bypass_url_domain = proxy_server_bypass_list.token();
|
| config->proxy_rules().bypass_rules.AddRuleFromString(bypass_url_domain);
|
|
|