Clean up of SelectionModel

views/touchui/touch_selection_controller_impl_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/utf_string_conversions.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/render_text.h"
 #include "views/controls/textfield/native_textfield_views.h"
 #include "views/controls/textfield/textfield.h"
@@ skipping 104 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(TouchSelectionControllerImplTest);
 };
 
 // Tests that the selection handles are placed appropriately when selection in
 // a Textfield changes.
 TEST_F(TouchSelectionControllerImplTest, SelectionInTextfieldTest) {
   CreateTextfield();
   textfield_->SetText(ASCIIToUTF16("some text"));
 
   // Test selecting a range.
-  textfield_->SelectSelectionModel(gfx::SelectionModel(3, 7));
+  textfield_->SelectRange(ui::Range(3, 7));
   VerifySelectionHandlePositions(false);
 
   // Test selecting everything.
   textfield_->SelectAll();
   VerifySelectionHandlePositions(false);
 
   // Test with no selection.
   textfield_->ClearSelection();
   VerifySelectionHandlePositions(false);
 
@@ skipping 10 matching lines @@
 TEST_F(TouchSelectionControllerImplTest, SelectionInBidiTextfieldTest) {
   CreateTextfield();
   textfield_->SetText(WideToUTF16(L"abc\x05d0\x05d1\x05d2"));
 
   // Test cursor at run boundary and with empty selection.
   textfield_->SelectSelectionModel(
       gfx::SelectionModel(3, 2, gfx::SelectionModel::TRAILING));
   VerifySelectionHandlePositions(false);
 
   // Test selection range inside one run and starts or ends at run boundary.
-  textfield_->SelectSelectionModel(
-      gfx::SelectionModel(2, 3, 2, gfx::SelectionModel::TRAILING));
+  textfield_->SelectRange(ui::Range(2, 3));
   VerifySelectionHandlePositions(false);
 
-  // TODO(xji): change to textfield_->SelectRange(3, 2).
-  textfield_->SelectSelectionModel(
-      gfx::SelectionModel(3, 2, 2, gfx::SelectionModel::LEADING));
+  textfield_->SelectRange(ui::Range(3, 2));
   VerifySelectionHandlePositions(false);
 
-  textfield_->SelectSelectionModel(
-      gfx::SelectionModel(3, 4, 3, gfx::SelectionModel::TRAILING));
+  textfield_->SelectRange(ui::Range(3, 4));
   VerifySelectionHandlePositions(false);
 
-  textfield_->SelectSelectionModel(
-      gfx::SelectionModel(4, 3, 3, gfx::SelectionModel::LEADING));
+  textfield_->SelectRange(ui::Range(4, 3));
   VerifySelectionHandlePositions(false);
 
-  textfield_->SelectSelectionModel(
-      gfx::SelectionModel(3, 6, 5, gfx::SelectionModel::TRAILING));
+  textfield_->SelectRange(ui::Range(3, 6));
   VerifySelectionHandlePositions(false);
 
-  textfield_->SelectSelectionModel(
-      gfx::SelectionModel(6, 3, 3, gfx::SelectionModel::LEADING));
+  textfield_->SelectRange(ui::Range(6, 3));
   VerifySelectionHandlePositions(false);
 
   // Test selection range accross runs.
-  textfield_->SelectSelectionModel(
-      gfx::SelectionModel(0, 6, 5, gfx::SelectionModel::TRAILING));
+  textfield_->SelectRange(ui::Range(0, 6));
   VerifySelectionHandlePositions(false);
 
-  textfield_->SelectSelectionModel(
-      gfx::SelectionModel(6, 0, 0, gfx::SelectionModel::LEADING));
+  textfield_->SelectRange(ui::Range(6, 0));
   VerifySelectionHandlePositions(false);
 
-  textfield_->SelectSelectionModel(
-      gfx::SelectionModel(1, 4, 3, gfx::SelectionModel::TRAILING));
+  textfield_->SelectRange(ui::Range(1, 4));
   VerifySelectionHandlePositions(false);
 
-  textfield_->SelectSelectionModel(
-      gfx::SelectionModel(4, 1, 1, gfx::SelectionModel::LEADING));
+  textfield_->SelectRange(ui::Range(4, 1));
   VerifySelectionHandlePositions(false);
 }
 
 // Tests if the SelectRect callback is called appropriately when selection
 // handles are moved.
 TEST_F(TouchSelectionControllerImplTest, SelectRectCallbackTest) {
   CreateTextfield();
   textfield_->SetText(ASCIIToUTF16("textfield with selected text"));
-  textfield_->SelectSelectionModel(gfx::SelectionModel(3, 7));
+  textfield_->SelectRange(ui::Range(3, 7));
 
   EXPECT_EQ(UTF16ToUTF8(textfield_->GetSelectedText()), "tfie");
   VerifySelectionHandlePositions(false);
 
   // Drag selection handle 2 to right by 3 chars.
   int x = textfield_->font().GetStringWidth(ASCIIToUTF16("ld "));
   SimulateSelectionHandleDrag(gfx::Point(x, 0), 2);
   EXPECT_EQ(UTF16ToUTF8(textfield_->GetSelectedText()), "tfield ");
   VerifySelectionHandlePositions(false);
 
@@ skipping 10 matching lines @@
   VerifySelectionHandlePositions(true);
 
   // Drag selection handle 2 across selection handle 1.
   x = textfield_->font().GetStringWidth(ASCIIToUTF16("with selected "));
   SimulateSelectionHandleDrag(gfx::Point(x, 0), 2);
   EXPECT_EQ(UTF16ToUTF8(textfield_->GetSelectedText()), "selected ");
   VerifySelectionHandlePositions(false);
 }
 
 }  // namespace views