Use base::string16 for CompositionText.Text instead of converting to utf-8 and back unnecessarily.

ui/base/ime/input_method_chromeos_unittest.cc

 // Copyright 2014 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 "ui/base/ime/input_method_chromeos.h"
 
 #include <X11/Xlib.h>
 #undef Bool
 #undef FocusIn
 #undef FocusOut
@@ skipping 17 matching lines @@
 #include "ui/gfx/geometry/rect.h"
 
 using base::UTF8ToUTF16;
 using base::UTF16ToUTF8;
 
 namespace ui {
 namespace {
 typedef chromeos::IMEEngineHandlerInterface::KeyEventDoneCallback
     KeyEventCallback;
 
-uint32 GetOffsetInUTF16(const std::string& utf8_string, uint32 utf8_offset) {
-  base::string16 utf16_string = UTF8ToUTF16(utf8_string);
+uint32 GetOffsetInUTF16(
+    const base::string16& utf16_string, uint32 utf8_offset) {
   DCHECK_LT(utf8_offset, utf16_string.size());
   base::i18n::UTF16CharIterator char_iterator(&utf16_string);
   for (size_t i = 0; i < utf8_offset; ++i)
     char_iterator.Advance();
   return char_iterator.array_pos();
 }
 
 bool IsEqualXKeyEvent(const XEvent& e1, const XEvent& e2) {
   if ((e1.type == KeyPress && e2.type == KeyPress) ||
       (e1.type == KeyRelease && e2.type == KeyRelease)) {
@@ skipping 518 matching lines @@
   caret_bounds_ = gfx::Rect(0, 2, 3, 4);  // unchanged
   ime_->OnCaretBoundsChanged(this);
   // Current InputMethodChromeOS implementation performs the IPC
   // regardless of the bounds are changed or not.
   EXPECT_EQ(
       4,
       mock_ime_candidate_window_handler_->set_cursor_bounds_call_count());
 }
 
 TEST_F(InputMethodChromeOSTest, ExtractCompositionTextTest_NoAttribute) {
-  const char kSampleText[] = "Sample Text";
+  const base::string16 kSampleText = base::UTF8ToUTF16("Sample Text");
   const uint32 kCursorPos = 2UL;
 
-  const base::string16 utf16_string = UTF8ToUTF16(kSampleText);
   chromeos::CompositionText chromeos_composition_text;
   chromeos_composition_text.set_text(kSampleText);
 
   CompositionText composition_text;
   ime_->ExtractCompositionText(
       chromeos_composition_text, kCursorPos, &composition_text);
-  EXPECT_EQ(UTF8ToUTF16(kSampleText), composition_text.text);
+  EXPECT_EQ(kSampleText, composition_text.text);
   // If there is no selection, |selection| represents cursor position.
   EXPECT_EQ(kCursorPos, composition_text.selection.start());
   EXPECT_EQ(kCursorPos, composition_text.selection.end());
   // If there is no underline, |underlines| contains one underline and it is
   // whole text underline.
   ASSERT_EQ(1UL, composition_text.underlines.size());
   EXPECT_EQ(0UL, composition_text.underlines[0].start_offset);
-  EXPECT_EQ(utf16_string.size(), composition_text.underlines[0].end_offset);
+  EXPECT_EQ(kSampleText.size(), composition_text.underlines[0].end_offset);
   EXPECT_FALSE(composition_text.underlines[0].thick);
 }
 
 TEST_F(InputMethodChromeOSTest, ExtractCompositionTextTest_SingleUnderline) {
-  const char kSampleText[] = "\xE3\x81\x82\xE3\x81\x84\xE3\x81\x86"
-                             "\xE3\x81\x88\xE3\x81\x8A";
+  const base::string16 kSampleText = base::UTF8ToUTF16(
+      "\xE3\x81\x82\xE3\x81\x84\xE3\x81\x86\xE3\x81\x88\xE3\x81\x8A");
   const uint32 kCursorPos = 2UL;
 
   // Set up chromeos composition text with one underline attribute.
   chromeos::CompositionText chromeos_composition_text;
   chromeos_composition_text.set_text(kSampleText);
   chromeos::CompositionText::UnderlineAttribute underline;
   underline.type = chromeos::CompositionText::COMPOSITION_TEXT_UNDERLINE_SINGLE;
   underline.start_index = 1UL;
   underline.end_index = 4UL;
   chromeos_composition_text.mutable_underline_attributes()->push_back(
       underline);
 
   CompositionText composition_text;
   ime_->ExtractCompositionText(
       chromeos_composition_text, kCursorPos, &composition_text);
-  EXPECT_EQ(UTF8ToUTF16(kSampleText), composition_text.text);
+  EXPECT_EQ(kSampleText, composition_text.text);
   // If there is no selection, |selection| represents cursor position.
   EXPECT_EQ(kCursorPos, composition_text.selection.start());
   EXPECT_EQ(kCursorPos, composition_text.selection.end());
   ASSERT_EQ(1UL, composition_text.underlines.size());
   EXPECT_EQ(GetOffsetInUTF16(kSampleText, underline.start_index),
             composition_text.underlines[0].start_offset);
   EXPECT_EQ(GetOffsetInUTF16(kSampleText, underline.end_index),
             composition_text.underlines[0].end_offset);
   // Single underline represents as black thin line.
   EXPECT_EQ(SK_ColorBLACK, composition_text.underlines[0].color);
   EXPECT_FALSE(composition_text.underlines[0].thick);
 }
 
 TEST_F(InputMethodChromeOSTest, ExtractCompositionTextTest_DoubleUnderline) {
-  const char kSampleText[] = "\xE3\x81\x82\xE3\x81\x84\xE3\x81\x86"
-                             "\xE3\x81\x88\xE3\x81\x8A";
+  const base::string16 kSampleText = base::UTF8ToUTF16(
+      "\xE3\x81\x82\xE3\x81\x84\xE3\x81\x86\xE3\x81\x88\xE3\x81\x8A");
   const uint32 kCursorPos = 2UL;
 
   // Set up chromeos composition text with one underline attribute.
   chromeos::CompositionText chromeos_composition_text;
   chromeos_composition_text.set_text(kSampleText);
   chromeos::CompositionText::UnderlineAttribute underline;
   underline.type = chromeos::CompositionText::COMPOSITION_TEXT_UNDERLINE_DOUBLE;
   underline.start_index = 1UL;
   underline.end_index = 4UL;
   chromeos_composition_text.mutable_underline_attributes()->push_back(
       underline);
 
   CompositionText composition_text;
   ime_->ExtractCompositionText(
       chromeos_composition_text, kCursorPos, &composition_text);
-  EXPECT_EQ(UTF8ToUTF16(kSampleText), composition_text.text);
+  EXPECT_EQ(kSampleText, composition_text.text);
   // If there is no selection, |selection| represents cursor position.
   EXPECT_EQ(kCursorPos, composition_text.selection.start());
   EXPECT_EQ(kCursorPos, composition_text.selection.end());
   ASSERT_EQ(1UL, composition_text.underlines.size());
   EXPECT_EQ(GetOffsetInUTF16(kSampleText, underline.start_index),
             composition_text.underlines[0].start_offset);
   EXPECT_EQ(GetOffsetInUTF16(kSampleText, underline.end_index),
             composition_text.underlines[0].end_offset);
   // Double underline represents as black thick line.
   EXPECT_EQ(SK_ColorBLACK, composition_text.underlines[0].color);
   EXPECT_TRUE(composition_text.underlines[0].thick);
 }
 
 TEST_F(InputMethodChromeOSTest, ExtractCompositionTextTest_ErrorUnderline) {
-  const char kSampleText[] = "\xE3\x81\x82\xE3\x81\x84\xE3\x81\x86"
-                             "\xE3\x81\x88\xE3\x81\x8A";
+  const base::string16 kSampleText = base::UTF8ToUTF16(
+      "\xE3\x81\x82\xE3\x81\x84\xE3\x81\x86\xE3\x81\x88\xE3\x81\x8A");
   const uint32 kCursorPos = 2UL;
 
   // Set up chromeos composition text with one underline attribute.
   chromeos::CompositionText chromeos_composition_text;
   chromeos_composition_text.set_text(kSampleText);
   chromeos::CompositionText::UnderlineAttribute underline;
   underline.type = chromeos::CompositionText::COMPOSITION_TEXT_UNDERLINE_ERROR;
   underline.start_index = 1UL;
   underline.end_index = 4UL;
   chromeos_composition_text.mutable_underline_attributes()->push_back(
       underline);
 
   CompositionText composition_text;
   ime_->ExtractCompositionText(
       chromeos_composition_text, kCursorPos, &composition_text);
-  EXPECT_EQ(UTF8ToUTF16(kSampleText), composition_text.text);
+  EXPECT_EQ(kSampleText, composition_text.text);
   EXPECT_EQ(kCursorPos, composition_text.selection.start());
   EXPECT_EQ(kCursorPos, composition_text.selection.end());
   ASSERT_EQ(1UL, composition_text.underlines.size());
   EXPECT_EQ(GetOffsetInUTF16(kSampleText, underline.start_index),
             composition_text.underlines[0].start_offset);
   EXPECT_EQ(GetOffsetInUTF16(kSampleText, underline.end_index),
             composition_text.underlines[0].end_offset);
   // Error underline represents as red thin line.
   EXPECT_EQ(SK_ColorRED, composition_text.underlines[0].color);
   EXPECT_FALSE(composition_text.underlines[0].thick);
 }
 
 TEST_F(InputMethodChromeOSTest, ExtractCompositionTextTest_Selection) {
-  const char kSampleText[] = "\xE3\x81\x82\xE3\x81\x84\xE3\x81\x86"
-                             "\xE3\x81\x88\xE3\x81\x8A";
+  const base::string16 kSampleText = base::UTF8ToUTF16(
+      "\xE3\x81\x82\xE3\x81\x84\xE3\x81\x86\xE3\x81\x88\xE3\x81\x8A");
   const uint32 kCursorPos = 2UL;
 
   // Set up chromeos composition text with one underline attribute.
   chromeos::CompositionText chromeos_composition_text;
   chromeos_composition_text.set_text(kSampleText);
   chromeos_composition_text.set_selection_start(1UL);
   chromeos_composition_text.set_selection_end(4UL);
 
   CompositionText composition_text;
   ime_->ExtractCompositionText(
       chromeos_composition_text, kCursorPos, &composition_text);
-  EXPECT_EQ(UTF8ToUTF16(kSampleText), composition_text.text);
+  EXPECT_EQ(kSampleText, composition_text.text);
   EXPECT_EQ(kCursorPos, composition_text.selection.start());
   EXPECT_EQ(kCursorPos, composition_text.selection.end());
   ASSERT_EQ(1UL, composition_text.underlines.size());
   EXPECT_EQ(GetOffsetInUTF16(kSampleText,
                              chromeos_composition_text.selection_start()),
             composition_text.underlines[0].start_offset);
   EXPECT_EQ(GetOffsetInUTF16(kSampleText,
                              chromeos_composition_text.selection_end()),
             composition_text.underlines[0].end_offset);
   EXPECT_EQ(SK_ColorBLACK, composition_text.underlines[0].color);
   EXPECT_TRUE(composition_text.underlines[0].thick);
 }
 
 TEST_F(InputMethodChromeOSTest,
        ExtractCompositionTextTest_SelectionStartWithCursor) {
-  const char kSampleText[] = "\xE3\x81\x82\xE3\x81\x84\xE3\x81\x86"
-                             "\xE3\x81\x88\xE3\x81\x8A";
+  const base::string16 kSampleText = base::UTF8ToUTF16(
+      "\xE3\x81\x82\xE3\x81\x84\xE3\x81\x86\xE3\x81\x88\xE3\x81\x8A");
   const uint32 kCursorPos = 1UL;
 
   // Set up chromeos composition text with one underline attribute.
   chromeos::CompositionText chromeos_composition_text;
   chromeos_composition_text.set_text(kSampleText);
   chromeos_composition_text.set_selection_start(kCursorPos);
   chromeos_composition_text.set_selection_end(4UL);
 
   CompositionText composition_text;
   ime_->ExtractCompositionText(
       chromeos_composition_text, kCursorPos, &composition_text);
-  EXPECT_EQ(UTF8ToUTF16(kSampleText), composition_text.text);
+  EXPECT_EQ(kSampleText, composition_text.text);
   // If the cursor position is same as selection bounds, selection start
   // position become opposit side of selection from cursor.
   EXPECT_EQ(GetOffsetInUTF16(kSampleText,
                              chromeos_composition_text.selection_end()),
             composition_text.selection.start());
   EXPECT_EQ(GetOffsetInUTF16(kSampleText, kCursorPos),
             composition_text.selection.end());
   ASSERT_EQ(1UL, composition_text.underlines.size());
   EXPECT_EQ(GetOffsetInUTF16(kSampleText,
                              chromeos_composition_text.selection_start()),
             composition_text.underlines[0].start_offset);
   EXPECT_EQ(GetOffsetInUTF16(kSampleText,
                              chromeos_composition_text.selection_end()),
             composition_text.underlines[0].end_offset);
   EXPECT_EQ(SK_ColorBLACK, composition_text.underlines[0].color);
   EXPECT_TRUE(composition_text.underlines[0].thick);
 }
 
 TEST_F(InputMethodChromeOSTest,
        ExtractCompositionTextTest_SelectionEndWithCursor) {
-  const char kSampleText[] = "\xE3\x81\x82\xE3\x81\x84\xE3\x81\x86"
-                             "\xE3\x81\x88\xE3\x81\x8A";
+  const base::string16 kSampleText = base::UTF8ToUTF16(
+      "\xE3\x81\x82\xE3\x81\x84\xE3\x81\x86\xE3\x81\x88\xE3\x81\x8A");
   const uint32 kCursorPos = 4UL;
 
   // Set up chromeos composition text with one underline attribute.
   chromeos::CompositionText chromeos_composition_text;
   chromeos_composition_text.set_text(kSampleText);
   chromeos_composition_text.set_selection_start(1UL);
   chromeos_composition_text.set_selection_end(kCursorPos);
 
   CompositionText composition_text;
   ime_->ExtractCompositionText(
       chromeos_composition_text, kCursorPos, &composition_text);
-  EXPECT_EQ(UTF8ToUTF16(kSampleText), composition_text.text);
+  EXPECT_EQ(kSampleText, composition_text.text);
   // If the cursor position is same as selection bounds, selection start
   // position become opposit side of selection from cursor.
   EXPECT_EQ(GetOffsetInUTF16(kSampleText,
                              chromeos_composition_text.selection_start()),
             composition_text.selection.start());
   EXPECT_EQ(GetOffsetInUTF16(kSampleText, kCursorPos),
             composition_text.selection.end());
   ASSERT_EQ(1UL, composition_text.underlines.size());
   EXPECT_EQ(GetOffsetInUTF16(kSampleText,
                              chromeos_composition_text.selection_start()),
@@ skipping 60 matching lines @@
             mock_ime_engine_handler_->last_set_surrounding_anchor_pos());
 }
 
 TEST_F(InputMethodChromeOSTest, SurroundingText_PartialText) {
   ime_->Init(true);
   // Click a text input form.
   input_type_ = TEXT_INPUT_TYPE_TEXT;
   ime_->OnTextInputTypeChanged(this);
 
   // Set the TextInputClient behaviors.
-  surrounding_text_ = UTF8ToUTF16("abcdefghij");
+  surrounding_text_ = base::UTF8ToUTF16("abcdefghij");
   text_range_ = gfx::Range(5, 10);
   selection_range_ = gfx::Range(7, 9);
 
   ime_->OnCaretBoundsChanged(this);
 
   // Check the call count.
   EXPECT_EQ(1,
             mock_ime_engine_handler_->set_surrounding_text_call_count());
   // Set the verifier for SetSurroundingText mock call.
   // Here (2, 4) is selection range in expected surrounding text coordinates.
   EXPECT_EQ("fghij",
             mock_ime_engine_handler_->last_set_surrounding_text());
   EXPECT_EQ(2U,
             mock_ime_engine_handler_->last_set_surrounding_cursor_pos());
   EXPECT_EQ(4U,
             mock_ime_engine_handler_->last_set_surrounding_anchor_pos());
 }
 
 TEST_F(InputMethodChromeOSTest, SurroundingText_BecomeEmptyText) {
   ime_->Init(true);
   // Click a text input form.
   input_type_ = TEXT_INPUT_TYPE_TEXT;
   ime_->OnTextInputTypeChanged(this);
 
   // Set the TextInputClient behaviors.
   // If the surrounding text becomes empty, text_range become (0, 0) and
   // selection range become invalid.
-  surrounding_text_ = UTF8ToUTF16("");
+  surrounding_text_ = base::UTF8ToUTF16("");
   text_range_ = gfx::Range(0, 0);
   selection_range_ = gfx::Range::InvalidRange();
 
   ime_->OnCaretBoundsChanged(this);
 
   // Check the call count.
   EXPECT_EQ(0,
             mock_ime_engine_handler_->set_surrounding_text_call_count());
 
   // Should not be called twice with same condition.
@@ skipping 124 matching lines @@
   ime_->ResetContext();
 
   // Do callback.
   mock_ime_engine_handler_->last_passed_callback().Run(true);
 
   EXPECT_EQ(0, ime_->process_key_event_post_ime_call_count());
 }
 // TODO(nona): Introduce ProcessKeyEventPostIME tests(crbug.com/156593).
 
 }  // namespace ui