Index: net/proxy/proxy_bypass_rules.cc |
diff --git a/net/proxy/proxy_bypass_rules.cc b/net/proxy/proxy_bypass_rules.cc |
index 1c0fd6142cf1b17fe7c7c16f186fee24237dba06..5f63c5cedf30fd3b6f5e80468c5aeff18848d321 100644 |
--- a/net/proxy/proxy_bypass_rules.cc |
+++ b/net/proxy/proxy_bypass_rules.cc |
@@ -5,11 +5,11 @@ |
#include "net/proxy/proxy_bypass_rules.h" |
#include "base/stl_util.h" |
-#include "base/stringprintf.h" |
#include "base/string_number_conversions.h" |
#include "base/string_piece.h" |
-#include "base/string_tokenizer.h" |
#include "base/string_util.h" |
+#include "base/stringprintf.h" |
+#include "base/strings/string_tokenizer.h" |
#include "net/base/net_util.h" |
namespace net { |
@@ -251,7 +251,7 @@ void ProxyBypassRules::ParseFromStringInternal( |
bool use_hostname_suffix_matching) { |
Clear(); |
- StringTokenizer entries(raw, ",;"); |
+ base::StringTokenizer entries(raw, ",;"); |
while (entries.GetNext()) { |
AddRuleFromStringInternalWithLogging(entries.token(), |
use_hostname_suffix_matching); |