Remove wstrings from ui/base/text_elider.h functions.

The last param is for languages, which is already a std::string in
most places.

BUG=23581

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

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

3 files changed, 12 insertions, 13 deletions

diff --git a/ui/base/text/text_elider.cc b/ui/base/text/text_elider.cc
index 590e464..9c42b2a 100644
--- a/ui/base/text/text_elider.cc
+++ b/ui/base/text/text_elider.cc
@@ -62,11 +62,11 @@ string16 CutString(const string16& text,
 string16 ElideUrl(const GURL& url,
                   const gfx::Font& font,
                   int available_pixel_width,
-                  const std::wstring& languages) {
+                  const std::string& languages) {
   // Get a formatted string and corresponding parsing of the url.
   url_parse::Parsed parsed;
-  string16 url_string = net::FormatUrl(url, WideToUTF8(languages),
-      net::kFormatUrlOmitAll, UnescapeRule::SPACES, &parsed, NULL, NULL);
+  string16 url_string = net::FormatUrl(url, languages, net::kFormatUrlOmitAll,
+      UnescapeRule::SPACES, &parsed, NULL, NULL);
   if (available_pixel_width <= 0)
     return url_string;
 
@@ -388,15 +388,14 @@ string16 ElideText(const string16& text,
   return CutString(text, lo, elide_in_middle, true);
 }
 
-// TODO(viettrungluu): convert |languages| to an |std::string|.
 SortedDisplayURL::SortedDisplayURL(const GURL& url,
-                                   const std::wstring& languages) {
+                                   const std::string& languages) {
   std::wstring host;
-  net::AppendFormattedHost(url, languages, &host, NULL, NULL);
+  net::AppendFormattedHost(url, UTF8ToWide(languages), &host, NULL, NULL);
   sort_host_ = WideToUTF16Hack(host);
   string16 host_minus_www = net::StripWWW(WideToUTF16Hack(host));
   url_parse::Parsed parsed;
-  display_url_ = net::FormatUrl(url, WideToUTF8(languages),
+  display_url_ = net::FormatUrl(url, languages,
       net::kFormatUrlOmitAll, UnescapeRule::SPACES, &parsed, &prefix_end_,
       NULL);
   if (sort_host_.length() > host_minus_www.length()) {
diff --git a/ui/base/text/text_elider.h b/ui/base/text/text_elider.h
index 7c4a946..86424df 100644
--- a/ui/base/text/text_elider.h
+++ b/ui/base/text/text_elider.h
@@ -34,7 +34,7 @@ namespace ui {
 string16 ElideUrl(const GURL& url,
                   const gfx::Font& font,
                   int available_pixel_width,
-                  const std::wstring& languages);
+                  const std::string& languages);
 
 // Elides |text| to fit in |available_pixel_width|.  If |elide_in_middle| is
 // set the ellipsis is placed in the middle of the string; otherwise it is
@@ -61,7 +61,7 @@ string16 ElideFilename(const FilePath& filename,
 // SortedDisplayURL is relatively cheap and supports value semantics.
 class SortedDisplayURL {
  public:
-  SortedDisplayURL(const GURL& url, const std::wstring& languages);
+  SortedDisplayURL(const GURL& url, const std::string& languages);
   SortedDisplayURL();
   ~SortedDisplayURL();
 
diff --git a/ui/base/text/text_elider_unittest.cc b/ui/base/text/text_elider_unittest.cc
index 57e0d40..933cc5f 100644
--- a/ui/base/text/text_elider_unittest.cc
+++ b/ui/base/text/text_elider_unittest.cc
@@ -49,7 +49,7 @@ void RunTest(Testcase* testcases, size_t num_testcases) {
     EXPECT_EQ(UTF8ToUTF16(testcases[i].output),
               ElideUrl(url, font,
                        font.GetStringWidth(UTF8ToUTF16(testcases[i].output)),
-                       std::wstring()));
+                       std::string()));
   }
 }
 
@@ -256,7 +256,7 @@ TEST(TextEliderTest, ElideTextLongStrings) {
 
 // Verifies display_url is set correctly.
 TEST(TextEliderTest, SortedDisplayURL) {
-  ui::SortedDisplayURL d_url(GURL("http://www.google.com"), std::wstring());
+  ui::SortedDisplayURL d_url(GURL("http://www.google.com"), std::string());
   EXPECT_EQ("www.google.com", UTF16ToASCII(d_url.display_url()));
 }
 
@@ -291,8 +291,8 @@ TEST(TextEliderTest, SortedDisplayURLCompare) {
   };
 
   for (size_t i = 0; i < arraysize(tests); ++i) {
-    ui::SortedDisplayURL url1(GURL(tests[i].a), std::wstring());
-    ui::SortedDisplayURL url2(GURL(tests[i].b), std::wstring());
+    ui::SortedDisplayURL url1(GURL(tests[i].a), std::string());
+    ui::SortedDisplayURL url2(GURL(tests[i].b), std::string());
     EXPECT_EQ(tests[i].compare_result, url1.Compare(url2, collator.get()));
     EXPECT_EQ(-tests[i].compare_result, url2.Compare(url1, collator.get()));
   }