Port some strings in download/save_package.cc

chrome/browser/tab_contents/web_contents.cc

 // Copyright (c) 2006-2008 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/tab_contents/web_contents.h"
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/file_version_info.h"
 #include "base/process_util.h"
@@ skipping 538 matching lines @@
     const GURL& current_page_url = GetURL();
     if (dlm && current_page_url.is_valid())
       dlm->DownloadUrl(current_page_url, GURL(), this);
     return;
   }
 
   // Get our user preference state.
   PrefService* prefs = profile()->GetPrefs();
   DCHECK(prefs);
 
-  std::wstring suggest_name =
-      SavePackage::GetSuggestNameForSaveAs(prefs, GetTitle());
+  FilePath suggest_name = SavePackage::GetSuggestNameForSaveAs(prefs,
+      FilePath::FromWStringHack(GetTitle()));
 
   SavePackage::SavePackageParam param(contents_mime_type());
   param.prefs = prefs;
 
   // TODO(rocking): Use new asynchronous dialog boxes to prevent the SaveAs
   // dialog blocking the UI thread. See bug: http://b/issue?id=1129694.
   if (SavePackage::GetSaveInfo(suggest_name, view_->GetNativeView(),
-                               &param, profile()->GetDownloadManager()))
-    SavePage(param.saved_main_file_path, param.dir, param.save_type);
+                               &param, profile()->GetDownloadManager())) {
+    SavePage(param.saved_main_file_path.ToWStringHack(),
+             param.dir.ToWStringHack(),
+             param.save_type);
+  }
 }
 
 void WebContents::SavePage(const std::wstring& main_file,
                            const std::wstring& dir_path,
                            SavePackage::SavePackageType save_type) {
   // Stop the page from navigating.
   Stop();
 
-  save_package_ = new SavePackage(this, save_type, main_file, dir_path);
+  save_package_ = new SavePackage(this, save_type,
+                                  FilePath::FromWStringHack(main_file),
+                                  FilePath::FromWStringHack(dir_path));
   save_package_->Init();
 }
 
 void WebContents::PrintPreview() {
   // We don't show the print preview yet, only the print dialog.
   PrintNow();
 }
 
 bool WebContents::PrintNow() {
   // We can't print interstitial page for now.
@@ skipping 1171 matching lines @@
     // The favicon url isn't valid. This means there really isn't a favicon,
     // or the favicon url wasn't obtained before the load started. This assumes
     // the later.
     // TODO(sky): Need a way to set the favicon that doesn't involve generating
     // its url.
     new_url->SetFavIconURL(TemplateURL::GenerateFaviconURL(params.referrer));
   }
   new_url->set_safe_for_autoreplace(true);
   url_model->Add(new_url);
 }