Use text affinity to return correct accessible line boundaries.

ui/accessibility/ax_text_utils_unittest.cc

Index: ui/accessibility/ax_text_utils_unittest.cc
diff --git a/ui/accessibility/ax_text_utils_unittest.cc b/ui/accessibility/ax_text_utils_unittest.cc
index 2c7f491d619aefbb1147845c654ec8a868990a0e..0f1ad1de714bbe932520410da678329ac7beddb6 100644
--- a/ui/accessibility/ax_text_utils_unittest.cc
+++ b/ui/accessibility/ax_text_utils_unittest.cc
@@ -6,6 +6,7 @@
 
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/accessibility/ax_enums.h"
 #include "ui/accessibility/ax_text_utils.h"
 
 namespace ui {
@@ -19,37 +20,48 @@ TEST(AXTextUtils, FindAccessibleTextBoundaryWord) {
   size_t result;
 
   result = FindAccessibleTextBoundary(text, line_start_offsets, WORD_BOUNDARY,
-                                      0, FORWARDS_DIRECTION);
+                                      0, FORWARDS_DIRECTION,
+                                      AX_TEXT_AFFINITY_DOWNSTREAM);
   EXPECT_EQ(6UL, result);
   result = FindAccessibleTextBoundary(text, line_start_offsets, WORD_BOUNDARY,
-                                      5, BACKWARDS_DIRECTION);
+                                      5, BACKWARDS_DIRECTION,
+                                      AX_TEXT_AFFINITY_DOWNSTREAM);
   EXPECT_EQ(0UL, result);
   result = FindAccessibleTextBoundary(text, line_start_offsets, WORD_BOUNDARY,
-                                      6, FORWARDS_DIRECTION);
+                                      6, FORWARDS_DIRECTION,
+                                      AX_TEXT_AFFINITY_DOWNSTREAM);
   EXPECT_EQ(12UL, result);
   result = FindAccessibleTextBoundary(text, line_start_offsets, WORD_BOUNDARY,
-                                      11, BACKWARDS_DIRECTION);
+                                      11, BACKWARDS_DIRECTION,
+                                      AX_TEXT_AFFINITY_DOWNSTREAM);
   EXPECT_EQ(6UL, result);
   result = FindAccessibleTextBoundary(text, line_start_offsets, WORD_BOUNDARY,
-                                      12, BACKWARDS_DIRECTION);
+                                      12, BACKWARDS_DIRECTION,
+                                      AX_TEXT_AFFINITY_DOWNSTREAM);
   EXPECT_EQ(12UL, result);
   result = FindAccessibleTextBoundary(text, line_start_offsets, WORD_BOUNDARY,
-                                      15, FORWARDS_DIRECTION);
+                                      15, FORWARDS_DIRECTION,
+                                      AX_TEXT_AFFINITY_DOWNSTREAM);
   EXPECT_EQ(17UL, result);
   result = FindAccessibleTextBoundary(text, line_start_offsets, WORD_BOUNDARY,
-                                      15, BACKWARDS_DIRECTION);
+                                      15, BACKWARDS_DIRECTION,
+                                      AX_TEXT_AFFINITY_DOWNSTREAM);
   EXPECT_EQ(12UL, result);
   result = FindAccessibleTextBoundary(text, line_start_offsets, WORD_BOUNDARY,
-                                      16, FORWARDS_DIRECTION);
+                                      16, FORWARDS_DIRECTION,
+                                      AX_TEXT_AFFINITY_DOWNSTREAM);
   EXPECT_EQ(17UL, result);
   result = FindAccessibleTextBoundary(text, line_start_offsets, WORD_BOUNDARY,
-                                      17, FORWARDS_DIRECTION);
+                                      17, FORWARDS_DIRECTION,
+                                      AX_TEXT_AFFINITY_DOWNSTREAM);
   EXPECT_EQ(20UL, result);
   result = FindAccessibleTextBoundary(text, line_start_offsets, WORD_BOUNDARY,
-                                      20, FORWARDS_DIRECTION);
+                                      20, FORWARDS_DIRECTION,
+                                      AX_TEXT_AFFINITY_DOWNSTREAM);
   EXPECT_EQ(text_length, result);
   result = FindAccessibleTextBoundary(text, line_start_offsets, WORD_BOUNDARY,
-                                      text_length, BACKWARDS_DIRECTION);
+                                      text_length, BACKWARDS_DIRECTION,
+                                      AX_TEXT_AFFINITY_DOWNSTREAM);
   EXPECT_EQ(20UL, result);
 }
 
