diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-25 19:37:03 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-25 19:37:03 +0000 |
| commit | 6c3bf032651d5f912775e0c8cd7e962454145ced (patch) | |
| tree | 88cf8b652147b9acf47aa81999f8652609890dde /webkit/common/fileapi/file_system_util.cc | |
| parent | ce51317df2e23a717f95e56e1a9db1a7fb330a16 (diff) | |
| download | chromium_src-6c3bf032651d5f912775e0c8cd7e962454145ced.zip chromium_src-6c3bf032651d5f912775e0c8cd7e962454145ced.tar.gz chromium_src-6c3bf032651d5f912775e0c8cd7e962454145ced.tar.bz2 | |
Update uses of UTF conversions in ppapi/, printing/, remoting/, rlz/, sandbox/, skia/, sql/, sync/, tools/, webkit/, win8/ to use the base:: namespace.
BUG=330556
TEST=no change
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/121123002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242502 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/common/fileapi/file_system_util.cc')
| -rw-r--r-- | webkit/common/fileapi/file_system_util.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/webkit/common/fileapi/file_system_util.cc b/webkit/common/fileapi/file_system_util.cc index 4d5c352..ef685fe 100644 --- a/webkit/common/fileapi/file_system_util.cc +++ b/webkit/common/fileapi/file_system_util.cc @@ -268,7 +268,7 @@ std::string GetFileSystemTypeString(FileSystemType type) { std::string FilePathToString(const base::FilePath& file_path) { #if defined(OS_WIN) - return UTF16ToUTF8(file_path.value()); + return base::UTF16ToUTF8(file_path.value()); #elif defined(OS_POSIX) return file_path.value(); #endif @@ -276,7 +276,7 @@ std::string FilePathToString(const base::FilePath& file_path) { base::FilePath StringToFilePath(const std::string& file_path_string) { #if defined(OS_WIN) - return base::FilePath(UTF8ToUTF16(file_path_string)); + return base::FilePath(base::UTF8ToUTF16(file_path_string)); #elif defined(OS_POSIX) return base::FilePath(file_path_string); #endif |