| Index: chrome/browser/chromeos/input_method/textinput_test_helper.h
|
| diff --git a/chrome/browser/chromeos/input_method/textinput_test_helper.h b/chrome/browser/chromeos/input_method/textinput_test_helper.h
|
| index 92dbc46b33929eb35d2f2ed461b945ae0efd5956..7013a0d4eba56f048f6ed9171542667535761ee2 100644
|
| --- a/chrome/browser/chromeos/input_method/textinput_test_helper.h
|
| +++ b/chrome/browser/chromeos/input_method/textinput_test_helper.h
|
| @@ -35,7 +35,7 @@ class TextInputTestHelper : public ui::InputMethodObserver {
|
| virtual ~TextInputTestHelper();
|
|
|
| // Returns the latest status notified to ui::InputMethod
|
| - string16 GetSurroundingText() const;
|
| + base::string16 GetSurroundingText() const;
|
| gfx::Rect GetCaretRect() const;
|
| gfx::Rect GetCompositionHead() const;
|
| gfx::Range GetSelectionRange() const;
|
| @@ -51,7 +51,7 @@ class TextInputTestHelper : public ui::InputMethodObserver {
|
| void WaitForBlur();
|
| void WaitForCaretBoundsChanged(const gfx::Rect& expected_caret_rect,
|
| const gfx::Rect& expected_composition_head);
|
| - void WaitForSurroundingTextChanged(const string16& expected_text,
|
| + void WaitForSurroundingTextChanged(const base::string16& expected_text,
|
| const gfx::Range& expected_selection);
|
|
|
| // Converts from string to gfx::Rect. The string should be "x,y,width,height".
|
| @@ -84,7 +84,7 @@ class TextInputTestHelper : public ui::InputMethodObserver {
|
| // Represents waiting type of text input event.
|
| WaitImeEventType waiting_type_;
|
|
|
| - string16 surrounding_text_;
|
| + base::string16 surrounding_text_;
|
| gfx::Rect caret_rect_;
|
| gfx::Rect composition_head_;
|
| gfx::Range selection_range_;
|
|
|