Move string tokenizer to base/strings.

net/proxy/proxy_list.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/proxy/proxy_list.h"
 
 #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"
 
 using base::TimeDelta;
 using base::TimeTicks;
 
 namespace net {
 
 ProxyList::ProxyList() {
 }
 
 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);
     // Silently discard malformed inputs.
     if (uri.is_valid())
       proxies_.push_back(uri);
   }
 }
 
 void ProxyList::SetSingleProxyServer(const ProxyServer& proxy_server) {
@@ skipping 72 matching lines @@
 size_t ProxyList::size() const {
   return proxies_.size();
 }
 
 const ProxyServer& ProxyList::Get() const {
   DCHECK(!proxies_.empty());
   return proxies_[0];
 }
 
 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(
         entry_tok.token_begin(), entry_tok.token_end());
     // Silently discard malformed inputs.
     if (uri.is_valid())
       proxies_.push_back(uri);
   }
 
   // If we failed to parse anything from the PAC results list, fallback to
@@ skipping 65 matching lines @@
       retry_info.current_delay = kProxyRetryDelay;
       retry_info.bad_until = TimeTicks().Now() + retry_info.current_delay;
       (*proxy_retry_info)[key] = retry_info;
     }
     net_log.AddEvent(NetLog::TYPE_PROXY_LIST_FALLBACK,
                      NetLog::StringCallback("bad_proxy", &key));
   }
 }
 
 }  // namespace net