diff options
| author | avi@google.com <avi@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-11 14:55:12 +0000 |
|---|---|---|
| committer | avi@google.com <avi@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-11 14:55:12 +0000 |
| commit | 0b733220c5fbef986647fce040c1b5d5e48be2b6 (patch) | |
| tree | 72caaec198bd07c1e468c2a4805b00067da78126 /webkit | |
| parent | 64596e5e583f0c64124da1a79e496d6e063c25fa (diff) | |
| download | chromium_src-0b733220c5fbef986647fce040c1b5d5e48be2b6.zip chromium_src-0b733220c5fbef986647fce040c1b5d5e48be2b6.tar.gz chromium_src-0b733220c5fbef986647fce040c1b5d5e48be2b6.tar.bz2 | |
Move file enumeration to filepaths.
Review URL: http://codereview.chromium.org/13315
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6784 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/tools/test_shell/image_decoder_unittest.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/webkit/tools/test_shell/image_decoder_unittest.cc b/webkit/tools/test_shell/image_decoder_unittest.cc index 4028d56..b3745fa 100644 --- a/webkit/tools/test_shell/image_decoder_unittest.cc +++ b/webkit/tools/test_shell/image_decoder_unittest.cc @@ -88,12 +88,13 @@ void ImageDecoderTest::SetUp() { std::vector<std::wstring> ImageDecoderTest::GetImageFiles() const { std::wstring pattern = L"*." + format_; - file_util::FileEnumerator enumerator(data_dir_, false, + file_util::FileEnumerator enumerator(FilePath::FromWStringHack(data_dir_), + false, file_util::FileEnumerator::FILES); std::vector<std::wstring> image_files; std::wstring next_file_name; - while ((next_file_name = enumerator.Next()) != L"") { + while ((next_file_name = enumerator.Next().ToWStringHack()) != L"") { if (!MatchPattern(next_file_name, pattern)) { continue; } |