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

Unified Diff: webkit/tools/test_shell/image_decoder_unittest.cc

Issue 13315: Move file enumeration to filepaths. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 12 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 | « net/tools/dump_cache/dump_files.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/tools/test_shell/image_decoder_unittest.cc
===================================================================
--- webkit/tools/test_shell/image_decoder_unittest.cc (revision 6739)
+++ webkit/tools/test_shell/image_decoder_unittest.cc (working copy)
@@ -88,12 +88,13 @@
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;
}
« no previous file with comments | « net/tools/dump_cache/dump_files.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698