Simplify handling of BiDi cursor movement

ui/views/controls/textfield/native_textfield_views_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 <string>
 #include <vector>
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 251 matching lines @@
     clipboard_writer.WriteText(ASCIIToUTF16(text));
   }
 
   View* GetFocusedView() {
     return widget_->GetFocusManager()->GetFocusedView();
   }
 
   int GetCursorPositionX(int cursor_pos) {
     gfx::RenderText* render_text = textfield_view_->GetRenderText();
     return render_text->GetCursorBounds(
-        gfx::SelectionModel(cursor_pos), false).x();
+        gfx::SelectionModel(cursor_pos, gfx::CURSOR_FORWARD), false).x();
   }
 
   // Get the current cursor bounds.
   gfx::Rect GetCursorBounds() {
     gfx::RenderText* render_text = textfield_view_->GetRenderText();
     gfx::Rect bounds = render_text->GetUpdatedCursorBounds();
     return bounds;
   }
 
   // Get the cursor bounds of |sel|.
@@ skipping 1060 matching lines @@
   // Reset locale.
   base::i18n::SetICUDefaultLocale(locale);
 }
 
 TEST_F(NativeTextfieldViewsTest, HitInsideTextAreaTest) {
   InitTextfield(Textfield::STYLE_DEFAULT);
   textfield_->SetText(WideToUTF16(L"ab\x05E1\x5E2"));
   std::vector<gfx::Rect> cursor_bounds;
 
   // Save each cursor bound.
-  gfx::SelectionModel sel(0, 0, gfx::SelectionModel::LEADING);
+  gfx::SelectionModel sel(0, gfx::CURSOR_FORWARD);
   cursor_bounds.push_back(GetCursorBounds(sel));
 
-  sel = gfx::SelectionModel(1, 0, gfx::SelectionModel::TRAILING);
+  sel = gfx::SelectionModel(1, gfx::CURSOR_BACKWARD);
   gfx::Rect bound = GetCursorBounds(sel);
-  sel = gfx::SelectionModel(1, 1, gfx::SelectionModel::LEADING);
+  sel = gfx::SelectionModel(1, gfx::CURSOR_FORWARD);
   EXPECT_EQ(bound.x(), GetCursorBounds(sel).x());
   cursor_bounds.push_back(bound);
 
   // Check that a cursor at the end of the Latin portion of the text is at the
   // same position as a cursor placed at the end of the RTL Hebrew portion.
-  sel = gfx::SelectionModel(2, 1, gfx::SelectionModel::TRAILING);
+  sel = gfx::SelectionModel(2, gfx::CURSOR_BACKWARD);
   bound = GetCursorBounds(sel);
-  sel = gfx::SelectionModel(4, 3, gfx::SelectionModel::TRAILING);
+  sel = gfx::SelectionModel(4, gfx::CURSOR_BACKWARD);
   EXPECT_EQ(bound.x(), GetCursorBounds(sel).x());
   cursor_bounds.push_back(bound);
 
-  sel = gfx::SelectionModel(3, 2, gfx::SelectionModel::TRAILING);
+  sel = gfx::SelectionModel(3, gfx::CURSOR_BACKWARD);
   bound = GetCursorBounds(sel);
-  sel = gfx::SelectionModel(3, 3, gfx::SelectionModel::LEADING);
+  sel = gfx::SelectionModel(3, gfx::CURSOR_FORWARD);
   EXPECT_EQ(bound.x(), GetCursorBounds(sel).x());
   cursor_bounds.push_back(bound);
 
-  sel = gfx::SelectionModel(2, 2, gfx::SelectionModel::LEADING);
+  sel = gfx::SelectionModel(2, gfx::CURSOR_FORWARD);
   bound = GetCursorBounds(sel);
-  sel = gfx::SelectionModel(4, 2, gfx::SelectionModel::LEADING);
+  sel = gfx::SelectionModel(4, gfx::CURSOR_FORWARD);
   EXPECT_EQ(bound.x(), GetCursorBounds(sel).x());
   cursor_bounds.push_back(bound);
 
   // Expected cursor position when clicking left and right of each character.
   size_t cursor_pos_expected[] = {0, 1, 1, 2, 4, 3, 3, 2};
 
   int index = 0;
   for (int i = 0; i < static_cast<int>(cursor_bounds.size() - 1); ++i) {
     int half_width = (cursor_bounds[i + 1].x() - cursor_bounds[i].x()) / 2;
     MouseClick(cursor_bounds[i], half_width / 2);
@@ skipping 179 matching lines @@
 #else
   EXPECT_EQ(500U, textfield_->GetCursorPosition());
 #endif
 #endif  // !defined(OS_WIN)
 
   // Reset locale.
   base::i18n::SetICUDefaultLocale(locale);
 }
 
 }  // namespace views