Move file enumeration to filepaths.

webkit/tools/test_shell/image_decoder_unittest.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include "webkit/tools/test_shell/image_decoder_unittest.h"
 
 #include "base/file_util.h"
 #include "base/md5.h"
@@ skipping 70 matching lines @@
   ASSERT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &data_dir_));
   file_util::AppendToPath(&data_dir_, L"webkit");
   file_util::AppendToPath(&data_dir_, L"data");
   file_util::AppendToPath(&data_dir_, format_ + L"_decoder");
   ASSERT_TRUE(file_util::PathExists(data_dir_));
 }
 
 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;
     }
     image_files.push_back(next_file_name);
   }
 
   return image_files;
 }
 
 bool ImageDecoderTest::ShouldImageFail(const std::wstring& path) const {
@@ skipping 70 matching lines @@
     // Make sure passing the complete image results in successful decoding.
     partial_contents->append(
         &image_contents.data()[partial_size],
         static_cast<int>(image_contents.size() - partial_size));
     decoder->setData(partial_contents.get(), true);
     VerifyImage(decoder.get(), *i, GetMD5SumPath(*i));
   }
 }
 #endif