Index: webkit/child/ftp_directory_listing_response_delegate.cc |
diff --git a/webkit/child/ftp_directory_listing_response_delegate.cc b/webkit/child/ftp_directory_listing_response_delegate.cc |
index bad606eee6c8ae0ef64526e445bf1682483d308d..4b35b58db30fff60f30f5f6a16d7ed111194579a 100644 |
--- a/webkit/child/ftp_directory_listing_response_delegate.cc |
+++ b/webkit/child/ftp_directory_listing_response_delegate.cc |
@@ -33,7 +33,7 @@ base::string16 ConvertPathToUTF16(const std::string& path) { |
// Per RFC 2640, FTP servers should use UTF-8 or its proper subset ASCII, |
// but many old FTP servers use legacy encodings. Try UTF-8 first. |
if (IsStringUTF8(path)) |
- return UTF8ToUTF16(path); |
+ return base::UTF8ToUTF16(path); |
// Try detecting the encoding. The sample is rather small though, so it may |
// fail. |
@@ -111,7 +111,7 @@ void FtpDirectoryListingResponseDelegate::Init(const GURL& response_url) { |
// add a link to the parent directory. |
if (response_url.path().length() > 1) { |
SendDataToClient(net::GetDirectoryListingEntry( |
- ASCIIToUTF16(".."), std::string(), false, 0, base::Time())); |
+ base::ASCIIToUTF16(".."), std::string(), false, 0, base::Time())); |
} |
} |