Move string tokenizer to base/strings.

chrome/browser/importer/firefox_proxy_settings.cc

 // Copyright (c) 2010 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 "chrome/browser/importer/firefox_proxy_settings.h"
 
 #include "base/file_path.h"
-#include "base/string_tokenizer.h"
 #include "base/string_util.h"
+#include "base/strings/string_tokenizer.h"
 #include "base/values.h"
 #include "chrome/browser/importer/firefox_importer_utils.h"
 #include "net/proxy/proxy_config.h"
 
 namespace {
 
 const char* const kNetworkProxyTypeKey = "network.proxy.type";
 const char* const kHTTPProxyKey = "network.proxy.http";
 const char* const kHTTPProxyPortKey = "network.proxy.http_port";
 const char* const kSSLProxyKey = "network.proxy.ssl";
@@ skipping 183 matching lines @@
       LOG(ERROR) << "Failed to retrieve Firefox SOCKS host";
     if (!dictionary.GetInteger(kSOCKSHostPortKey, &(settings->socks_port_)))
       LOG(ERROR) << "Failed to retrieve Firefox SOCKS port";
     int socks_version;
     if (dictionary.GetInteger(kSOCKSVersionKey, &socks_version))
       settings->socks_version_ = IntToSOCKSVersion(socks_version);
 
     std::string proxy_bypass;
     if (dictionary.GetStringASCII(kNoProxyListKey, &proxy_bypass) &&
         !proxy_bypass.empty()) {
-      StringTokenizer string_tok(proxy_bypass, ",");
+      base::StringTokenizer string_tok(proxy_bypass, ",");
       while (string_tok.GetNext()) {
         std::string token = string_tok.token();
         TrimWhitespaceASCII(token, TRIM_ALL, &token);
         if (!token.empty())
           settings->proxy_bypass_list_.push_back(token);
       }
     }
   }
   return true;
 }