views: Moves TextfieldController/TextRange into their own headers.

views/controls/textfield/native_textfield_views_unittest.cc

 // Copyright (c) 2011 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 "base/auto_reset.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "views/controls/menu/menu_2.h"
 #include "views/controls/textfield/native_textfield_views.h"
 #include "views/controls/textfield/textfield.h"
+#include "views/controls/textfield/textfield_controller.h"
 #include "views/controls/textfield/textfield_views_model.h"
 #include "views/events/event.h"
 #include "views/focus/focus_manager.h"
 #include "views/test/test_views_delegate.h"
 #include "views/test/views_test_base.h"
+#include "views/views_delegate.h"
 #include "views/widget/widget.h"
-#include "views/views_delegate.h"
 
 namespace views {
 
 // Convert to Wide so that the printed string will be readable when
 // check fails.
 #define EXPECT_STR_EQ(ascii, utf16) \
   EXPECT_EQ(ASCIIToWide(ascii), UTF16ToWide(utf16))
 #define EXPECT_STR_NE(ascii, utf16) \
   EXPECT_NE(ASCIIToWide(ascii), UTF16ToWide(utf16))
 
 // TODO(oshima): Move tests that are independent of TextfieldViews to
 // textfield_unittests.cc once we move the test utility functions
 // from chrome/browser/automation/ to app/test/.
 class NativeTextfieldViewsTest : public ViewsTestBase,
-                                 public Textfield::Controller {
+                                 public TextfieldController {
  public:
   NativeTextfieldViewsTest()
       : widget_(NULL),
         textfield_(NULL),
         textfield_view_(NULL),
         model_(NULL) {
   }
 
-  // ::testing::Test overrides.
+  // ::testing::Test:
   virtual void SetUp() {
     NativeTextfieldViews::SetEnableTextfieldViews(true);
   }
 
   virtual void TearDown() {
     NativeTextfieldViews::SetEnableTextfieldViews(false);
     if (widget_)
       widget_->Close();
     ViewsTestBase::TearDown();
   }
 
-  // Textfield::Controller implementation:
+  // TextfieldController:
   virtual void ContentsChanged(Textfield* sender,
                                const string16& new_contents){
     last_contents_ = new_contents;
   }
 
   virtual bool HandleKeyEvent(Textfield* sender,
                               const KeyEvent& key_event) {
 
     // TODO(oshima): figure out how to test the keystroke.
     return false;
@@ skipping 444 matching lines @@
   // Text field is unmodifiable and selection shouldn't change.
   SendKeyEventToTextfieldViews(ui::VKEY_DELETE);
   EXPECT_STR_EQ(" four five six ", textfield_->GetSelectedText());
   SendKeyEventToTextfieldViews(ui::VKEY_BACK);
   EXPECT_STR_EQ(" four five six ", textfield_->GetSelectedText());
   SendKeyEventToTextfieldViews(ui::VKEY_T);
   EXPECT_STR_EQ(" four five six ", textfield_->GetSelectedText());
 }
 
 }  // namespace views