Change a bunch of string types.

Started out just trying to change PrefService::GetString and ::SetString. This snowballed a little bit. Had to change a bunch of url strings in search_engines/ from wstring to string (some of them may be better off as GURLs, but UTF-8 is a step in the right direction, since that's what GURL uses internally, as well as externally via its setters/getters).

TODO (later patch): things that ask for accepted languages should use std::string, not std::wstring.

BUG=none
TEST=try bots

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

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

1 files changed, 8 insertions, 2 deletions

diff --git a/chrome/browser/download/save_package.cc b/chrome/browser/download/save_package.cc
index b9ae8c2..db34e35 100644
--- a/chrome/browser/download/save_package.cc
+++ b/chrome/browser/download/save_package.cc
@@ -1266,11 +1266,17 @@ void SavePackage::ContinueSave(SavePackageParam* param,
   PrefService* prefs = tab_contents_->profile()->GetPrefs();
   StringPrefMember save_file_path;
   save_file_path.Init(prefs::kSaveFileDefaultDirectory, prefs, NULL);
+#if defined(OS_POSIX)
+  std::string path_string = param->dir.value();
+#elif defined(OS_WIN)
+  std::string path_string = WideToUTF8(param->dir.value());
+#endif
   // If user change the default saving directory, we will remember it just
   // like IE and FireFox.
   if (!tab_contents_->profile()->IsOffTheRecord() &&
-      save_file_path.GetValue() != param->dir.ToWStringHack())
-    save_file_path.SetValue(param->dir.ToWStringHack());
+      save_file_path.GetValue() != path_string) {
+    save_file_path.SetValue(path_string);
+  }
 
   param->save_type = (index == 1) ? SavePackage::SAVE_AS_ONLY_HTML :
                                     SavePackage::SAVE_AS_COMPLETE_HTML;