Rename old Aura TouchSelectionController

ui/views/touchui/touch_selection_controller_impl_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 "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/test/test_cursor_client.h"
 #include "ui/aura/window.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 47 matching lines @@
 }  // namespace
 
 namespace views {
 
 class TouchSelectionControllerImplTest : public ViewsTestBase {
  public:
   TouchSelectionControllerImplTest()
       : textfield_widget_(nullptr),
         widget_(nullptr),
         textfield_(nullptr),
-        views_tsc_factory_(new ViewsTouchSelectionControllerFactory) {
+        views_tsc_factory_(new ViewsTouchEditingControllerFactory) {
     CommandLine::ForCurrentProcess()->AppendSwitch(
         switches::kEnableTouchEditing);
-    ui::TouchSelectionControllerFactory::SetInstance(views_tsc_factory_.get());
+    ui::TouchEditingControllerFactory::SetInstance(views_tsc_factory_.get());
   }
 
   ~TouchSelectionControllerImplTest() override {
-    ui::TouchSelectionControllerFactory::SetInstance(nullptr);
+    ui::TouchEditingControllerFactory::SetInstance(nullptr);
   }
 
   void SetUp() override {
     ViewsTestBase::SetUp();
     test_cursor_client_.reset(new aura::test::TestCursorClient(GetContext()));
   }
 
   void TearDown() override {
     test_cursor_client_.reset();
     if (textfield_widget_ && !textfield_widget_->IsClosed())
@@ skipping 24 matching lines @@
   void CreateWidget() {
     widget_ = new Widget;
     Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
     params.bounds = gfx::Rect(0, 0, 200, 200);
     widget_->Init(params);
     widget_->Show();
 }
 
  protected:
   static bool IsCursorHandleVisibleFor(
-      ui::TouchSelectionController* controller) {
+      ui::TouchEditingControllerDeprecated* controller) {
     TouchSelectionControllerImpl* impl =
         static_cast<TouchSelectionControllerImpl*>(controller);
     return impl->IsCursorHandleVisible();
   }
 
   gfx::Rect GetCursorRect(const gfx::SelectionModel& sel) {
     return textfield_test_api_->GetRenderText()->GetCursorBounds(sel, true);
   }
 
   gfx::Point GetCursorPosition(const gfx::SelectionModel& sel) {
@@ skipping 138 matching lines @@
         EXPECT_EQ(ui::SelectionBound::CENTER, anchor.type()) << from_str;
       }
     }
   }
 
   Widget* textfield_widget_;
   Widget* widget_;
 
   Textfield* textfield_;
   scoped_ptr<TextfieldTestApi> textfield_test_api_;
-  scoped_ptr<ViewsTouchSelectionControllerFactory> views_tsc_factory_;
+  scoped_ptr<ViewsTouchEditingControllerFactory> views_tsc_factory_;
   scoped_ptr<aura::test::TestCursorClient> test_cursor_client_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TouchSelectionControllerImplTest);
 };
 
 // Tests that the selection handles are placed appropriately when selection in
 // a Textfield changes.
 TEST_F(TouchSelectionControllerImplTest, SelectionInTextfieldTest) {
   CreateTextfield();
@@ skipping 388 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(TestTouchEditable);
 };
 
 // Tests if the touch editing handle is shown or hidden properly according to
 // the cursor position relative to the client boundaries.
 TEST_F(TouchSelectionControllerImplTest,
        VisibilityOfHandleRegardingClientBounds) {
   CreateWidget();
 
   TestTouchEditable touch_editable(widget_->GetNativeView());
-  scoped_ptr<ui::TouchSelectionController> touch_selection_controller(
-      ui::TouchSelectionController::create(&touch_editable));
+  scoped_ptr<ui::TouchEditingControllerDeprecated> touch_selection_controller(
+      ui::TouchEditingControllerDeprecated::Create(&touch_editable));
 
   touch_editable.set_bounds(gfx::Rect(0, 0, 100, 20));
 
   // Put the cursor completely inside the client bounds. Handle should be
   // visible.
   touch_editable.set_cursor_rect(gfx::Rect(2, 0, 1, 20));
   touch_selection_controller->SelectionChanged();
   EXPECT_TRUE(IsCursorHandleVisibleFor(touch_selection_controller.get()));
 
   // Move the cursor up such that |kBarMinHeight| pixels are still in the client
@@ skipping 177 matching lines @@
   // Start touch editing; then press a key and ensure it deactivates touch
   // selection.
   StartTouchEditing();
   EXPECT_TRUE(GetSelectionController());
   generator.PressKey(ui::VKEY_A, 0);
   RunPendingMessages();
   EXPECT_FALSE(GetSelectionController());
 }
 
 }  // namespace views