Convert GetDisplayStringInLTRDirectionality from wstring to string16.

app/text_elider.cc

 // Copyright (c) 2010 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 <vector>
 
 #include "app/text_elider.h"
 #include "base/file_path.h"
 #include "base/i18n/rtl.h"
 #include "base/string_util.h"
@@ skipping 20 matching lines @@
                        bool insert_ellipsis) {
   const std::wstring insert(insert_ellipsis ? kEllipsis : L"");
   if (!cut_in_middle)
     return text.substr(0, length) + insert;
   // We put the extra character, if any, before the cut.
   const size_t half_length = length / 2;
   return text.substr(0, length - half_length) + insert +
       text.substr(text.length() - half_length, half_length);
 }
 
+// TODO(tony): Get rid of wstrings.
+std::wstring GetDisplayStringInLTRDirectionality(const std::wstring& text) {
+  return UTF16ToWide(base::i18n::GetDisplayStringInLTRDirectionality(
+      WideToUTF16(text)));
+}
+
 }  // namespace
 
 namespace gfx {
 
 // This function takes a GURL object and elides it. It returns a string
 // which composed of parts from subdomain, domain, path, filename and query.
 // A "..." is added automatically at the end if the elided string is bigger
 // than the available pixel width. For available pixel width = 0, a formatted,
 // but un-elided, string is returned.
 //
@@ skipping 227 matching lines @@
 
   return ElideText(final_elided_url_string, font, available_pixel_width, false);
 }
 
 std::wstring ElideFilename(const FilePath& filename,
                            const gfx::Font& font,
                            int available_pixel_width) {
   int full_width = font.GetStringWidth(filename.ToWStringHack());
   if (full_width <= available_pixel_width) {
     std::wstring elided_name = filename.ToWStringHack();
-    return base::i18n::GetDisplayStringInLTRDirectionality(&elided_name);
+    return GetDisplayStringInLTRDirectionality(elided_name);
   }
 
 #if defined(OS_WIN)
   std::wstring extension = filename.Extension();
 #elif defined(OS_POSIX)
   std::wstring extension = base::SysNativeMBToWide(filename.Extension());
 #endif
   std::wstring rootname =
       filename.BaseName().RemoveExtension().ToWStringHack();
 
   if (rootname.empty() || extension.empty()) {
     std::wstring elided_name = ElideText(filename.ToWStringHack(), font,
                                          available_pixel_width, false);
-    return base::i18n::GetDisplayStringInLTRDirectionality(&elided_name);
+    return GetDisplayStringInLTRDirectionality(elided_name);
   }
 
   int ext_width = font.GetStringWidth(extension);
   int root_width = font.GetStringWidth(rootname);
 
   // We may have trimmed the path.
   if (root_width + ext_width <= available_pixel_width) {
     std::wstring elided_name = rootname + extension;
-    return base::i18n::GetDisplayStringInLTRDirectionality(&elided_name);
+    return GetDisplayStringInLTRDirectionality(elided_name);
   }
 
   int available_root_width = available_pixel_width - ext_width;
   std::wstring elided_name =
       ElideText(rootname, font, available_root_width, false);
   elided_name += extension;
-  return base::i18n::GetDisplayStringInLTRDirectionality(&elided_name);
+  return GetDisplayStringInLTRDirectionality(elided_name);
 }
 
 // This function adds an ellipsis at the end of the text if the text
 // does not fit the given pixel width.
 std::wstring ElideText(const std::wstring& text,
                        const gfx::Font& font,
                        int available_pixel_width,
                        bool elide_in_middle) {
   if (text.empty())
     return text;
@@ skipping 102 matching lines @@
 string16 SortedDisplayURL::AfterHost() const {
   size_t slash_index = display_url_.find(sort_host_, prefix_end_);
   if (slash_index == string16::npos) {
     NOTREACHED();
     return string16();
   }
   return display_url_.substr(slash_index + sort_host_.length());
 }
 
 }  // namespace gfx