Remove the 2-level input method system & InputMethodBridge.

ui/views/controls/tree/tree_view_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 "ui/views/controls/tree/tree_view.h"
 
 #include <string>
 
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 44 matching lines @@
   std::string GetSelectedNodeTitle();
 
   std::string GetEditingNodeTitle();
 
   TestNode* GetNodeByTitle(const std::string& title);
 
   void IncrementSelection(bool next);
   void CollapseOrSelectParent();
   void ExpandOrSelectChild();
   int GetRowCount();
-  PrefixSelector* selector() { return tree_.selector_.get(); }
+  PrefixSelector* selector() { return tree_.GetPrefixSelector(); }
 
   ui::TreeNodeModel<TestNode > model_;
   TreeView tree_;
 
  private:
   std::string InternalNodeAsString(TreeView::InternalNode* node);
 
   TestNode* GetNodeByTitleImpl(TestNode* node, const base::string16& title);
 
   DISALLOW_COPY_AND_ASSIGN(TreeViewTest);
@@ skipping 309 matching lines @@
   EXPECT_EQ("b1", GetSelectedNodeTitle());
   ExpandOrSelectChild();
   EXPECT_EQ("root [a b [b1] c]", TreeViewContentsAsString());
   EXPECT_EQ("b1", GetSelectedNodeTitle());
 }
 
 // Verify selection is properly updated on each keystroke.
 TEST_F(TreeViewTest, SelectOnKeyStroke) {
   tree_.SetModel(&model_);
   tree_.ExpandAll(model_.GetRoot());
-  tree_.GetTextInputClient();
   selector()->InsertText(ASCIIToUTF16("b"));
   EXPECT_EQ("b", GetSelectedNodeTitle());
   selector()->InsertText(ASCIIToUTF16("1"));
   EXPECT_EQ("b1", GetSelectedNodeTitle());
 
   // Invoke OnViewBlur() to reset time.
   selector()->OnViewBlur();
   selector()->InsertText(ASCIIToUTF16("z"));
   EXPECT_EQ("b1", GetSelectedNodeTitle());
 
   selector()->OnViewBlur();
   selector()->InsertText(ASCIIToUTF16("a"));
   EXPECT_EQ("a", GetSelectedNodeTitle());
 }
 
 // Verifies edits are committed when focus is lost.
 TEST_F(TreeViewTest, CommitOnFocusLost) {
   tree_.SetModel(&model_);
 
   tree_.SetSelectedNode(GetNodeByTitle("root"));
   ExpandOrSelectChild();
   tree_.SetEditable(true);
   tree_.StartEditing(GetNodeByTitle("a"));
   tree_.editor()->SetText(ASCIIToUTF16("a changed"));
   tree_.OnDidChangeFocus(NULL, NULL);
   EXPECT_TRUE(GetNodeByTitle("a changed") != NULL);
 }
 
 }  // namespace views