Migrate CandidateWindow::Entry to string16.

chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc

Index: chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc
diff --git a/chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc b/chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc
index 69a602ae25859efe94d871b6f2253a938bf618c0..62d2a687e61f248ac6c245ef101e72003791c9c4 100644
--- a/chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc
+++ b/chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/bind_helpers.h"
+#include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chromeos/ime/component_extension_ime_manager.h"
@@ -702,20 +703,28 @@ IN_PROC_BROWSER_TEST_P(InputMethodEngineIBusBrowserTest,
 
     ASSERT_EQ(4U, table.candidates().size());
 
-    EXPECT_EQ("CANDIDATE_1", table.candidates().at(0).value);
-
-    EXPECT_EQ("CANDIDATE_2", table.candidates().at(1).value);
-    EXPECT_EQ("LABEL_2", table.candidates().at(1).label);
-
-    EXPECT_EQ("CANDIDATE_3", table.candidates().at(2).value);
-    EXPECT_EQ("LABEL_3", table.candidates().at(2).label);
-    EXPECT_EQ("ANNOTACTION_3", table.candidates().at(2).annotation);
-
-    EXPECT_EQ("CANDIDATE_4", table.candidates().at(3).value);
-    EXPECT_EQ("LABEL_4", table.candidates().at(3).label);
-    EXPECT_EQ("ANNOTACTION_4", table.candidates().at(3).annotation);
-    EXPECT_EQ("TITLE_4", table.candidates().at(3).description_title);
-    EXPECT_EQ("BODY_4", table.candidates().at(3).description_body);
+    EXPECT_EQ(base::UTF8ToUTF16("CANDIDATE_1"),
+              table.candidates().at(0).value);
+
+    EXPECT_EQ(base::UTF8ToUTF16("CANDIDATE_2"),
+              table.candidates().at(1).value);
+    EXPECT_EQ(base::UTF8ToUTF16("LABEL_2"), table.candidates().at(1).label);
+
+    EXPECT_EQ(base::UTF8ToUTF16("CANDIDATE_3"),
+              table.candidates().at(2).value);
+    EXPECT_EQ(base::UTF8ToUTF16("LABEL_3"), table.candidates().at(2).label);
+    EXPECT_EQ(base::UTF8ToUTF16("ANNOTACTION_3"),
+              table.candidates().at(2).annotation);
+
+    EXPECT_EQ(base::UTF8ToUTF16("CANDIDATE_4"),
+              table.candidates().at(3).value);
+    EXPECT_EQ(base::UTF8ToUTF16("LABEL_4"), table.candidates().at(3).label);
+    EXPECT_EQ(base::UTF8ToUTF16("ANNOTACTION_4"),
+              table.candidates().at(3).annotation);
+    EXPECT_EQ(base::UTF8ToUTF16("TITLE_4"),
+              table.candidates().at(3).description_title);
+    EXPECT_EQ(base::UTF8ToUTF16("BODY_4"),
+              table.candidates().at(3).description_body);
   }
   {
     SCOPED_TRACE("setCursorPosition test");