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

Unified Diff: net/ftp/ftp_network_transaction.cc

Issue 112963005: Update uses of UTF conversions in courgette/, device/, extensions/, google_apis/, gpu/, ipc/, media… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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 | « net/ftp/ftp_directory_listing_parser_vms_unittest.cc ('k') | net/ftp/ftp_network_transaction_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/ftp/ftp_network_transaction.cc
diff --git a/net/ftp/ftp_network_transaction.cc b/net/ftp/ftp_network_transaction.cc
index 23a043247d543f88126b160f91cf26593431f078..3455fc6d7dfe2d400fba94303174308ff14ac95c 100644
--- a/net/ftp/ftp_network_transaction.cc
+++ b/net/ftp/ftp_network_transaction.cc
@@ -256,8 +256,8 @@ int FtpNetworkTransaction::Start(const FtpRequestInfo* request_info,
GetIdentityFromURL(request_->url, &username, &password);
credentials_.Set(username, password);
} else {
- credentials_.Set(ASCIIToUTF16("anonymous"),
- ASCIIToUTF16("chrome@example.com"));
+ credentials_.Set(base::ASCIIToUTF16("anonymous"),
+ base::ASCIIToUTF16("chrome@example.com"));
}
DetectTypecode();
@@ -706,7 +706,7 @@ int FtpNetworkTransaction::DoCtrlReadComplete(int result) {
// connection when anonymous login is not permitted. For more details
// see http://crbug.com/25023.
if (command_sent_ == COMMAND_USER &&
- credentials_.username() == ASCIIToUTF16("anonymous")) {
+ credentials_.username() == base::ASCIIToUTF16("anonymous")) {
response_.needs_auth = true;
}
return Stop(ERR_EMPTY_RESPONSE);
@@ -753,7 +753,7 @@ int FtpNetworkTransaction::DoCtrlWriteComplete(int result) {
// USER Command.
int FtpNetworkTransaction::DoCtrlWriteUSER() {
- std::string command = "USER " + UTF16ToUTF8(credentials_.username());
+ std::string command = "USER " + base::UTF16ToUTF8(credentials_.username());
if (!IsValidFTPCommandString(command))
return Stop(ERR_MALFORMED_IDENTITY);
@@ -784,7 +784,7 @@ int FtpNetworkTransaction::ProcessResponseUSER(
// PASS command.
int FtpNetworkTransaction::DoCtrlWritePASS() {
- std::string command = "PASS " + UTF16ToUTF8(credentials_.password());
+ std::string command = "PASS " + base::UTF16ToUTF8(credentials_.password());
if (!IsValidFTPCommandString(command))
return Stop(ERR_MALFORMED_IDENTITY);
« no previous file with comments | « net/ftp/ftp_directory_listing_parser_vms_unittest.cc ('k') | net/ftp/ftp_network_transaction_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698