Undo selection.

ui/views/controls/textfield/textfield_model_unittest.cc

 // Copyright 2014 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/textfield/textfield_model.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <vector>
@@ skipping 25 matching lines @@
   WordAndCursor(const wchar_t* w, size_t c) : word(w), cursor(c) {}
 
   const wchar_t* word;
   size_t cursor;
 };
 
 void MoveCursorTo(views::TextfieldModel& model, size_t pos) {
   model.MoveCursorTo(gfx::SelectionModel(pos, gfx::CURSOR_FORWARD));
 }
 
+gfx::Range GetSelectedRange(const views::TextfieldModel& model) {
+  return model.render_text()->selection();
+}
+
 }  // namespace
 
 namespace views {
 
 class TextfieldModelTest : public ViewsTestBase,
                            public TextfieldModel::Delegate {
  public:
   TextfieldModelTest()
       : ViewsTestBase(),
         composition_text_confirmed_or_cleared_(false) {
@@ skipping 944 matching lines @@
   EXPECT_STR_EQ("", model.text());
   EXPECT_TRUE(model.Redo());
   EXPECT_STR_EQ("a", model.text());
 
   // Continuous inserts are treated as one edit.
   model.InsertChar('b');
   model.InsertChar('c');
   EXPECT_STR_EQ("abc", model.text());
   EXPECT_TRUE(model.Undo());
   EXPECT_STR_EQ("a", model.text());
-  EXPECT_EQ(1U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(1), GetSelectedRange(model));
   EXPECT_TRUE(model.Undo());
   EXPECT_STR_EQ("", model.text());
-  EXPECT_EQ(0U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(0), GetSelectedRange(model));
 
   // Undoing further shouldn't change the text.
   EXPECT_FALSE(model.Undo());
   EXPECT_STR_EQ("", model.text());
   EXPECT_FALSE(model.Undo());
   EXPECT_STR_EQ("", model.text());
-  EXPECT_EQ(0U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(0), GetSelectedRange(model));
 
   // Redoing to the latest text.
   EXPECT_TRUE(model.Redo());
   EXPECT_STR_EQ("a", model.text());
-  EXPECT_EQ(1U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(1), GetSelectedRange(model));
   EXPECT_TRUE(model.Redo());
   EXPECT_STR_EQ("abc", model.text());
-  EXPECT_EQ(3U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(3), GetSelectedRange(model));
 
   // Backspace ===============================
   EXPECT_TRUE(model.Backspace());
   EXPECT_STR_EQ("ab", model.text());
   EXPECT_TRUE(model.Undo());
   EXPECT_STR_EQ("abc", model.text());
-  EXPECT_EQ(3U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(3,2), GetSelectedRange(model));
   EXPECT_TRUE(model.Redo());
   EXPECT_STR_EQ("ab", model.text());
-  EXPECT_EQ(2U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(2), GetSelectedRange(model));
   // Continous backspaces are treated as one edit.
   EXPECT_TRUE(model.Backspace());
   EXPECT_TRUE(model.Backspace());
   EXPECT_STR_EQ("", model.text());
   // Extra backspace shouldn't affect the history.
   EXPECT_FALSE(model.Backspace());
   EXPECT_TRUE(model.Undo());
   EXPECT_STR_EQ("ab", model.text());
-  EXPECT_EQ(2U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(2,0), GetSelectedRange(model));
   EXPECT_TRUE(model.Undo());
   EXPECT_STR_EQ("abc", model.text());
-  EXPECT_EQ(3U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(3,2), GetSelectedRange(model));
   EXPECT_TRUE(model.Undo());
   EXPECT_STR_EQ("a", model.text());
-  EXPECT_EQ(1U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(1), GetSelectedRange(model));
 
   // Clear history
   model.ClearEditHistory();
   EXPECT_FALSE(model.Undo());
   EXPECT_FALSE(model.Redo());
   EXPECT_STR_EQ("a", model.text());
-  EXPECT_EQ(1U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(1), GetSelectedRange(model));
 
   // Delete ===============================
   model.SetText(base::ASCIIToUTF16("ABCDE"));
   model.ClearEditHistory();
   MoveCursorTo(model, 2);
   EXPECT_TRUE(model.Delete());
   EXPECT_STR_EQ("ABDE", model.text());
   model.MoveCursor(gfx::LINE_BREAK, gfx::CURSOR_LEFT, false);
   EXPECT_TRUE(model.Delete());
   EXPECT_STR_EQ("BDE", model.text());
   EXPECT_TRUE(model.Undo());
   EXPECT_STR_EQ("ABDE", model.text());
-  EXPECT_EQ(0U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(0, 1), GetSelectedRange(model));
   EXPECT_TRUE(model.Undo());
   EXPECT_STR_EQ("ABCDE", model.text());
-  EXPECT_EQ(2U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(2,3), GetSelectedRange(model));
   EXPECT_TRUE(model.Redo());
   EXPECT_STR_EQ("ABDE", model.text());
-  EXPECT_EQ(2U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(2), GetSelectedRange(model));
   // Continous deletes are treated as one edit.
   EXPECT_TRUE(model.Delete());
   EXPECT_TRUE(model.Delete());
   EXPECT_STR_EQ("AB", model.text());
   EXPECT_TRUE(model.Undo());
   EXPECT_STR_EQ("ABDE", model.text());
-  EXPECT_EQ(2U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(2,4), GetSelectedRange(model));
   EXPECT_TRUE(model.Redo());
   EXPECT_STR_EQ("AB", model.text());
-  EXPECT_EQ(2U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(2), GetSelectedRange(model));
 }
 
 TEST_F(TextfieldModelTest, UndoRedo_SetText) {
   // This is to test the undo/redo behavior of omnibox.
   TextfieldModel model(NULL);
   model.InsertChar('w');
   EXPECT_STR_EQ("w", model.text());
-  EXPECT_EQ(1U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(1), GetSelectedRange(model));
   model.SetText(base::ASCIIToUTF16("www.google.com"));
-  EXPECT_EQ(14U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(14U), GetSelectedRange(model));
   EXPECT_STR_EQ("www.google.com", model.text());
   model.SelectRange(gfx::Range(14, 1));
   model.InsertChar('w');
   EXPECT_STR_EQ("ww", model.text());
   model.SetText(base::ASCIIToUTF16("www.google.com"));
   model.SelectRange(gfx::Range(14, 2));
   model.InsertChar('w');
   EXPECT_STR_EQ("www", model.text());
   model.SetText(base::ASCIIToUTF16("www.google.com"));
   model.SelectRange(gfx::Range(14, 3));
   model.InsertChar('.');
   EXPECT_STR_EQ("www.", model.text());
   model.SetText(base::ASCIIToUTF16("www.google.com"));
   model.SelectRange(gfx::Range(14, 4));
   model.InsertChar('y');
   EXPECT_STR_EQ("www.y", model.text());
   model.SetText(base::ASCIIToUTF16("www.youtube.com"));
   EXPECT_STR_EQ("www.youtube.com", model.text());
-  EXPECT_EQ(15U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(15U), GetSelectedRange(model));
 
   EXPECT_TRUE(model.Undo());
   EXPECT_STR_EQ("www.google.com", model.text());
-  EXPECT_EQ(4U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(4), GetSelectedRange(model));
   EXPECT_TRUE(model.Undo());
   EXPECT_STR_EQ("www.google.com", model.text());
-  EXPECT_EQ(3U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(3), GetSelectedRange(model));
   EXPECT_TRUE(model.Undo());
   EXPECT_STR_EQ("www.google.com", model.text());
-  EXPECT_EQ(2U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(2), GetSelectedRange(model));
   EXPECT_TRUE(model.Undo());
   EXPECT_STR_EQ("www.google.com", model.text());
-  EXPECT_EQ(1U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(1), GetSelectedRange(model));
   EXPECT_TRUE(model.Undo());
   EXPECT_STR_EQ("", model.text());
-  EXPECT_EQ(0U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(0), GetSelectedRange(model));
   EXPECT_FALSE(model.Undo());
   EXPECT_TRUE(model.Redo());
   EXPECT_STR_EQ("www.google.com", model.text());
-  EXPECT_EQ(1U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(1), GetSelectedRange(model));
   EXPECT_TRUE(model.Redo());
   EXPECT_STR_EQ("www.google.com", model.text());
-  EXPECT_EQ(2U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(2), GetSelectedRange(model));
   EXPECT_TRUE(model.Redo());
   EXPECT_STR_EQ("www.google.com", model.text());
-  EXPECT_EQ(3U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(3), GetSelectedRange(model));
   EXPECT_TRUE(model.Redo());
   EXPECT_STR_EQ("www.google.com", model.text());
-  EXPECT_EQ(4U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(4), GetSelectedRange(model));
   EXPECT_TRUE(model.Redo());
   EXPECT_STR_EQ("www.youtube.com", model.text());
-  EXPECT_EQ(5U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(5), GetSelectedRange(model));
   EXPECT_FALSE(model.Redo());
 }
 
 TEST_F(TextfieldModelTest, UndoRedo_BackspaceThenSetText) {
   // This is to test the undo/redo behavior of omnibox.
   TextfieldModel model(NULL);
   model.InsertChar('w');
   EXPECT_STR_EQ("w", model.text());
   EXPECT_EQ(1U, model.GetCursorPosition());
   model.SetText(base::ASCIIToUTF16("www.google.com"));
@@ skipping 15 matching lines @@
 }
 
 TEST_F(TextfieldModelTest, UndoRedo_CutCopyPasteTest) {
   TextfieldModel model(NULL);
   model.SetText(base::ASCIIToUTF16("ABCDE"));
   EXPECT_FALSE(model.Redo());  // There is nothing to redo.
   // Test Cut.
   model.SelectRange(gfx::Range(1, 3));
   model.Cut();
   EXPECT_STR_EQ("ADE", model.text());
-  EXPECT_EQ(1U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(1), GetSelectedRange(model));
   EXPECT_TRUE(model.Undo());
   EXPECT_STR_EQ("ABCDE", model.text());
-  EXPECT_EQ(3U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(1,3), GetSelectedRange(model));
   EXPECT_TRUE(model.Undo());
   EXPECT_STR_EQ("", model.text());
-  EXPECT_EQ(0U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(0), GetSelectedRange(model));
   EXPECT_FALSE(model.Undo());  // There is no more to undo.
   EXPECT_STR_EQ("", model.text());
   EXPECT_TRUE(model.Redo());
   EXPECT_STR_EQ("ABCDE", model.text());
-  EXPECT_EQ(5U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(5), GetSelectedRange(model));
   EXPECT_TRUE(model.Redo());
   EXPECT_STR_EQ("ADE", model.text());
-  EXPECT_EQ(1U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(1), GetSelectedRange(model));
   EXPECT_FALSE(model.Redo());  // There is no more to redo.
   EXPECT_STR_EQ("ADE", model.text());
 
   model.Paste();
   model.Paste();
   model.Paste();
   EXPECT_STR_EQ("ABCBCBCDE", model.text());
-  EXPECT_EQ(7U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(7), GetSelectedRange(model));
   EXPECT_TRUE(model.Undo());
   EXPECT_STR_EQ("ABCBCDE", model.text());
-  EXPECT_EQ(5U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(5), GetSelectedRange(model));
   EXPECT_TRUE(model.Undo());
   EXPECT_STR_EQ("ABCDE", model.text());
-  EXPECT_EQ(3U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(3), GetSelectedRange(model));
   EXPECT_TRUE(model.Undo());
   EXPECT_STR_EQ("ADE", model.text());
-  EXPECT_EQ(1U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(1), GetSelectedRange(model));
   EXPECT_TRUE(model.Undo());
   EXPECT_STR_EQ("ABCDE", model.text());
-  EXPECT_EQ(3U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(1,3), GetSelectedRange(model));
   EXPECT_TRUE(model.Undo());
   EXPECT_STR_EQ("", model.text());
-  EXPECT_EQ(0U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(0), GetSelectedRange(model));
   EXPECT_FALSE(model.Undo());
   EXPECT_STR_EQ("", model.text());
   EXPECT_TRUE(model.Redo());
   EXPECT_STR_EQ("ABCDE", model.text());
-  EXPECT_EQ(5U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(5), GetSelectedRange(model));
 
   // Test Redo.
   EXPECT_TRUE(model.Redo());
   EXPECT_STR_EQ("ADE", model.text());
-  EXPECT_EQ(1U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(1), GetSelectedRange(model));
   EXPECT_TRUE(model.Redo());
   EXPECT_STR_EQ("ABCDE", model.text());
-  EXPECT_EQ(3U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(3), GetSelectedRange(model));
   EXPECT_TRUE(model.Redo());
   EXPECT_STR_EQ("ABCBCDE", model.text());
-  EXPECT_EQ(5U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(5), GetSelectedRange(model));
   EXPECT_TRUE(model.Redo());
   EXPECT_STR_EQ("ABCBCBCDE", model.text());
-  EXPECT_EQ(7U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(7), GetSelectedRange(model));
   EXPECT_FALSE(model.Redo());
 
   // Test using SelectRange.
   model.SelectRange(gfx::Range(1, 3));
   EXPECT_TRUE(model.Cut());
   EXPECT_STR_EQ("ABCBCDE", model.text());
-  EXPECT_EQ(1U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(1), GetSelectedRange(model));
   model.SelectRange(gfx::Range(1, 1));
   EXPECT_FALSE(model.Cut());
   model.MoveCursor(gfx::LINE_BREAK, gfx::CURSOR_RIGHT, false);
   EXPECT_TRUE(model.Paste());
   EXPECT_STR_EQ("ABCBCDEBC", model.text());
-  EXPECT_EQ(9U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(9), GetSelectedRange(model));
   EXPECT_TRUE(model.Undo());
   EXPECT_STR_EQ("ABCBCDE", model.text());
-  EXPECT_EQ(7U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(7), GetSelectedRange(model));
   // An empty cut shouldn't create an edit.
   EXPECT_TRUE(model.Undo());
   EXPECT_STR_EQ("ABCBCBCDE", model.text());
-  EXPECT_EQ(3U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(1,3), GetSelectedRange(model));
 
   // Test Copy.
   ResetModel(&model);
   model.SetText(base::ASCIIToUTF16("12345"));
   EXPECT_STR_EQ("12345", model.text());
-  EXPECT_EQ(5U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(5), GetSelectedRange(model));
   model.SelectRange(gfx::Range(1, 3));
   model.Copy();  // Copy "23".
   EXPECT_STR_EQ("12345", model.text());
-  EXPECT_EQ(3U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(1, 3), GetSelectedRange(model));
   model.Paste();  // Paste "23" into "23".
   EXPECT_STR_EQ("12345", model.text());
-  EXPECT_EQ(3U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(3), GetSelectedRange(model));
   model.Paste();
   EXPECT_STR_EQ("1232345", model.text());
-  EXPECT_EQ(5U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(5), GetSelectedRange(model));
   EXPECT_TRUE(model.Undo());
   EXPECT_STR_EQ("12345", model.text());
-  EXPECT_EQ(3U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(3), GetSelectedRange(model));
   // TODO(oshima): Change the return type from bool to enum.
   EXPECT_FALSE(model.Undo());  // No text change.
   EXPECT_STR_EQ("12345", model.text());
-  EXPECT_EQ(3U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(1,3), GetSelectedRange(model));
   EXPECT_TRUE(model.Undo());
   EXPECT_STR_EQ("", model.text());
   EXPECT_FALSE(model.Undo());
   // Test Redo.
   EXPECT_TRUE(model.Redo());
   EXPECT_STR_EQ("12345", model.text());
-  EXPECT_EQ(5U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(5), GetSelectedRange(model));
   EXPECT_TRUE(model.Redo());
   EXPECT_STR_EQ("12345", model.text());  // For 1st paste
-  EXPECT_EQ(3U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(3), GetSelectedRange(model));
   EXPECT_TRUE(model.Redo());
   EXPECT_STR_EQ("1232345", model.text());
-  EXPECT_EQ(5U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(5), GetSelectedRange(model));
   EXPECT_FALSE(model.Redo());
   EXPECT_STR_EQ("1232345", model.text());
 
   // Test using SelectRange.
   model.SelectRange(gfx::Range(1, 3));
   model.Copy();
   EXPECT_STR_EQ("1232345", model.text());
   model.MoveCursor(gfx::LINE_BREAK, gfx::CURSOR_RIGHT, false);
   EXPECT_TRUE(model.Paste());
   EXPECT_STR_EQ("123234523", model.text());
-  EXPECT_EQ(9U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(9), GetSelectedRange(model));
   EXPECT_TRUE(model.Undo());
   EXPECT_STR_EQ("1232345", model.text());
-  EXPECT_EQ(7U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(7), GetSelectedRange(model));
 }
 
 TEST_F(TextfieldModelTest, UndoRedo_CursorTest) {
   TextfieldModel model(NULL);
   model.InsertChar('a');
   model.MoveCursor(gfx::CHARACTER_BREAK, gfx::CURSOR_LEFT, false);
   model.MoveCursor(gfx::CHARACTER_BREAK, gfx::CURSOR_RIGHT, false);
   model.InsertChar('b');
   // Moving the cursor shouldn't create a new edit.
   EXPECT_STR_EQ("ab", model.text());
   EXPECT_FALSE(model.Redo());
   EXPECT_TRUE(model.Undo());
   EXPECT_STR_EQ("", model.text());
   EXPECT_FALSE(model.Undo());
   EXPECT_STR_EQ("", model.text());
   EXPECT_TRUE(model.Redo());
   EXPECT_STR_EQ("ab", model.text());
   EXPECT_EQ(2U, model.GetCursorPosition());
   EXPECT_FALSE(model.Redo());
 }
 
 void RunInsertReplaceTest(TextfieldModel& model) {
   const bool reverse = model.render_text()->selection().is_reversed();
   model.InsertChar('1');
   model.InsertChar('2');
   model.InsertChar('3');
   EXPECT_STR_EQ("a123d", model.text());
-  EXPECT_EQ(4U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(4), GetSelectedRange(model));
   EXPECT_TRUE(model.Undo());
   EXPECT_STR_EQ("abcd", model.text());
-  EXPECT_EQ(reverse ? 1U : 3U, model.GetCursorPosition());
+  EXPECT_EQ(reverse ? gfx::Range(3,1) : gfx::Range(1,3), GetSelectedRange(model));
   EXPECT_TRUE(model.Undo());
   EXPECT_STR_EQ("", model.text());
-  EXPECT_EQ(0U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(0), GetSelectedRange(model));
   EXPECT_FALSE(model.Undo());
   EXPECT_TRUE(model.Redo());
   EXPECT_STR_EQ("abcd", model.text());
-  EXPECT_EQ(4U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(4), GetSelectedRange(model));
   EXPECT_TRUE(model.Redo());
   EXPECT_STR_EQ("a123d", model.text());
-  EXPECT_EQ(4U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(4), GetSelectedRange(model));
   EXPECT_FALSE(model.Redo());
 }
 
 void RunOverwriteReplaceTest(TextfieldModel& model) {
   const bool reverse = model.render_text()->selection().is_reversed();
   model.ReplaceChar('1');
   model.ReplaceChar('2');
   model.ReplaceChar('3');
   model.ReplaceChar('4');
   EXPECT_STR_EQ("a1234", model.text());
-  EXPECT_EQ(5U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(5), GetSelectedRange(model));
   EXPECT_TRUE(model.Undo());
   EXPECT_STR_EQ("abcd", model.text());
-  EXPECT_EQ(reverse ? 1U : 3U, model.GetCursorPosition());
+  EXPECT_EQ(reverse ? gfx::Range(4,1) :  gfx::Range(1,4), GetSelectedRange(model));
   EXPECT_TRUE(model.Undo());
   EXPECT_STR_EQ("", model.text());
-  EXPECT_EQ(0U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(0), GetSelectedRange(model));
   EXPECT_FALSE(model.Undo());
   EXPECT_TRUE(model.Redo());
   EXPECT_STR_EQ("abcd", model.text());
-  EXPECT_EQ(4U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(4), GetSelectedRange(model));
   EXPECT_TRUE(model.Redo());
   EXPECT_STR_EQ("a1234", model.text());
-  EXPECT_EQ(5U, model.GetCursorPosition());
+  EXPECT_EQ(gfx::Range(5), GetSelectedRange(model));
   EXPECT_FALSE(model.Redo());
 }
 
 TEST_F(TextfieldModelTest, UndoRedo_ReplaceTest) {
   {
     SCOPED_TRACE("Select forwards and insert.");
     TextfieldModel model(NULL);
     model.SetText(base::ASCIIToUTF16("abcd"));
     model.SelectRange(gfx::Range(1, 3));
     RunInsertReplaceTest(model);
@@ skipping 195 matching lines @@
   // Test 7
   // Clipboard text with lots of spaces between words should have all spaces
   // replaced with a single space.
   ui::ScopedClipboardWriter(ui::CLIPBOARD_TYPE_COPY_PASTE)
       .WriteText(base::ASCIIToUTF16("FOO      BAR"));
   EXPECT_TRUE(model.Paste());
   EXPECT_STR_EQ("FOO BAR", model.text());
 }
 
 }  // namespace views