Convert GetDisplayStringInLTRDirectionality from wstring to string16.

base/i18n/rtl_unittest.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 "base/i18n/rtl.h"
 
 #include "base/file_path.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 199 matching lines @@
     { L"test", L"\x202atest\x202c" },
     { L"test.html", L"\x202atest.html\x202c" },
     { L"\x05d0\x05d1\x05d2", L"\x202a\x05d0\x05d1\x05d2\x202c" },
     { L"\x05d0\x05d1\x05d2.txt", L"\x202a\x05d0\x05d1\x05d2.txt\x202c" },
     { L"\x05d0"L"abc", L"\x202a\x05d0"L"abc\x202c" },
     { L"\x05d0"L"abc.txt", L"\x202a\x05d0"L"abc.txt\x202c" },
     { L"abc\x05d0\x05d1", L"\x202a"L"abc\x05d0\x05d1\x202c" },
     { L"abc\x05d0\x05d1.jpg", L"\x202a"L"abc\x05d0\x05d1.jpg\x202c" },
   };
   for (unsigned int i = 0; i < arraysize(test_data); ++i) {
-    std::wstring input = test_data[i].raw_filename;
-    std::wstring expected =
-        base::i18n::GetDisplayStringInLTRDirectionality(&input);
+    string16 input = WideToUTF16(test_data[i].raw_filename);
+    string16 expected = base::i18n::GetDisplayStringInLTRDirectionality(input);
     if (base::i18n::IsRTL())
-      EXPECT_EQ(test_data[i].display_string, expected);
+      EXPECT_EQ(expected, WideToUTF16(test_data[i].display_string));
     else
-      EXPECT_EQ(input, expected);
+      EXPECT_EQ(expected, input);
   }
 }
 
 TEST_F(RTLTest, GetTextDirection) {
   EXPECT_EQ(base::i18n::RIGHT_TO_LEFT, GetTextDirection("ar"));
   EXPECT_EQ(base::i18n::RIGHT_TO_LEFT, GetTextDirection("ar_EG"));
   EXPECT_EQ(base::i18n::RIGHT_TO_LEFT, GetTextDirection("he"));
   EXPECT_EQ(base::i18n::RIGHT_TO_LEFT, GetTextDirection("he_IL"));
   // iw is an obsolete code for Hebrew.
   EXPECT_EQ(base::i18n::RIGHT_TO_LEFT, GetTextDirection("iw"));
@@ skipping 13 matching lines @@
   // Chinese in China with '-'.
   EXPECT_EQ(base::i18n::LEFT_TO_RIGHT, GetTextDirection("zh-CN"));
   // Filipino : 3-letter code
   EXPECT_EQ(base::i18n::LEFT_TO_RIGHT, GetTextDirection("fil"));
   // Russian
   EXPECT_EQ(base::i18n::LEFT_TO_RIGHT, GetTextDirection("ru"));
   // Japanese that uses multiple scripts
   EXPECT_EQ(base::i18n::LEFT_TO_RIGHT, GetTextDirection("ja"));
 }