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

Unified Diff: chrome/browser/importer/firefox_proxy_settings.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 | « chrome/browser/history/thumbnail_database.cc ('k') | chrome/browser/language_usage_metrics.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
« no previous file with comments | « chrome/browser/history/thumbnail_database.cc ('k') | chrome/browser/language_usage_metrics.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698