| Index: net/proxy/proxy_resolver_v8.cc
|
| diff --git a/net/proxy/proxy_resolver_v8.cc b/net/proxy/proxy_resolver_v8.cc
|
| index 935072b33ea431e8e1fc55e9094e1db1244cc470..c960900ace1ac7274a84c754321e5aae0c5fdef4 100644
|
| --- a/net/proxy/proxy_resolver_v8.cc
|
| +++ b/net/proxy/proxy_resolver_v8.cc
|
| @@ -12,8 +12,8 @@
|
| #include "base/basictypes.h"
|
| #include "base/compiler_specific.h"
|
| #include "base/logging.h"
|
| -#include "base/string_tokenizer.h"
|
| #include "base/string_util.h"
|
| +#include "base/strings/string_tokenizer.h"
|
| #include "base/synchronization/lock.h"
|
| #include "base/utf_string_conversions.h"
|
| #include "googleurl/src/gurl.h"
|
| @@ -275,7 +275,7 @@ bool SortIpAddressList(const std::string& ip_address_list,
|
| // Split-up IP addresses and store them in a vector.
|
| std::vector<IPAddress> ip_vector;
|
| IPAddressNumber ip_num;
|
| - StringTokenizer str_tok(cleaned_ip_address_list, ";");
|
| + base::StringTokenizer str_tok(cleaned_ip_address_list, ";");
|
| while (str_tok.GetNext()) {
|
| if (!ParseIPLiteralToNumber(str_tok.token(), &ip_num))
|
| return false;
|
|
|