Revert 109583 - Move views/ime/text_input_client.h to ui/base/ime/.

views/controls/textfield/native_textfield_views_unittest.cc

Index: views/controls/textfield/native_textfield_views_unittest.cc
===================================================================
--- views/controls/textfield/native_textfield_views_unittest.cc	(revision 109585)
+++ views/controls/textfield/native_textfield_views_unittest.cc	(working copy)
@@ -17,7 +17,6 @@
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
-#include "ui/base/ime/text_input_client.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/render_text.h"
@@ -28,6 +27,7 @@
 #include "views/events/event.h"
 #include "views/focus/focus_manager.h"
 #include "views/ime/mock_input_method.h"
+#include "views/ime/text_input_client.h"
 #include "views/test/test_views_delegate.h"
 #include "views/test/views_test_base.h"
 #include "views/views_delegate.h"
@@ -91,7 +91,7 @@
   DISALLOW_COPY_AND_ASSIGN(TestTextfield);
 };
 
-// A helper class for use with ui::TextInputClient::GetTextFromRange().
+// A helper class for use with TextInputClient::GetTextFromRange().
 class GetTextHelper {
  public:
   GetTextHelper() {
@@ -1019,7 +1019,7 @@
 
 TEST_F(NativeTextfieldViewsTest, TextInputClientTest) {
   InitTextfield(Textfield::STYLE_DEFAULT);
-  ui::TextInputClient* client = textfield_->GetTextInputClient();
+  TextInputClient* client = textfield_->GetTextInputClient();
   EXPECT_TRUE(client);
   EXPECT_EQ(ui::TEXT_INPUT_TYPE_TEXT, client->GetTextInputType());
 
Property changes on: views/controls/textfield/native_textfield_views_unittest.cc
___________________________________________________________________
Deleted: svn:mergeinfo