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

Unified Diff: third_party/leveldatabase/env_chromium.cc

Issue 102993018: Remove UTF string conversion functions from the global namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: aaaaaaaaaa 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 | « content/renderer/render_view_browsertest.cc ('k') | third_party/zlib/google/zip_internal.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/leveldatabase/env_chromium.cc
diff --git a/third_party/leveldatabase/env_chromium.cc b/third_party/leveldatabase/env_chromium.cc
index b5a866c2918577d4e40bb057d9f4fd18ccfeb972..922c5d511d3ef9c158d6acc732b2cb4dfea44a03 100644
--- a/third_party/leveldatabase/env_chromium.cc
+++ b/third_party/leveldatabase/env_chromium.cc
@@ -84,7 +84,8 @@ int fdatasync(int fildes) {
// Wide-char safe fopen wrapper.
FILE* fopen_internal(const char* fname, const char* mode) {
#if defined(OS_WIN)
- return _wfopen(UTF8ToUTF16(fname).c_str(), ASCIIToUTF16(mode).c_str());
+ return _wfopen(base::UTF8ToUTF16(fname).c_str(),
+ base::ASCIIToUTF16(mode).c_str());
#else
return fopen(fname, mode);
#endif
@@ -92,7 +93,7 @@ FILE* fopen_internal(const char* fname, const char* mode) {
base::FilePath CreateFilePath(const std::string& file_path) {
#if defined(OS_WIN)
- return base::FilePath(UTF8ToUTF16(file_path));
+ return base::FilePath(base::UTF8ToUTF16(file_path));
#else
return base::FilePath(file_path);
#endif
@@ -487,7 +488,7 @@ bool IsCorruption(const leveldb::Status& status) {
std::string FilePathToString(const base::FilePath& file_path) {
#if defined(OS_WIN)
- return UTF16ToUTF8(file_path.value());
+ return base::UTF16ToUTF8(file_path.value());
#else
return file_path.value();
#endif
« no previous file with comments | « content/renderer/render_view_browsertest.cc ('k') | third_party/zlib/google/zip_internal.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698