importer: use FilePath instead of wstring in some places

chrome/browser/importer/firefox_importer_utils.cc

 // Copyright (c) 2009 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/firefox_importer_utils.h"
 
 #include <algorithm>
 
 #include "base/file_util.h"
 #include "base/logging.h"
@@ skipping 22 matching lines @@
         low_value.find("moz:") != std::string::npos )
       return false;
     return true;
   }
 
  private:
   DISALLOW_EVIL_CONSTRUCTORS(FirefoxURLParameterFilter);
 };
 }  // namespace
 
-bool GetFirefoxVersionAndPathFromProfile(const std::wstring& profile_path,
+bool GetFirefoxVersionAndPathFromProfile(const FilePath& profile_path,
                                          int* version,
-                                         std::wstring* app_path) {
+                                         FilePath* app_path) {
   bool ret = false;
-  std::wstring compatibility_file(profile_path);
-  file_util::AppendToPath(&compatibility_file, L"compatibility.ini");
+  FilePath compatibility_file = profile_path.AppendASCII("compatibility.ini");
   std::string content;
   file_util::ReadFileToString(compatibility_file, &content);
   ReplaceSubstringsAfterOffset(&content, 0, "\r\n", "\n");
   std::vector<std::string> lines;
   SplitString(content, '\n', &lines);
 
   for (size_t i = 0; i < lines.size(); ++i) {
     const std::string& line = lines[i];
     if (line.empty() || line[0] == '#' || line[0] == ';')
       continue;
     size_t equal = line.find('=');
     if (equal != std::string::npos) {
       std::string key = line.substr(0, equal);
       if (key == "LastVersion") {
         *version = line.substr(equal + 1)[0] - '0';
         ret = true;
       } else if (key == "LastAppDir") {
-        *app_path = UTF8ToWide(line.substr(equal + 1));
+        // TODO(evanm): If the path in question isn't convertible to
+        // UTF-8, what does Firefox do?  If it puts raw bytes in the
+        // file, we could go straight from bytes -> filepath;
+        // otherwise, we're out of luck here.
+        *app_path = FilePath::FromWStringHack(
+            UTF8ToWide(line.substr(equal + 1)));
       }
     }
   }
   return ret;
 }
 
-void ParseProfileINI(std::wstring file, DictionaryValue* root) {
+void ParseProfileINI(const FilePath& file, DictionaryValue* root) {
   // Reads the whole INI file.
   std::string content;
   file_util::ReadFileToString(file, &content);
   ReplaceSubstringsAfterOffset(&content, 0, "\r\n", "\n");
   std::vector<std::string> lines;
   SplitString(content, '\n', &lines);
 
   // Parses the file.
   root->Clear();
   std::wstring current_section;
@@ skipping 239 matching lines @@
   std::vector<std::string> urls;
   SplitString(default_homepages, '|', &urls);
 
   for (size_t i = 0; i < urls.size(); ++i) {
     if (homepage.spec() == GURL(urls[i]).spec())
       return true;
   }
 
   return false;
 }