Index: chrome/browser/importer/firefox_proxy_settings.cc |
diff --git a/chrome/browser/importer/firefox_proxy_settings.cc b/chrome/browser/importer/firefox_proxy_settings.cc |
index 1771b1c2335c16463aaff714ce8427ba12a59b66..f92df2eff257b94266ec55878e24f2e780a16c26 100644 |
--- a/chrome/browser/importer/firefox_proxy_settings.cc |
+++ b/chrome/browser/importer/firefox_proxy_settings.cc |
@@ -5,8 +5,8 @@ |
#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" |
@@ -210,7 +210,7 @@ bool FirefoxProxySettings::GetSettingsFromFile(const FilePath& pref_file, |
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); |