Move file enumeration to filepaths.

chrome/browser/importer/ie_importer.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 "chrome/browser/importer/ie_importer.h"
 
 #include <intshcut.h>
 #include <pstore.h>
 #include <shlobj.h>
 #include <urlhist.h>
@@ skipping 451 matching lines @@
     info->links_folder = L"Links";
   }
 
   return true;
 }
 
 void IEImporter::ParseFavoritesFolder(const FavoritesInfo& info,
                                       BookmarkVector* bookmarks) {
   std::wstring ie_folder = l10n_util::GetString(IDS_BOOKMARK_GROUP_FROM_IE);
   BookmarkVector toolbar_bookmarks;
-  std::wstring file;
+  FilePath file;
   std::vector<std::wstring> file_list;
-  file_util::FileEnumerator file_enumerator(info.path, true,
+  file_util::FileEnumerator file_enumerator(
+      FilePath::FromWStringHack(info.path), true,
       file_util::FileEnumerator::FILES);
-  while (!(file = file_enumerator.Next()).empty() && !cancelled())
-    file_list.push_back(file);
+  while (!(file = file_enumerator.Next()).value().empty() && !cancelled())
+    file_list.push_back(file.ToWStringHack());
 
   // Keep the bookmarks in alphabetical order.
   std::sort(file_list.begin(), file_list.end());
 
   for (std::vector<std::wstring>::iterator it = file_list.begin();
        it != file_list.end(); ++it) {
     std::wstring filename = file_util::GetFilenameFromPath(*it);
     std::wstring extension = file_util::GetFileExtensionFromPath(filename);
     if (!LowerCaseEqualsASCII(extension, "url"))
       continue;
@@ skipping 65 matching lines @@
   if (version < 0) {
     wchar_t buffer[128];
     DWORD buffer_length = sizeof(buffer);
     bool result = ReadFromRegistry(HKEY_LOCAL_MACHINE,
         L"Software\\Microsoft\\Internet Explorer",
         L"Version", buffer, &buffer_length);
     version = (result ? _wtoi(buffer) : 0);
   }
   return version;
 }