Make Textfield::GetTextInputClient() return non-null, even if readonly

ui/views/controls/textfield/textfield_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/views/controls/textfield/textfield.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
@@ skipping 1316 matching lines @@
   // On{Before,After}UserAction should be called by whatever user action
   // triggers clearing or setting a selection if appropriate.
   on_before_user_action_ = on_after_user_action_ = 0;
   textfield_->clear();
   textfield_->ClearSelection();
   textfield_->SelectAll(false);
   EXPECT_EQ(0, on_before_user_action_);
   EXPECT_EQ(0, on_after_user_action_);
 
   input_method_->Clear();
+
+  // Changing the Textfield to readonly shouldn't change the input client, since
+  // it's still required for selections and clipboard copy.
+  ui::TextInputClient* text_input_client = textfield_->GetTextInputClient();
+  EXPECT_TRUE(text_input_client);
+  EXPECT_NE(ui::TEXT_INPUT_TYPE_NONE, text_input_client->GetTextInputType());
   textfield_->SetReadOnly(true);
   EXPECT_TRUE(input_method_->text_input_type_changed());
-  EXPECT_FALSE(textfield_->GetTextInputClient());
+  EXPECT_EQ(text_input_client, textfield_->GetTextInputClient());
+  EXPECT_EQ(ui::TEXT_INPUT_TYPE_NONE, text_input_client->GetTextInputType());
 
   textfield_->SetReadOnly(false);

[msw, 2015/02/11 16:45:00]

nit: add EXPECT_TRUE(input_method_->text_input_type_changed()); after this.
maybe also EXPECT_EQ(text_input_client, textfield_->GetTextInputClient());

[tapted, 2015/02/11 23:29:08]

Done.

+  EXPECT_NE(ui::TEXT_INPUT_TYPE_NONE, text_input_client->GetTextInputType());
+
   input_method_->Clear();
   textfield_->SetTextInputType(ui::TEXT_INPUT_TYPE_PASSWORD);
   EXPECT_TRUE(input_method_->text_input_type_changed());
   EXPECT_TRUE(textfield_->GetTextInputClient());
 }
 
 TEST_F(TextfieldTest, UndoRedoTest) {
   InitTextfield();
   SendKeyEvent(ui::VKEY_A);
   EXPECT_STR_EQ("a", textfield_->text());
@@ skipping 881 matching lines @@
 
   // Tap again on selection and check if touch selection handles are still
   // present and selection is changed to a cursor at tap location.
   Tap(tap_point);
   textfield_->GetSelectionRange(&range);
   EXPECT_TRUE(test_api_->touch_selection_controller());
   EXPECT_EQ(tap_range, range);
 }
 
 }  // namespace views