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

2 files changed, 27 insertions, 18 deletions

diff --git a/chrome/browser/download/download_manager.cc b/chrome/browser/download/download_manager.cc
index db04135..b41be08 100644
--- a/chrome/browser/download/download_manager.cc
+++ b/chrome/browser/download/download_manager.cc
@@ -586,14 +586,19 @@ bool DownloadManager::Init(Profile* profile) {
 
   // We store any file extension that should be opened automatically at
   // download completion in this pref.
-  std::wstring extensions_to_open =
+  std::string extensions_to_open =
       prefs->GetString(prefs::kDownloadExtensionsToOpen);
-  std::vector<std::wstring> extensions;
-  SplitString(extensions_to_open, L':', &extensions);
+  std::vector<std::string> extensions;
+  SplitString(extensions_to_open, ':', &extensions);
+
   for (size_t i = 0; i < extensions.size(); ++i) {
-    if (!extensions[i].empty() && !IsExecutableFile(
-        FilePath::FromWStringHack(extensions[i])))
-      auto_open_.insert(FilePath::FromWStringHack(extensions[i]).value());
+#if defined(OS_POSIX)
+    FilePath path(extensions[i]);
+#elif defined(OS_WIN)
+    FilePath path(UTF8ToWide(extensions[i]));
+#endif
+    if (!extensions[i].empty() && !IsExecutableFile(path))
+      auto_open_.insert(path.value());
   }
 
   other_download_manager_observer_.reset(
@@ -1618,22 +1623,20 @@ bool DownloadManager::HasAutoOpenFileTypesRegistered() const {
 void DownloadManager::SaveAutoOpens() {
   PrefService* prefs = profile_->GetPrefs();
   if (prefs) {
-    FilePath::StringType extensions;
+    std::string extensions;
     for (AutoOpenSet::iterator it = auto_open_.begin();
          it != auto_open_.end(); ++it) {
-      extensions += *it + FILE_PATH_LITERAL(":");
+#if defined(OS_POSIX)
+      std::string this_extension = *it;
+#elif defined(OS_WIN)
+      std::string this_extension = base::SysWideToUTF8(*it);
+#endif
+      extensions += this_extension + ":";
     }
     if (!extensions.empty())
       extensions.erase(extensions.size() - 1);
 
-    std::wstring extensions_w;
-#if defined(OS_WIN)
-    extensions_w = extensions;
-#elif defined(OS_POSIX)
-    extensions_w = base::SysNativeMBToWide(extensions);
-#endif
-
-    prefs->SetString(prefs::kDownloadExtensionsToOpen, extensions_w);
+    prefs->SetString(prefs::kDownloadExtensionsToOpen, extensions);
   }
 }
 
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;