| Index: net/proxy/proxy_config_service_linux.cc
|
| diff --git a/net/proxy/proxy_config_service_linux.cc b/net/proxy/proxy_config_service_linux.cc
|
| index c604820a8ab41c1ed12c58ab6898f6ceec91014e..db4b738c4a65ca86f8c689e9df2a0cb471ea45be 100644
|
| --- a/net/proxy/proxy_config_service_linux.cc
|
| +++ b/net/proxy/proxy_config_service_linux.cc
|
| @@ -27,8 +27,8 @@
|
| #include "base/nix/xdg_util.h"
|
| #include "base/single_thread_task_runner.h"
|
| #include "base/string_number_conversions.h"
|
| -#include "base/string_tokenizer.h"
|
| #include "base/string_util.h"
|
| +#include "base/strings/string_tokenizer.h"
|
| #include "base/threading/thread_restrictions.h"
|
| #include "base/timer.h"
|
| #include "googleurl/src/url_canon.h"
|
| @@ -1053,7 +1053,7 @@ class SettingGetterImplKDE : public ProxyConfigServiceLinux::SettingGetter,
|
|
|
| void AddHostList(StringListSetting key, const std::string& value) {
|
| std::vector<std::string> tokens;
|
| - StringTokenizer tk(value, ", ");
|
| + base::StringTokenizer tk(value, ", ");
|
| while (tk.GetNext()) {
|
| std::string token = tk.token();
|
| if (!token.empty())
|
|
|