Get rid of more calls to FromWStringHack.

BUG=24672
TEST=compiles

Patch from Thiago Farina <thiago.farina@gmail.com>

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

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

3 files changed, 12 insertions, 17 deletions

diff --git a/chrome/browser/download/download_manager.cc b/chrome/browser/download/download_manager.cc
index 9ef6ead..00eff14 100644
--- a/chrome/browser/download/download_manager.cc
+++ b/chrome/browser/download/download_manager.cc
@@ -321,11 +321,11 @@ void DownloadManager::RegisterUserPrefs(PrefService* prefs) {
   // the user if he really wants it on an unsafe place such as the desktop.
 
   if (!prefs->GetBoolean(prefs::kDownloadDirUpgraded)) {
-    FilePath current_download_dir = FilePath::FromWStringHack(
-        prefs->GetString(prefs::kDownloadDefaultDirectory));
+    FilePath current_download_dir = prefs->GetFilePath(
+        prefs::kDownloadDefaultDirectory);
     if (download_util::DownloadPathIsDangerous(current_download_dir)) {
-      prefs->SetString(prefs::kDownloadDefaultDirectory,
-                       default_download_path.ToWStringHack());
+      prefs->SetFilePath(prefs::kDownloadDefaultDirectory,
+                         default_download_path);
     }
     prefs->SetBoolean(prefs::kDownloadDirUpgraded, true);
   }
diff --git a/chrome/browser/download/download_manager.h b/chrome/browser/download/download_manager.h
index e38e130..c77d480 100644
--- a/chrome/browser/download/download_manager.h
+++ b/chrome/browser/download/download_manager.h
@@ -469,9 +469,7 @@ class DownloadManager : public base::RefCountedThreadSafe<DownloadManager>,
     return static_cast<int>(in_progress_.size());
   }
 
-  FilePath download_path() {
-    return FilePath::FromWStringHack(*download_path_);
-  }
+  FilePath download_path() { return *download_path_; }
 
   // Clears the last download path, used to initialize "save as" dialogs.
   void ClearLastDownloadPath();
@@ -700,7 +698,7 @@ class DownloadManager : public base::RefCountedThreadSafe<DownloadManager>,
 
   // User preferences
   BooleanPrefMember prompt_for_download_;
-  StringPrefMember download_path_;
+  FilePathPrefMember download_path_;
 
   // The user's last choice for download directory. This is only used when the
   // user wants us to prompt for a save location for each download.
diff --git a/chrome/browser/download/save_package.cc b/chrome/browser/download/save_package.cc
index a549e9c..d58cc48 100644
--- a/chrome/browser/download/save_package.cc
+++ b/chrome/browser/download/save_package.cc
@@ -1133,22 +1133,19 @@ FilePath SavePackage::GetSaveDirPreference(PrefService* prefs) {
   DCHECK(prefs);
 
   if (!prefs->FindPreference(prefs::kSaveFileDefaultDirectory)) {
-    FilePath default_save_path;
-    StringPrefMember default_download_path;
     DCHECK(prefs->FindPreference(prefs::kDownloadDefaultDirectory));
-    default_download_path.Init(prefs::kDownloadDefaultDirectory, prefs, NULL);
-    default_save_path =
-        FilePath::FromWStringHack(default_download_path.GetValue());
+    FilePath default_save_path = prefs->GetFilePath(
+        prefs::kDownloadDefaultDirectory);
     prefs->RegisterFilePathPref(prefs::kSaveFileDefaultDirectory,
                                 default_save_path);
   }
 
   // Get the directory from preference.
-  StringPrefMember save_file_path;
-  save_file_path.Init(prefs::kSaveFileDefaultDirectory, prefs, NULL);
-  DCHECK(!(*save_file_path).empty());
+  FilePath save_file_path = prefs->GetFilePath(
+      prefs::kSaveFileDefaultDirectory);
+  DCHECK(!save_file_path.empty());
 
-  return FilePath::FromWStringHack(*save_file_path);
+  return save_file_path;
 }
 
 void SavePackage::GetSaveInfo() {