Revert 219673 "Fix Views Combobox and Tree View text input."

trunk/src/chrome/browser/chromeos/input_method/textinput_test_helper.cc

 // Copyright (c) 2013 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 "ash/shell.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chromeos/input_method/textinput_test_helper.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 55 matching lines @@
 ui::TextInputType TextInputTestHelper::GetTextInputType() const {
   return latest_text_input_type_;
 }
 
 ui::TextInputClient* TextInputTestHelper::GetTextInputClient() const {
   return GetInputMethod()->GetTextInputClient();
 }
 
 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();
 }
 
 void TextInputTestHelper::OnInputMethodDestroyed(
     const ui::InputMethod* input_method) {
 }
 
 void TextInputTestHelper::OnFocus() {
   focus_state_ = true;
   if (waiting_type_ == WAIT_ON_FOCUS)
     base::MessageLoop::current()->Quit();
 }
 
 void TextInputTestHelper::OnBlur() {
   focus_state_ = false;
   if (waiting_type_ == WAIT_ON_BLUR)
     base::MessageLoop::current()->Quit();
 }
 
 void TextInputTestHelper::OnUntranslatedIMEMessage(
   const base::NativeEvent& event) {
 }
 
 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;
   if (waiting_type_ == WAIT_ON_CARET_BOUNDS_CHANGED)
     base::MessageLoop::current()->Quit();
 }
 
 void TextInputTestHelper::OnInputLocaleChanged() {
 }
 
@@ skipping 86 matching lines @@
   mouse_event.y = rect.CenterPoint().y();
   mouse_event.clickCount = 1;
   tab->GetRenderViewHost()->ForwardMouseEvent(mouse_event);
 
   mouse_event.type = WebKit::WebInputEvent::MouseUp;
   tab->GetRenderViewHost()->ForwardMouseEvent(mouse_event);
   return true;
 }
 
 } // namespace chromeos