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

Unified Diff: net/proxy/proxy_list.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/proxy/proxy_config_service_win.cc ('k') | net/proxy/proxy_resolver_v8.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/proxy/proxy_list.cc
diff --git a/net/proxy/proxy_list.cc b/net/proxy/proxy_list.cc
index 2057d50b4327321eafa2e2e0dd42ac63dcbb90f0..edb98074987d5d71351defad07fedbbec37cb5fc 100644
--- a/net/proxy/proxy_list.cc
+++ b/net/proxy/proxy_list.cc
@@ -6,7 +6,7 @@
#include "base/callback.h"
#include "base/logging.h"
-#include "base/string_tokenizer.h"
+#include "base/strings/string_tokenizer.h"
#include "base/time.h"
#include "net/proxy/proxy_server.h"
@@ -23,7 +23,7 @@ ProxyList::~ProxyList() {
void ProxyList::Set(const std::string& proxy_uri_list) {
proxies_.clear();
- StringTokenizer str_tok(proxy_uri_list, ";");
+ base::StringTokenizer str_tok(proxy_uri_list, ";");
while (str_tok.GetNext()) {
ProxyServer uri = ProxyServer::FromURI(
str_tok.token_begin(), str_tok.token_end(), ProxyServer::SCHEME_HTTP);
@@ -116,7 +116,7 @@ const ProxyServer& ProxyList::Get() const {
}
void ProxyList::SetFromPacString(const std::string& pac_string) {
- StringTokenizer entry_tok(pac_string, ";");
+ base::StringTokenizer entry_tok(pac_string, ";");
proxies_.clear();
while (entry_tok.GetNext()) {
ProxyServer uri = ProxyServer::FromPacString(
« no previous file with comments | « net/proxy/proxy_config_service_win.cc ('k') | net/proxy/proxy_resolver_v8.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698