diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-24 20:27:04 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-24 20:27:04 +0000 |
| commit | 5f0cebb46d66ef0a1996594d0846c0067a8cf475 (patch) | |
| tree | 5b3204961a403e7396fe48b45930b5b6528839f0 /chrome/browser/parsers | |
| parent | 20023a76c3ffa049c35f86263fbf6ee4bbf00ade (diff) | |
| download | chromium_src-5f0cebb46d66ef0a1996594d0846c0067a8cf475.zip chromium_src-5f0cebb46d66ef0a1996594d0846c0067a8cf475.tar.gz chromium_src-5f0cebb46d66ef0a1996594d0846c0067a8cf475.tar.bz2 | |
Add utf_string_conversions to base namespace.
This adds "using"s for all functions so those can be fixed in a separate pass.
This converts the "Wide" versions of the functions in the Chrome directory as a first pass on the changeover.
BUG=
Review URL: https://codereview.chromium.org/12314090
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184352 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/parsers')
| -rw-r--r-- | chrome/browser/parsers/metadata_parser_filebase.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/parsers/metadata_parser_filebase_unittest.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/parsers/metadata_parser_jpeg_factory.cc | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/parsers/metadata_parser_filebase.cc b/chrome/browser/parsers/metadata_parser_filebase.cc index 56207e1..537fbf1 100644 --- a/chrome/browser/parsers/metadata_parser_filebase.cc +++ b/chrome/browser/parsers/metadata_parser_filebase.cc @@ -22,7 +22,7 @@ bool FileMetadataParser::Parse() { properties_[MetadataParser::kPropertyFilesize] = base::Int64ToString(size); } #if defined(OS_WIN) - value = WideToUTF8(path_.BaseName().value()); + value = base::WideToUTF8(path_.BaseName().value()); properties_[MetadataParser::kPropertyTitle] = value; #elif defined(OS_POSIX) properties_[MetadataParser::kPropertyTitle] = path_.BaseName().value(); diff --git a/chrome/browser/parsers/metadata_parser_filebase_unittest.cc b/chrome/browser/parsers/metadata_parser_filebase_unittest.cc index 170dd06..9097079 100644 --- a/chrome/browser/parsers/metadata_parser_filebase_unittest.cc +++ b/chrome/browser/parsers/metadata_parser_filebase_unittest.cc @@ -8,7 +8,7 @@ #include "base/file_util.h" #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" -#include "base/string_util.h" // TODO(brettw) remove when WideToASCII moves. +#include "base/string_util.h" // TODO(brettw) remove when base::WideToASCII moves. #include "base/strings/string_number_conversions.h" #include "chrome/browser/parsers/metadata_parser_filebase.h" #include "testing/gtest/include/gtest/gtest.h" @@ -34,7 +34,7 @@ class FileMetaDataParserTest : public testing::Test { #if defined(OS_POSIX) return test_file_.BaseName().value(); #elif defined(OS_WIN) - return WideToASCII(test_file_.BaseName().value()); + return base::WideToASCII(test_file_.BaseName().value()); #endif // defined(OS_POSIX) } diff --git a/chrome/browser/parsers/metadata_parser_jpeg_factory.cc b/chrome/browser/parsers/metadata_parser_jpeg_factory.cc index 366ded3..a146865 100644 --- a/chrome/browser/parsers/metadata_parser_jpeg_factory.cc +++ b/chrome/browser/parsers/metadata_parser_jpeg_factory.cc @@ -16,7 +16,7 @@ bool MetadataParserJpegFactory::CanParse(const base::FilePath& path, char* bytes, int bytes_size) { #if defined(OS_WIN) - base::FilePath::StringType ext = UTF8ToWide(std::string(".jpg")); + base::FilePath::StringType ext = base::UTF8ToWide(std::string(".jpg")); #elif defined(OS_POSIX) base::FilePath::StringType ext = ".jpg"; #endif |