Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1365)

Unified Diff: net/proxy/proxy_bypass_rules.cc

Issue 12087091: Move string tokenizer to base/strings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sort Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/http/http_util.cc ('k') | net/proxy/proxy_config.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
« no previous file with comments | « net/http/http_util.cc ('k') | net/proxy/proxy_config.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698