Move file enumeration to filepaths.

chrome/browser/safe_browsing/safe_browsing_database_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.
 //
 // Unit tests for the SafeBrowsing storage system.
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
@@ skipping 1096 matching lines @@
 void UpdateDatabase(const std::wstring& initial_db,
                     const std::wstring& response_path,
                     const std::wstring& updates_path) {
   // First we read the chunks from disk, so that this isn't counted in IO bytes.
   std::vector<ChunksInfo> chunks;
 
   SafeBrowsingProtocolParser parser;
   if (!updates_path.empty()) {
     std::wstring data_dir = GetFullSBDataPath(updates_path);
     file_util::FileEnumerator file_enum(
-        data_dir, false, file_util::FileEnumerator::FILES);
+        FilePath::FromWStringHack(data_dir), false,
+        file_util::FileEnumerator::FILES);
     while (true) {
-      std::wstring file = file_enum.Next();
+      std::wstring file = file_enum.Next().ToWStringHack();
       if (file.empty())
         break;
 
       int64 size64;
       bool result = file_util::GetFileSize(file, &size64);
       CHECK(result);
 
       int size = static_cast<int>(size64);
       scoped_array<char> data(new char[size]);
       file_util::ReadFile(file, data.get(), size);
@@ skipping 103 matching lines @@
 TEST(SafeBrowsingDatabase, DISABLED_DatabaseOldLotsofDeletesIO) {
   std::vector<ChunksInfo> chunks;
   std::vector<SBChunkDelete>* deletes = new std::vector<SBChunkDelete>;
   SBChunkDelete del;
   del.is_sub_del = false;
   del.list_name = safe_browsing_util::kMalwareList;
   del.chunk_del.push_back(ChunkRange(3539, 3579));
   deletes->push_back(del);
   PeformUpdate(GetOldSafeBrowsingPath(), chunks, deletes);
 }