Move file enumeration to filepaths.

chrome/browser/importer/firefox2_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/firefox2_importer.h"
 
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/registry.h"
 #include "base/string_util.h"
@@ skipping 490 matching lines @@
   ReplaceSubstringsAfterOffset(text, 0, L">", L">");
   ReplaceSubstringsAfterOffset(text, 0, L"&", L"&");
   ReplaceSubstringsAfterOffset(text, 0, L""", L"\"");
   ReplaceSubstringsAfterOffset(text, 0, L"'", L"\'");
 }
 
 // static
 void Firefox2Importer::FindXMLFilesInDir(
     const std::wstring& dir,
     std::vector<std::wstring>* xml_files) {
-  file_util::FileEnumerator file_enum(dir, false,
+  file_util::FileEnumerator file_enum(FilePath::FromWStringHack(dir), false,
                                       file_util::FileEnumerator::FILES,
-                                      L"*.xml");
-  std::wstring file(file_enum.Next());
+                                      FILE_PATH_LITERAL("*.xml"));
+  std::wstring file(file_enum.Next().ToWStringHack());
   while (!file.empty()) {
     xml_files->push_back(file);
-    file = file_enum.Next();
+    file = file_enum.Next().ToWStringHack();
   }
 }
 
 // static
 void Firefox2Importer::DataURLToFaviconUsage(
     const GURL& link_url,
     const GURL& favicon_data,
     std::vector<history::ImportedFavIconUsage>* favicons) {
   if (!link_url.is_valid() || !favicon_data.is_valid() ||
       !favicon_data.SchemeIs("data"))
@@ skipping 12 matching lines @@
 
   // We need to make up a URL for the favicon. We use a version of the page's
   // URL so that we can be sure it will not collide.
   usage.favicon_url = GURL(std::string("made-up-favicon:") + link_url.spec());
 
   // We only have one URL per favicon for Firefox 2 bookmarks.
   usage.urls.insert(link_url);
 
   favicons->push_back(usage);
 }