Remove the wstring FormatUrl() functions (and convert remaining users to the string16 verison).

Still to do: Actually convert the code underlying FormatUrl().

BUG=23581
TEST=builds and passes tests

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

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

1 files changed, 5 insertions, 5 deletions

diff --git a/chrome/browser/tab_contents/navigation_entry.cc b/chrome/browser/tab_contents/navigation_entry.cc
index 0933f1e..c345958 100644
--- a/chrome/browser/tab_contents/navigation_entry.cc
+++ b/chrome/browser/tab_contents/navigation_entry.cc
@@ -89,20 +89,20 @@ const string16& NavigationEntry::GetTitleForDisplay(
     return cached_display_title_;
 
   // Use the virtual URL first if any, and fall back on using the real URL.
-  std::wstring languages;
+  std::string languages;
   if (navigation_controller) {
-      languages = UTF8ToWide(navigation_controller->profile()->GetPrefs()->
-          GetString(prefs::kAcceptLanguages));
+    languages = navigation_controller->profile()->GetPrefs()->
+        GetString(prefs::kAcceptLanguages);
   }
 
-  std::wstring title;
+  string16 title;
   std::wstring elided_title;
   if (!virtual_url_.is_empty()) {
     title = net::FormatUrl(virtual_url_, languages);
   } else if (!url_.is_empty()) {
     title = net::FormatUrl(url_, languages);
   }
-  ElideString(title, chrome::kMaxTitleChars, &elided_title);
+  ElideString(UTF16ToWideHack(title), chrome::kMaxTitleChars, &elided_title);
   cached_display_title_ = WideToUTF16Hack(elided_title);
   return cached_display_title_;
 }