@@ -63,48 +75,57 @@ TEST(AXTextUtils, FindAccessibleTextBoundaryLine) {
 
   // Basic cases.
   result = FindAccessibleTextBoundary(text, line_start_offsets, LINE_BOUNDARY,
-                                      5, FORWARDS_DIRECTION);
+                                      5, FORWARDS_DIRECTION,
+                                      AX_TEXT_AFFINITY_DOWNSTREAM);
   EXPECT_EQ(8UL, result);
   result = FindAccessibleTextBoundary(text, line_start_offsets, LINE_BOUNDARY,
-                                       9, BACKWARDS_DIRECTION);
+                                      9, BACKWARDS_DIRECTION,
+                                      AX_TEXT_AFFINITY_DOWNSTREAM);
   EXPECT_EQ(8UL, result);
   result = FindAccessibleTextBoundary(text, line_start_offsets, LINE_BOUNDARY,
-                                       10, FORWARDS_DIRECTION);
+                                      10, FORWARDS_DIRECTION,
+                                      AX_TEXT_AFFINITY_DOWNSTREAM);
   EXPECT_EQ(15UL, result);
 
   // Edge cases.
   result = FindAccessibleTextBoundary(text, line_start_offsets, LINE_BOUNDARY,
-                                      text_length, BACKWARDS_DIRECTION);
+                                      text_length, BACKWARDS_DIRECTION,
+                                      AX_TEXT_AFFINITY_DOWNSTREAM);
   EXPECT_EQ(15UL, result);
 
   // When the start_offset is at the start of the next line and we are searching
   // backwards, it should not move.
   result = FindAccessibleTextBoundary(text, line_start_offsets, LINE_BOUNDARY,
-                                       15, BACKWARDS_DIRECTION);
+                                      15, BACKWARDS_DIRECTION,
+                                      AX_TEXT_AFFINITY_DOWNSTREAM);
   EXPECT_EQ(15UL, result);
 
   // When the start_offset is at a hard line break and we are searching
   // backwards, it should return the start of the previous line.
   result = FindAccessibleTextBoundary(text, line_start_offsets, LINE_BOUNDARY,
-                                       14, BACKWARDS_DIRECTION);
+                                      14, BACKWARDS_DIRECTION,
+                                      AX_TEXT_AFFINITY_DOWNSTREAM);
   EXPECT_EQ(8UL, result);
 
   // When the start_offset is at the start of a line and we are searching
   // forwards, it should return the start of the next line.
   result = FindAccessibleTextBoundary(text, line_start_offsets, LINE_BOUNDARY,
-                                      8, FORWARDS_DIRECTION);
+                                      8, FORWARDS_DIRECTION,
+                                      AX_TEXT_AFFINITY_DOWNSTREAM);
   EXPECT_EQ(15UL, result);
 
   // When there is no previous line break and we are searching backwards,
   // it should return 0.
   result = FindAccessibleTextBoundary(text, line_start_offsets, LINE_BOUNDARY,
-                                      4, BACKWARDS_DIRECTION);
+                                      4, BACKWARDS_DIRECTION,
+                                      AX_TEXT_AFFINITY_DOWNSTREAM);
   EXPECT_EQ(0UL, result);
 
   // When we are at the start of the last line and we are searching forwards.
   // it should return the text length.
   result = FindAccessibleTextBoundary(text, line_start_offsets, LINE_BOUNDARY,
-                                      15, FORWARDS_DIRECTION);
+                                      15, FORWARDS_DIRECTION,
+                                      AX_TEXT_AFFINITY_DOWNSTREAM);
   EXPECT_EQ(text_length, result);
 }