BASELINE: Update Chromium to 66.0.3359.156

Change-Id: I0c9831ad39911a086b6377b16f995ad75a51e441
Reviewed-by: Michal Klocek <michal.klocek@qt.io>

1 files changed, 21 insertions, 21 deletions

diff --git a/chromium/ui/accessibility/ax_text_utils_unittest.cc b/chromium/ui/accessibility/ax_text_utils_unittest.cc
index 0f1ad1de714..7915cdd24cc 100644
--- a/chromium/ui/accessibility/ax_text_utils_unittest.cc
+++ b/chromium/ui/accessibility/ax_text_utils_unittest.cc
@@ -6,7 +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_enums.mojom.h"
 #include "ui/accessibility/ax_text_utils.h"
 
 namespace ui {
@@ -21,47 +21,47 @@ TEST(AXTextUtils, FindAccessibleTextBoundaryWord) {
 
   result = FindAccessibleTextBoundary(text, line_start_offsets, WORD_BOUNDARY,
                                       0, FORWARDS_DIRECTION,
-                                      AX_TEXT_AFFINITY_DOWNSTREAM);
+                                      ax::mojom::TextAffinity::kDownstream);
   EXPECT_EQ(6UL, result);
   result = FindAccessibleTextBoundary(text, line_start_offsets, WORD_BOUNDARY,
                                       5, BACKWARDS_DIRECTION,
-                                      AX_TEXT_AFFINITY_DOWNSTREAM);
+                                      ax::mojom::TextAffinity::kDownstream);
   EXPECT_EQ(0UL, result);
   result = FindAccessibleTextBoundary(text, line_start_offsets, WORD_BOUNDARY,
                                       6, FORWARDS_DIRECTION,
-                                      AX_TEXT_AFFINITY_DOWNSTREAM);
+                                      ax::mojom::TextAffinity::kDownstream);
   EXPECT_EQ(12UL, result);
   result = FindAccessibleTextBoundary(text, line_start_offsets, WORD_BOUNDARY,
                                       11, BACKWARDS_DIRECTION,
-                                      AX_TEXT_AFFINITY_DOWNSTREAM);
+                                      ax::mojom::TextAffinity::kDownstream);
   EXPECT_EQ(6UL, result);
   result = FindAccessibleTextBoundary(text, line_start_offsets, WORD_BOUNDARY,
                                       12, BACKWARDS_DIRECTION,
-                                      AX_TEXT_AFFINITY_DOWNSTREAM);
+                                      ax::mojom::TextAffinity::kDownstream);
   EXPECT_EQ(12UL, result);
   result = FindAccessibleTextBoundary(text, line_start_offsets, WORD_BOUNDARY,
                                       15, FORWARDS_DIRECTION,
-                                      AX_TEXT_AFFINITY_DOWNSTREAM);
+                                      ax::mojom::TextAffinity::kDownstream);
   EXPECT_EQ(17UL, result);
   result = FindAccessibleTextBoundary(text, line_start_offsets, WORD_BOUNDARY,
                                       15, BACKWARDS_DIRECTION,
-                                      AX_TEXT_AFFINITY_DOWNSTREAM);
+                                      ax::mojom::TextAffinity::kDownstream);
   EXPECT_EQ(12UL, result);
   result = FindAccessibleTextBoundary(text, line_start_offsets, WORD_BOUNDARY,
                                       16, FORWARDS_DIRECTION,
-                                      AX_TEXT_AFFINITY_DOWNSTREAM);
+                                      ax::mojom::TextAffinity::kDownstream);
   EXPECT_EQ(17UL, result);
   result = FindAccessibleTextBoundary(text, line_start_offsets, WORD_BOUNDARY,
                                       17, FORWARDS_DIRECTION,
-                                      AX_TEXT_AFFINITY_DOWNSTREAM);
+                                      ax::mojom::TextAffinity::kDownstream);
   EXPECT_EQ(20UL, result);
   result = FindAccessibleTextBoundary(text, line_start_offsets, WORD_BOUNDARY,
                                       20, FORWARDS_DIRECTION,
-                                      AX_TEXT_AFFINITY_DOWNSTREAM);
+                                      ax::mojom::TextAffinity::kDownstream);
   EXPECT_EQ(text_length, result);
   result = FindAccessibleTextBoundary(text, line_start_offsets, WORD_BOUNDARY,
                                       text_length, BACKWARDS_DIRECTION,
-                                      AX_TEXT_AFFINITY_DOWNSTREAM);
+                                      ax::mojom::TextAffinity::kDownstream);
   EXPECT_EQ(20UL, result);
 }
 
@@ -76,56 +76,56 @@ TEST(AXTextUtils, FindAccessibleTextBoundaryLine) {
   // Basic cases.
   result = FindAccessibleTextBoundary(text, line_start_offsets, LINE_BOUNDARY,
                                       5, FORWARDS_DIRECTION,
-                                      AX_TEXT_AFFINITY_DOWNSTREAM);
+                                      ax::mojom::TextAffinity::kDownstream);
   EXPECT_EQ(8UL, result);
   result = FindAccessibleTextBoundary(text, line_start_offsets, LINE_BOUNDARY,
                                       9, BACKWARDS_DIRECTION,
-                                      AX_TEXT_AFFINITY_DOWNSTREAM);
+                                      ax::mojom::TextAffinity::kDownstream);
   EXPECT_EQ(8UL, result);
   result = FindAccessibleTextBoundary(text, line_start_offsets, LINE_BOUNDARY,
                                       10, FORWARDS_DIRECTION,
-                                      AX_TEXT_AFFINITY_DOWNSTREAM);
+                                      ax::mojom::TextAffinity::kDownstream);
   EXPECT_EQ(15UL, result);
 
   // Edge cases.
   result = FindAccessibleTextBoundary(text, line_start_offsets, LINE_BOUNDARY,
                                       text_length, BACKWARDS_DIRECTION,
-                                      AX_TEXT_AFFINITY_DOWNSTREAM);
+                                      ax::mojom::TextAffinity::kDownstream);
   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,
-                                      AX_TEXT_AFFINITY_DOWNSTREAM);
+                                      ax::mojom::TextAffinity::kDownstream);
   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,
-                                      AX_TEXT_AFFINITY_DOWNSTREAM);
+                                      ax::mojom::TextAffinity::kDownstream);
   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,
-                                      AX_TEXT_AFFINITY_DOWNSTREAM);
+                                      ax::mojom::TextAffinity::kDownstream);
   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,
-                                      AX_TEXT_AFFINITY_DOWNSTREAM);
+                                      ax::mojom::TextAffinity::kDownstream);
   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,
-                                      AX_TEXT_AFFINITY_DOWNSTREAM);
+                                      ax::mojom::TextAffinity::kDownstream);
   EXPECT_EQ(text_length, result);
 }