Prefix string16 with base:: in ui/.

ui/base/ime/input_method_ibus_unittest.cc

 // Copyright (c) 2012 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 <X11/Xlib.h>
 #undef Bool
 #undef FocusIn
 #undef FocusOut
 #undef None
 
@@ skipping 15 matching lines @@
 #include "ui/events/event.h"
 #include "ui/events/test/events_test_utils_x11.h"
 #include "ui/gfx/rect.h"
 
 namespace ui {
 namespace {
 typedef chromeos::IBusEngineHandlerInterface::KeyEventDoneCallback
     KeyEventCallback;
 
 uint32 GetOffsetInUTF16(const std::string& utf8_string, uint32 utf8_offset) {
-  string16 utf16_string = UTF8ToUTF16(utf8_string);
+  base::string16 utf16_string = UTF8ToUTF16(utf8_string);
   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 203 matching lines @@
       const CompositionText& composition) OVERRIDE {
     composition_text_ = composition;
   }
   virtual void ConfirmCompositionText() OVERRIDE {
     confirmed_text_ = composition_text_;
     composition_text_.Clear();
   }
   virtual void ClearCompositionText() OVERRIDE {
     composition_text_.Clear();
   }
-  virtual void InsertText(const string16& text) OVERRIDE {
+  virtual void InsertText(const base::string16& text) OVERRIDE {
     inserted_text_ = text;
   }
   virtual void InsertChar(char16 ch, int flags) OVERRIDE {
     inserted_char_ = ch;
     inserted_char_flags_ = flags;
   }
   virtual gfx::NativeWindow GetAttachedWindow() const OVERRIDE {
     return static_cast<gfx::NativeWindow>(NULL);
   }
   virtual TextInputType GetTextInputType() const OVERRIDE {
@@ skipping 24 matching lines @@
     return false;
   }
   virtual bool GetSelectionRange(gfx::Range* range) const OVERRIDE {
     *range = selection_range_;
     return true;
   }
 
   virtual bool SetSelectionRange(const gfx::Range& range) OVERRIDE { return false; }
   virtual bool DeleteRange(const gfx::Range& range) OVERRIDE { return false; }
   virtual bool GetTextFromRange(const gfx::Range& range,
-                                string16* text) const OVERRIDE {
+                                base::string16* text) const OVERRIDE {
     *text = surrounding_text_.substr(range.GetMin(), range.length());
     return true;
   }
   virtual void OnInputMethodChanged() OVERRIDE {
     ++on_input_method_changed_call_count_;
   }
   virtual bool ChangeTextDirectionAndLayoutAlignment(
       base::i18n::TextDirection direction) OVERRIDE { return false; }
   virtual void ExtendSelectionAndDelete(size_t before,
                                         size_t after) OVERRIDE { }
@@ skipping 36 matching lines @@
   // ui::internal::InputMethodDelegate functions.
   base::NativeEvent dispatched_native_event_;
   ui::EventType dispatched_fabricated_event_type_;
   ui::KeyboardCode dispatched_fabricated_event_key_code_;
   int dispatched_fabricated_event_flags_;
 
   // Variables for remembering the parameters that are passed to
   // ui::TextInputClient functions.
   CompositionText composition_text_;
   CompositionText confirmed_text_;
-  string16 inserted_text_;
+  base::string16 inserted_text_;
   char16 inserted_char_;
   unsigned int on_input_method_changed_call_count_;
   int inserted_char_flags_;
 
   // Variables that will be returned from the ui::TextInputClient functions.
   TextInputType input_type_;
   TextInputMode input_mode_;
   bool can_compose_inline_;
   gfx::Rect caret_bounds_;
   gfx::Range text_range_;
   gfx::Range selection_range_;
-  string16 surrounding_text_;
+  base::string16 surrounding_text_;
 
   scoped_ptr<chromeos::MockIMEEngineHandler> mock_ime_engine_handler_;
   scoped_ptr<chromeos::MockIMECandidateWindowHandler>
       mock_ime_candidate_window_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(InputMethodIBusTest);
 };
 
 // Tests public APIs in ui::InputMethod first.
 
@@ skipping 207 matching lines @@
   // bounds are changed or not.
   EXPECT_EQ(
       4,
       mock_ime_candidate_window_handler_->set_cursor_bounds_call_count());
 }
 
 TEST_F(InputMethodIBusTest, ExtractCompositionTextTest_NoAttribute) {
   const char kSampleText[] = "Sample Text";
   const uint32 kCursorPos = 2UL;
 
-  const string16 utf16_string = UTF8ToUTF16(kSampleText);
+  const base::string16 utf16_string = UTF8ToUTF16(kSampleText);
   chromeos::IBusText ibus_text;
   ibus_text.set_text(kSampleText);
 
   CompositionText composition_text;
   ime_->ExtractCompositionText(ibus_text, kCursorPos, &composition_text);
   EXPECT_EQ(UTF8ToUTF16(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
@@ skipping 405 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