[net] Prepare //net for the base::string16 switch
This change prepares //net for the upcoming switch of base::string16 to
std::u16string.
Bug: 911896
Change-Id: I4e752515a92f81a43154c0f7df856289d2bed2c5
Reviewed-on: https://chromium-review.googlesource.com/c/1450195
Commit-Queue: Jan Wilken Dörrie <[email protected]>
Reviewed-by: Victor Costan <[email protected]>
Reviewed-by: Matt Menke <[email protected]>
Cr-Commit-Position: refs/heads/master@{#628471}diff --git a/sql/database.cc b/sql/database.cc
index adf3b2c..e820382 100644
--- a/sql/database.cc
+++ b/sql/database.cc
@@ -158,7 +158,7 @@
std::string AsUTF8ForSQL(const base::FilePath& path) {
#if defined(OS_WIN)
- return base::WideToUTF8(path.value());
+ return base::UTF16ToUTF8(path.value());
#elif defined(OS_POSIX) || defined(OS_FUCHSIA)
return path.value();
#endif
@@ -540,7 +540,7 @@
const char* path = sqlite3_db_filename(db_, "main");
const base::StringPiece db_path(path);
#if defined(OS_WIN)
- return base::FilePath(base::UTF8ToWide(db_path));
+ return base::FilePath(base::UTF8ToUTF16(db_path));
#elif defined(OS_POSIX) || defined(OS_FUCHSIA)
return base::FilePath(db_path);
#else
