summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/base/mime_util.cc2
-rw-r--r--net/base/net_util.cc2
-rw-r--r--net/ftp/ftp_network_transaction.cc2
-rw-r--r--net/http/http_network_transaction_unittest.cc2
-rw-r--r--net/proxy/proxy_resolver_v8.cc2
-rw-r--r--net/test/embedded_test_server/http_request.cc2
-rw-r--r--net/tools/gdig/gdig.cc2
7 files changed, 7 insertions, 7 deletions
diff --git a/net/base/mime_util.cc b/net/base/mime_util.cc
index 8eba45a..b1ebfec 100644
--- a/net/base/mime_util.cc
+++ b/net/base/mime_util.cc
@@ -668,7 +668,7 @@ void MimeUtil::ParseCodecString(const std::string& codecs,
std::vector<std::string>* codecs_out,
bool strip) {
std::string no_quote_codecs;
- TrimString(codecs, "\"", &no_quote_codecs);
+ base::TrimString(codecs, "\"", &no_quote_codecs);
base::SplitString(no_quote_codecs, ',', codecs_out);
if (!strip)
diff --git a/net/base/net_util.cc b/net/base/net_util.cc
index e5200e7..4a4ff52 100644
--- a/net/base/net_util.cc
+++ b/net/base/net_util.cc
@@ -773,7 +773,7 @@ void SanitizeGeneratedFileName(base::FilePath::StringType* filename,
if (trimmed)
filename->insert(filename->end(), trimmed, kReplace[0]);
}
- TrimString(*filename, FILE_PATH_LITERAL("."), filename);
+ base::TrimString(*filename, FILE_PATH_LITERAL("."), filename);
if (filename->empty())
return;
// Replace any path information by changing path separators.
diff --git a/net/ftp/ftp_network_transaction.cc b/net/ftp/ftp_network_transaction.cc
index 86e042b..23a0432 100644
--- a/net/ftp/ftp_network_transaction.cc
+++ b/net/ftp/ftp_network_transaction.cc
@@ -835,7 +835,7 @@ int FtpNetworkTransaction::ProcessResponseSYST(
// Remove all whitespace, to correctly handle cases like fancy "V M S"
// response instead of "VMS".
- RemoveChars(line, base::kWhitespaceASCII, &line);
+ base::RemoveChars(line, base::kWhitespaceASCII, &line);
// The "magic" strings we test for below have been gathered by an
// empirical study. VMS needs to come first because some VMS systems
diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc
index 0029541..18abdea 100644
--- a/net/http/http_network_transaction_unittest.cc
+++ b/net/http/http_network_transaction_unittest.cc
@@ -112,7 +112,7 @@ bool GetHeaders(base::DictionaryValue* params, std::string* headers) {
return false;
std::string double_quote_headers;
base::JSONWriter::Write(header_list, &double_quote_headers);
- ReplaceChars(double_quote_headers, "\"", "'", headers);
+ base::ReplaceChars(double_quote_headers, "\"", "'", headers);
return true;
}
diff --git a/net/proxy/proxy_resolver_v8.cc b/net/proxy/proxy_resolver_v8.cc
index a4943bd..553857f 100644
--- a/net/proxy/proxy_resolver_v8.cc
+++ b/net/proxy/proxy_resolver_v8.cc
@@ -276,7 +276,7 @@ bool SortIpAddressList(const std::string& ip_address_list,
// Strip all whitespace (mimics IE behavior).
std::string cleaned_ip_address_list;
- RemoveChars(ip_address_list, " \t", &cleaned_ip_address_list);
+ base::RemoveChars(ip_address_list, " \t", &cleaned_ip_address_list);
if (cleaned_ip_address_list.empty())
return false;
diff --git a/net/test/embedded_test_server/http_request.cc b/net/test/embedded_test_server/http_request.cc
index 8ac76d3..f1bf302 100644
--- a/net/test/embedded_test_server/http_request.cc
+++ b/net/test/embedded_test_server/http_request.cc
@@ -21,7 +21,7 @@ size_t kRequestSizeLimit = 64 * 1024 * 1024; // 64 mb.
// Helper function used to trim tokens in http request headers.
std::string Trim(const std::string& value) {
std::string result;
- TrimString(value, " \t", &result);
+ base::TrimString(value, " \t", &result);
return result;
}
diff --git a/net/tools/gdig/gdig.cc b/net/tools/gdig/gdig.cc
index 54f0509..db0704c 100644
--- a/net/tools/gdig/gdig.cc
+++ b/net/tools/gdig/gdig.cc
@@ -126,7 +126,7 @@ bool LoadReplayLog(const base::FilePath& file_path, ReplayLog* replay_log) {
// smarter line splitter, but this particular use does not need to target
// efficiency.
std::string replay_log_contents;
- RemoveChars(original_replay_log_contents, "\r", &replay_log_contents);
+ base::RemoveChars(original_replay_log_contents, "\r", &replay_log_contents);
std::vector<std::string> lines;
base::SplitString(replay_log_contents, '\n', &lines);