Convert GetDisplayStringInLTRDirectionality from wstring to string16.

app/text_elider_unittest.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 "app/text_elider.h"
 #include "base/file_path.h"
 #include "base/i18n/rtl.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "gfx/font.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 const wchar_t kEllipsis[] = L"\x2026";
 
 struct Testcase {
   const std::string input;
@@ skipping 151 matching lines @@
       L"fil " + kEllipsisStr + L".longext"},
     {FILE_PATH_LITERAL("filename.longext"),
       L"file" + kEllipsisStr + L".longext"},
     {FILE_PATH_LITERAL("filename.middleext.longext"),
       L"filename.mid" + kEllipsisStr + L".longext"}
   };
 
   static const gfx::Font font;
   for (size_t i = 0; i < arraysize(testcases); ++i) {
     FilePath filepath(testcases[i].input);
-    std::wstring expected = testcases[i].output;
-    base::i18n::GetDisplayStringInLTRDirectionality(&expected);
-    EXPECT_EQ(expected, ElideFilename(filepath,
+    string16 expected = WideToUTF16(testcases[i].output);
+    expected = base::i18n::GetDisplayStringInLTRDirectionality(expected);
+    EXPECT_EQ(expected, WideToUTF16(ElideFilename(filepath,
         font,
-        font.GetStringWidth(testcases[i].output)));
+        font.GetStringWidth(testcases[i].output))));
   }
 }
 
 TEST(TextEliderTest, ElideTextLongStrings) {
   const std::wstring kEllipsisStr(kEllipsis);
   std::wstring data_scheme(L"data:text/plain,");
   size_t data_scheme_length = data_scheme.length();
 
   std::wstring ten_a(10, L'a');
   std::wstring hundred_a(100, L'a');
@@ skipping 89 matching lines @@
     { "http://www.a/", "http://b/", -1 },
   };
 
   for (size_t i = 0; i < arraysize(tests); ++i) {
     gfx::SortedDisplayURL url1(GURL(tests[i].a), std::wstring());
     gfx::SortedDisplayURL url2(GURL(tests[i].b), std::wstring());
     EXPECT_EQ(tests[i].compare_result, url1.Compare(url2, collator.get()));
     EXPECT_EQ(-tests[i].compare_result, url2.Compare(url1, collator.get()));
   }
 }