Index: trunk/src/chrome/browser/chromeos/input_method/textinput_test_helper.cc |
=================================================================== |
--- trunk/src/chrome/browser/chromeos/input_method/textinput_test_helper.cc (revision 220120) |
+++ trunk/src/chrome/browser/chromeos/input_method/textinput_test_helper.cc (working copy) |
@@ -73,8 +73,7 @@ |
void TextInputTestHelper::OnTextInputTypeChanged( |
const ui::TextInputClient* client) { |
- latest_text_input_type_ = |
- client ? client->GetTextInputType() : ui::TEXT_INPUT_TYPE_NONE; |
+ latest_text_input_type_ = client->GetTextInputType(); |
if (waiting_type_ == WAIT_ON_TEXT_INPUT_TYPE_CHANGED) |
base::MessageLoop::current()->Quit(); |
} |
@@ -102,8 +101,7 @@ |
void TextInputTestHelper::OnCaretBoundsChanged( |
const ui::TextInputClient* client) { |
ui::Range text_range; |
- if (!GetTextInputClient() || GetTextInputClient() != client || |
- !GetTextInputClient()->GetTextRange(&text_range) || |
+ if (!GetTextInputClient()->GetTextRange(&text_range) || |
!GetTextInputClient()->GetTextFromRange(text_range, &surrounding_text_) || |
!GetTextInputClient()->GetSelectionRange(&selection_range_)) |
return; |