Convert a bunch more of importer into FilePath.

I thought this would be a small job but I pulled the thread
and it kept coming.  :(

BUG=24672

Review URL: http://codereview.chromium.org/650034

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39610 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 7 deletions

diff --git a/chrome/browser/importer/firefox2_importer.h b/chrome/browser/importer/firefox2_importer.h
index 79b6780..95e3cc8 100644
--- a/chrome/browser/importer/firefox2_importer.h
+++ b/chrome/browser/importer/firefox2_importer.h
@@ -7,6 +7,7 @@
 
 #include <set>
 
+#include "base/file_path.h"
 #include "chrome/browser/importer/importer.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"
 
@@ -24,7 +25,7 @@ class Firefox2Importer : public Importer {
 
   // Loads the default bookmarks in the Firefox installed at |firefox_app_path|,
   // and stores their locations in |urls|.
-  static void LoadDefaultBookmarks(const std::wstring& firefox_app_path,
+  static void LoadDefaultBookmarks(const FilePath& firefox_app_path,
                                    std::set<GURL> *urls);
 
   // Creates a TemplateURL with the |keyword| and |url|. |title| may be empty.
@@ -37,7 +38,7 @@ class Firefox2Importer : public Importer {
   // |favicons| may be null, in which case TemplateURLs and favicons are
   // not parsed. Any bookmarks in |default_urls| are ignored.
   static void ImportBookmarksFile(
-      const std::wstring& file_path,
+      const FilePath& file_path,
       const std::set<GURL>& default_urls,
       bool import_to_bookmark_bar,
       const std::wstring& first_folder_name,
@@ -62,7 +63,7 @@ class Firefox2Importer : public Importer {
 
   // Fills |files| with the paths to the files containing the search engine
   // descriptions.
-  void GetSearchEnginesXMLFiles(std::vector<std::wstring>* files);
+  void GetSearchEnginesXMLFiles(std::vector<FilePath>* files);
 
   // Helper methods for parsing bookmark file.
   // Firefox 2 saves its bookmarks in a html file. We are interested in the
@@ -106,8 +107,8 @@ class Firefox2Importer : public Importer {
   static void HTMLUnescape(std::wstring* text);
 
   // Fills |xml_files| with the file with an xml extension found under |dir|.
-  static void FindXMLFilesInDir(const std::wstring& dir,
-                                std::vector<std::wstring>* xml_files);
+  static void FindXMLFilesInDir(const FilePath& dir,
+                                std::vector<FilePath>* xml_files);
 
   // Given the URL of a page and a favicon data URL, adds an appropriate record
   // to the given favicon usage vector. Will do nothing if the favicon is not
@@ -117,8 +118,8 @@ class Firefox2Importer : public Importer {
       const GURL& favicon_data,
       std::vector<history::ImportedFavIconUsage>* favicons);
 
-  std::wstring source_path_;
-  std::wstring app_path_;
+  FilePath source_path_;
+  FilePath app_path_;
   // If true, we only parse the bookmarks.html file specified as source_path_.
   bool parsing_bookmarks_html_file_;