Revert "Implement basic Left/Right visual caret movement with bidi caret affinity"

This reverts commit d7d46e615e305e3c3cc927539c553e9c711abf7a.

Reason for revert: This patch may be the cause of failing tests:
* virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_word_04_rtl_multi_line.html
* virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_word_02_ltr_multi_line.html
* virtual/bidi-caret-affinity/editing/selection/move-bidi-isolate.html
on Mac 10.11. See bug for more details.

Bug: 920878

Original change's description:
> Implement basic Left/Right visual caret movement with bidi caret affinity
> 
> Design doc: http://bit.ly/2QVAwGq
> 
> This patch:
> 
> 1. Introduces a new structure NGCaretNavigator to index the bidi
>    information of the text_content of a block. The structure is
>    built together with NGOffsetMapping.
> 
> 2. With NGCaretNavigator, we can test bidi boundary in VisiblePosition
>    canonicalization more directly.
> 
> 3. With NGCaretNavigator, left/right visual movements on text_content
>    are implemented in a straightforward manner. This patch implements
>    only the basics: one line of plain text. However, the most complicated
>    part of the legacy implementation, namely *bidi and whitespace
>    collapsing*, have already been naturally handled.
> 
> 4. SelectionModifierCharacter adds a new branch where bidi caret
>    affinity is enabled, and uses NGOffsetMapping to convert input/output
>    between DOM and NGCaretNavigator.
> 
> Note that the implementation works on both legacy and NG layout.
> 
> Bug: 894651
> Change-Id: I806ce23a97b2dfd977d6eecfd224c812319e6a7e
> Reviewed-on: https://chromium-review.googlesource.com/c/1377618
> Commit-Queue: Xiaocheng Hu <xiaochengh@chromium.org>
> Reviewed-by: Yoshifumi Inoue <yosin@chromium.org>
> Reviewed-by: Yoichi Osato <yoichio@chromium.org>
> Reviewed-by: Emil A Eklund <eae@chromium.org>
> Reviewed-by: Koji Ishii <kojii@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#621807}

TBR=yosin@chromium.org,eae@chromium.org,yoichio@chromium.org,kojii@chromium.org,xiaochengh@chromium.org

Change-Id: I7146445c16b13d3cdaf12e2f88b78353b7f0d10a
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 894651
Reviewed-on: https://chromium-review.googlesource.com/c/1405116
Reviewed-by: Patti <patricialor@chromium.org>
Commit-Queue: Patti <patricialor@chromium.org>
Cr-Commit-Position: refs/heads/master@{#621881}
diff --git a/third_party/blink/renderer/core/BUILD.gn b/third_party/blink/renderer/core/BUILD.gn
index bfe0325..d63ca150 100644
--- a/third_party/blink/renderer/core/BUILD.gn
+++ b/third_party/blink/renderer/core/BUILD.gn
@@ -2039,7 +2039,6 @@
     "layout/ng/geometry/ng_physical_offset_test.cc",
     "layout/ng/geometry/ng_physical_rect_test.cc",
     "layout/ng/inline/ng_baseline_test.cc",
-    "layout/ng/inline/ng_caret_navigator_test.cc",
     "layout/ng/inline/ng_caret_position_test.cc",
     "layout/ng/inline/ng_inline_fragment_traversal_test.cc",
     "layout/ng/inline/ng_inline_items_builder_test.cc",
diff --git a/third_party/blink/renderer/core/editing/selection_modifier_character.cc b/third_party/blink/renderer/core/editing/selection_modifier_character.cc
index 10b1f76..194724b 100644
--- a/third_party/blink/renderer/core/editing/selection_modifier_character.cc
+++ b/third_party/blink/renderer/core/editing/selection_modifier_character.cc
@@ -39,9 +39,6 @@
 #include "third_party/blink/renderer/core/layout/api/line_layout_item.h"
 #include "third_party/blink/renderer/core/layout/line/inline_text_box.h"
 #include "third_party/blink/renderer/core/layout/line/root_inline_box.h"
-#include "third_party/blink/renderer/core/layout/ng/inline/ng_caret_navigator.h"
-#include "third_party/blink/renderer/core/layout/ng/inline/ng_inline_node.h"
-#include "third_party/blink/renderer/core/layout/ng/inline/ng_offset_mapping.h"
 
 namespace blink {
 
@@ -151,13 +148,6 @@
       return box.Root().GetLogicalStartNonPseudoBox();
     return box.Root().GetLogicalEndNonPseudoBox();
   }
-
-  static NGCaretNavigator::VisualCaretMovementResult ForwardPositionOf(
-      const NGCaretNavigator& caret_navigator,
-      const NGCaretNavigator::Position& caret_position) {
-    DCHECK(RuntimeEnabledFeatures::BidiCaretAffinityEnabled());
-    return caret_navigator.LeftPositionOf(caret_position);
-  }
 };
 
 // The traversal strategy for |RightPositionOf()|.
@@ -264,13 +254,6 @@
       return box.Root().GetLogicalEndNonPseudoBox();
     return box.Root().GetLogicalStartNonPseudoBox();
   }
-
-  static NGCaretNavigator::VisualCaretMovementResult ForwardPositionOf(
-      const NGCaretNavigator& caret_navigator,
-      const NGCaretNavigator::Position& caret_position) {
-    DCHECK(RuntimeEnabledFeatures::BidiCaretAffinityEnabled());
-    return caret_navigator.RightPositionOf(caret_position);
-  }
 };
 
 template <typename Traversal>
@@ -495,111 +478,17 @@
 }
 
 template <typename Strategy, typename Traversal>
-PositionWithAffinityTemplate<Strategy> TraverseWithBidiCaretAffinity(
-    const PositionWithAffinityTemplate<Strategy> start_position_with_affinity) {
-  const PositionTemplate<Strategy> start_position =
-      start_position_with_affinity.GetPosition();
-  const Position start_position_in_dom = ToPositionInDOMTree(start_position);
-  if (start_position_in_dom.IsNull())
-    return PositionWithAffinityTemplate<Strategy>();
-
-  LayoutBlockFlow* const context =
-      NGOffsetMapping::GetInlineFormattingContextOf(start_position_in_dom);
-  if (!context) {
-    // We reach here if, e.g., the position is in an empty block.
-    // TODO(xiaochengh): Investigate if we reach here for other reaseons.
-#if DCHECK_IS_ON()
-    const Node* node = start_position.ComputeContainerNode();
-    DCHECK(node) << start_position;
-    const LayoutObject* object = node->GetLayoutObject();
-    DCHECK(object) << start_position;
-    DCHECK(object->IsLayoutBlockFlow()) << start_position;
-    DCHECK(!HasRenderedNonAnonymousDescendantsWithHeight(object))
-        << start_position;
-#endif
-    const TextDirection block_direction =
-        DirectionOfEnclosingBlockOf(start_position);
-    // TODO(xiaochengh): Should return the visual line start/end of the position
-    // below.
-    return PositionWithAffinityTemplate<Strategy>(
-        Traversal::ForwardVisuallyDistinctCandidateOf(block_direction,
-                                                      start_position));
-  }
-
-  // TODO(xiaochengh): The double pointer pattern below is confusing and
-  // cumbersome, but necessary for now. Make it easier.
-  std::unique_ptr<NGOffsetMapping> mapping_storage;
-  const NGOffsetMapping* mapping =
-      NGInlineNode::GetOffsetMapping(context, &mapping_storage);
-  DCHECK(mapping);
-
-  const base::Optional<unsigned> start_offset =
-      mapping->GetTextContentOffset(start_position_in_dom);
-  DCHECK(start_offset.has_value());
-
-  // Legacy canonicalization sets downstream affinity when |start_offset| is
-  // at block end. Fix it to upstream in that case.
-  const TextAffinity start_affinity =
-      start_offset.value() < mapping->GetText().length()
-          ? start_position_with_affinity.Affinity()
-          : TextAffinity::kUpstream;
-
-  DCHECK(mapping->GetCaretNavigator());
-  const NGCaretNavigator& caret_navigator = *mapping->GetCaretNavigator();
-
-  const NGCaretNavigator::Position start_caret_position{start_offset.value(),
-                                                        start_affinity};
-  NGCaretNavigator::VisualCaretMovementResult result_caret_position =
-      Traversal::ForwardPositionOf(caret_navigator, start_caret_position);
-  if (result_caret_position.IsWithinContext()) {
-    DCHECK(result_caret_position.position.has_value());
-    const unsigned result_offset = result_caret_position.position->offset;
-    const TextAffinity result_affinity =
-        result_caret_position.position->affinity;
-    const Position result_position =
-        result_affinity == TextAffinity::kDownstream
-            ? mapping->GetLastPosition(result_offset)
-            : mapping->GetFirstPosition(result_offset);
-    const PositionWithAffinity result(result_position, result_affinity);
-    return FromPositionInDOMTree<Strategy>(result);
-  }
-
-  // We reach here if we need to move out of the current block.
-  if (result_caret_position.IsBeforeContext()) {
-    // TODO(xiaochengh): Move to the visual end of the previous block.
-    return PositionWithAffinityTemplate<Strategy>();
-  }
-
-  DCHECK(result_caret_position.IsAfterContext());
-  // TODO(xiaochengh): Move to the visual beginning of the next block.
-  return PositionWithAffinityTemplate<Strategy>();
-}
-
-template <typename Strategy, typename Traversal>
 VisiblePositionTemplate<Strategy> TraverseAlgorithm(
     const VisiblePositionTemplate<Strategy>& visible_position) {
   DCHECK(visible_position.IsValid()) << visible_position;
+  const PositionTemplate<Strategy> pos =
+      TraverseInternalAlgorithm<Strategy, Traversal>(visible_position);
+  // TODO(yosin) Why can't we move left from the last position in a tree?
+  if (pos.AtStartOfTree() || pos.AtEndOfTree())
+    return VisiblePositionTemplate<Strategy>();
 
-  VisiblePositionTemplate<Strategy> result;
-  if (!RuntimeEnabledFeatures::BidiCaretAffinityEnabled()) {
-    const PositionTemplate<Strategy> pos =
-        TraverseInternalAlgorithm<Strategy, Traversal>(visible_position);
-    // TODO(yosin) Why can't we move left from the last position in a tree?
-    if (pos.AtStartOfTree() || pos.AtEndOfTree())
-      return VisiblePositionTemplate<Strategy>();
-    result = CreateVisiblePosition(pos);
-    DCHECK_NE(result.DeepEquivalent(), visible_position.DeepEquivalent());
-  } else {
-    const PositionWithAffinityTemplate<Strategy> pos =
-        TraverseWithBidiCaretAffinity<Strategy, Traversal>(
-            visible_position.ToPositionWithAffinity());
-    if (pos.IsNull())
-      return VisiblePositionTemplate<Strategy>();
-    result = CreateVisiblePosition(pos);
-    DCHECK_NE(result.ToPositionWithAffinity(),
-              visible_position.ToPositionWithAffinity())
-        << visible_position;
-  }
+  const VisiblePositionTemplate<Strategy> result = CreateVisiblePosition(pos);
+  DCHECK_NE(result.DeepEquivalent(), visible_position.DeepEquivalent());
 
   return Traversal::HonorEditingBoundary(
       DirectionOfEnclosingBlockOf(result.DeepEquivalent()), result,
diff --git a/third_party/blink/renderer/core/editing/visible_position.cc b/third_party/blink/renderer/core/editing/visible_position.cc
index eceeae9..6bd3b46 100644
--- a/third_party/blink/renderer/core/editing/visible_position.cc
+++ b/third_party/blink/renderer/core/editing/visible_position.cc
@@ -36,10 +36,6 @@
 #include "third_party/blink/renderer/core/editing/visible_units.h"
 #include "third_party/blink/renderer/core/html/html_element.h"
 #include "third_party/blink/renderer/core/html_names.h"
-#include "third_party/blink/renderer/core/layout/layout_object.h"
-#include "third_party/blink/renderer/core/layout/ng/inline/ng_caret_navigator.h"
-#include "third_party/blink/renderer/core/layout/ng/inline/ng_inline_node.h"
-#include "third_party/blink/renderer/core/layout/ng/inline/ng_offset_mapping.h"
 #include "third_party/blink/renderer/platform/bindings/exception_state.h"
 #include "third_party/blink/renderer/platform/geometry/float_quad.h"
 #include "third_party/blink/renderer/platform/wtf/text/cstring.h"
@@ -99,40 +95,13 @@
     const PositionWithAffinityTemplate<Strategy> upstream_position(
         deep_position, TextAffinity::kUpstream);
 
-    if (!InSameLine(downstream_position, upstream_position))
-      return VisiblePositionTemplate<Strategy>(upstream_position);
-
-    if (!NGOffsetMapping::AcceptsPosition(ToPositionInDOMTree(deep_position))) {
-      // editing/selection/mixed-editability-10.html reaches here.
-      // We can't check bidi in such case. Use downstream as the default.
-      // TODO(xiaochengh): Investigate why we reach here and how to work around.
-      return VisiblePositionTemplate<Strategy>(downstream_position);
-    }
-
-    // Check if the position is at bidi boundary.
-    const LayoutObject* layout_object =
-        deep_position.AnchorNode()->GetLayoutObject();
-    DCHECK(layout_object) << position_with_affinity;
-    if (!layout_object->IsInline())
-      return VisiblePositionTemplate<Strategy>(downstream_position);
-    LayoutBlockFlow* const context =
-        NGOffsetMapping::GetInlineFormattingContextOf(*layout_object);
-    DCHECK(context);
-
-    // TODO(xiaochengh): The double pointer pattern below is confusing and
-    // cumbersome, but necessary for now. Make it easier.
-    std::unique_ptr<NGOffsetMapping> mapping_storage;
-    const NGOffsetMapping* mapping =
-        NGInlineNode::GetOffsetMapping(context, &mapping_storage);
-    DCHECK(mapping);
-
-    const base::Optional<unsigned> offset =
-        mapping->GetTextContentOffset(ToPositionInDOMTree(deep_position));
-    DCHECK(offset.has_value());
-
-    DCHECK(mapping->GetCaretNavigator());
-    const NGCaretNavigator& caret_navigator = *mapping->GetCaretNavigator();
-    if (caret_navigator.OffsetIsBidiBoundary(offset.value()))
+    // Check if the upstream and downstream positions are visually the same.
+    // If so, canonicalize affinity to downstream.
+    // TODO(xiaochengh): Check upstream and downstream difference in a more
+    // direct way, instead of checking caret bounds.
+    const IntRect downstream_rect = AbsoluteCaretBoundsOf(downstream_position);
+    const IntRect upstream_rect = AbsoluteCaretBoundsOf(upstream_position);
+    if (downstream_rect != upstream_rect)
       return VisiblePositionTemplate<Strategy>(upstream_position);
     return VisiblePositionTemplate<Strategy>(downstream_position);
   }
diff --git a/third_party/blink/renderer/core/layout/BUILD.gn b/third_party/blink/renderer/core/layout/BUILD.gn
index cedbb3b..75287430 100644
--- a/third_party/blink/renderer/core/layout/BUILD.gn
+++ b/third_party/blink/renderer/core/layout/BUILD.gn
@@ -335,8 +335,6 @@
     "ng/inline/ng_baseline.h",
     "ng/inline/ng_bidi_paragraph.cc",
     "ng/inline/ng_bidi_paragraph.h",
-    "ng/inline/ng_caret_navigator.cc",
-    "ng/inline/ng_caret_navigator.h",
     "ng/inline/ng_caret_position.cc",
     "ng/inline/ng_caret_position.h",
     "ng/inline/ng_caret_rect.cc",
diff --git a/third_party/blink/renderer/core/layout/ng/inline/README.md b/third_party/blink/renderer/core/layout/ng/inline/README.md
index c604426..715f1d0e 100644
--- a/third_party/blink/renderer/core/layout/ng/inline/README.md
+++ b/third_party/blink/renderer/core/layout/ng/inline/README.md
@@ -75,7 +75,6 @@
 [CSS Text Processing Order of Operations]: https://drafts.csswg.org/css-text-3/#order
 
 ### Pre-layout ###
-[Pre-layout]: #pre-layout
 
 For inline layout there is a pre-layout pass that prepares the internal data
 structures needed to perform line layout.
@@ -303,16 +302,6 @@
 
    This is part of the Line Box Construction phase above.
 
-### Interface for Editing ###
-
-[NGOffsetMapping] provides functions for converting between offsets in the text
-content of an inline formatting context (computed in [pre-layout]) and DOM
-positions in the context. See [design doc](https://goo.gl/CJbxky) for details.
-
-[NGCaretNavigator] provides functions for inspecting bidi levels and visual
-ordering of text content, and supports visual left/right caret movements in the
-text. See [design doc](http://bit.ly/2QVAwGq) for details.
-
 
 [ICU BiDi]: http://userguide.icu-project.org/transforms/bidi
 [UAX#9 Unicode Bidirectional Algorithm]: http://unicode.org/reports/tr9/
@@ -322,7 +311,6 @@
 [FontBaseline]: ../../../platform/fonts/FontBaseline.h
 [NGBaselineAlgorithmType]: ng_baseline.h
 [NGBaselineRequest]: ng_baseline.h
-[NGCaretNavigator]: ng_caret_navigator.h
 [NGBidiParagraph]: ng_bidi_paragraph.h
 [NGBlockNode]: ../ng_block_node.h
 [NGBoxFragment]: ../ng_box_fragment.h
@@ -336,7 +324,6 @@
 [NGInlineLayoutAlgorithm]: ng_inline_layout_algorithm.h
 [NGLayoutInputNode]: ../ng_layout_input_node.h
 [NGLineBreaker]: ng_line_breaker.h
-[NGOffsetMapping]: ng_offset_mapping.h
 [NGPhysicalBoxFragment]: ../ng_physical_box_fragment.h
 [NGPhysicalFragment]: ../ng_physical_fragment.h
 [NGPhysicalLineBoxFragment]: ng_physical_line_box_fragment.h
diff --git a/third_party/blink/renderer/core/layout/ng/inline/ng_caret_navigator.cc b/third_party/blink/renderer/core/layout/ng/inline/ng_caret_navigator.cc
deleted file mode 100644
index bdec2ff0..0000000
--- a/third_party/blink/renderer/core/layout/ng/inline/ng_caret_navigator.cc
+++ /dev/null
@@ -1,175 +0,0 @@
-// Copyright 2018 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 "third_party/blink/renderer/core/layout/ng/inline/ng_caret_navigator.h"
-
-#include "third_party/blink/renderer/core/layout/ng/inline/ng_bidi_paragraph.h"
-#include "third_party/blink/renderer/core/layout/ng/inline/ng_inline_node.h"
-
-namespace blink {
-
-NGCaretNavigator::~NGCaretNavigator() = default;
-
-NGCaretNavigator::NGCaretNavigator(NGCaretNavigator&& other)
-    : text_(other.text_),
-      bidi_levels_(std::move(other.bidi_levels_)),
-      indices_in_visual_order_(std::move(other.indices_in_visual_order_)),
-      visual_indices_(std::move(other.visual_indices_)),
-      is_bidi_enabled_(other.is_bidi_enabled_),
-      base_direction_(other.base_direction_) {}
-
-NGCaretNavigator::NGCaretNavigator(const NGInlineNodeData& data)
-    : text_(data.text_content),
-      is_bidi_enabled_(data.IsBidiEnabled()),
-      base_direction_(data.BaseDirection()) {
-  if (!is_bidi_enabled_)
-    return;
-
-  bidi_levels_.resize(text_.length());
-  for (const NGInlineItem& item : data.items) {
-    if (!item.Length())
-      continue;
-    for (unsigned i = item.StartOffset(); i < item.EndOffset(); ++i) {
-      DCHECK_LT(i, bidi_levels_.size());
-      bidi_levels_[i] = item.BidiLevel();
-    }
-  }
-
-  indices_in_visual_order_.resize(text_.length());
-  NGBidiParagraph::IndicesInVisualOrder(bidi_levels_,
-                                        &indices_in_visual_order_);
-
-  visual_indices_.resize(text_.length());
-  for (unsigned i = 0; i < indices_in_visual_order_.size(); ++i)
-    visual_indices_[indices_in_visual_order_[i]] = i;
-}
-
-UBiDiLevel NGCaretNavigator::BidiLevelAt(unsigned index) const {
-  DCHECK_LT(index, text_.length());
-  if (!is_bidi_enabled_)
-    return 0;
-  DCHECK_LT(index, bidi_levels_.size());
-  return bidi_levels_[index];
-}
-
-TextDirection NGCaretNavigator::TextDirectionAt(unsigned index) const {
-  UBiDiLevel level = BidiLevelAt(index);
-  return DirectionFromLevel(level);
-}
-
-bool NGCaretNavigator::OffsetIsBidiBoundary(unsigned offset) const {
-  DCHECK_LE(offset, text_.length());
-  if (!is_bidi_enabled_)
-    return false;
-  if (!offset || offset == text_.length())
-    return false;
-  return BidiLevelAt(offset - 1) != BidiLevelAt(offset);
-}
-
-TextDirection NGCaretNavigator::TextDirectionAt(
-    const Position& caret_position) const {
-  return TextDirectionAt(AnchorCharacterIndex(caret_position));
-}
-
-unsigned NGCaretNavigator::AnchorCharacterIndex(
-    const Position& caret_position) const {
-  if (caret_position.affinity == TextAffinity::kDownstream) {
-    DCHECK_LT(caret_position.offset, text_.length());
-    return caret_position.offset;
-  }
-  DCHECK_GT(caret_position.offset, 0u);
-  return caret_position.offset - 1;
-}
-
-NGCaretNavigator::Position NGCaretNavigator::LeftEdgeOf(unsigned index) const {
-  DCHECK_LT(index, text_.length());
-  const TextDirection direction = TextDirectionAt(index);
-  if (IsLtr(direction))
-    return {index, TextAffinity::kDownstream};
-  return {index + 1, TextAffinity::kUpstream};
-}
-
-NGCaretNavigator::Position NGCaretNavigator::RightEdgeOf(unsigned index) const {
-  DCHECK_LT(index, text_.length());
-  const TextDirection direction = TextDirectionAt(index);
-  if (IsRtl(direction))
-    return {index, TextAffinity::kDownstream};
-  return {index + 1, TextAffinity::kUpstream};
-}
-
-NGCaretNavigator::VisualCharacterMovementResult
-NGCaretNavigator::LeftCharacterOf(unsigned index) const {
-  DCHECK_LT(index, text_.length());
-  if (!is_bidi_enabled_) {
-    if (!index)
-      return {VisualMovementResultType::kBeforeContext, base::nullopt};
-    return {VisualMovementResultType::kWithinContext, index - 1};
-  }
-
-  const unsigned visual_index = visual_indices_[index];
-  if (visual_index) {
-    return {VisualMovementResultType::kWithinContext,
-            indices_in_visual_order_[visual_index - 1]};
-  }
-
-  if (IsLtr(base_direction_))
-    return {VisualMovementResultType::kBeforeContext, base::nullopt};
-  return {VisualMovementResultType::kAfterContext, base::nullopt};
-}
-
-NGCaretNavigator::VisualCharacterMovementResult
-NGCaretNavigator::RightCharacterOf(unsigned index) const {
-  DCHECK_LT(index, text_.length());
-  if (bidi_levels_.IsEmpty()) {
-    if (index + 1 == text_.length())
-      return {VisualMovementResultType::kAfterContext, base::nullopt};
-    return {VisualMovementResultType::kWithinContext, index + 1};
-  }
-
-  const unsigned visual_index = visual_indices_[index];
-  if (visual_index + 1 < text_.length()) {
-    return {VisualMovementResultType::kWithinContext,
-            indices_in_visual_order_[visual_index + 1]};
-  }
-
-  if (IsRtl(base_direction_))
-    return {VisualMovementResultType::kBeforeContext, base::nullopt};
-  return {VisualMovementResultType::kAfterContext, base::nullopt};
-}
-
-NGCaretNavigator::VisualCaretMovementResult NGCaretNavigator::LeftPositionOf(
-    const Position& caret_position) const {
-  const unsigned index = AnchorCharacterIndex(caret_position);
-  if (caret_position == RightEdgeOf(index)) {
-    // TODO(xiaochengh): Consider grapheme cluster
-    return {VisualMovementResultType::kWithinContext, LeftEdgeOf(index)};
-  }
-
-  VisualCharacterMovementResult left_character = LeftCharacterOf(index);
-  if (left_character.IsWithinContext()) {
-    DCHECK(left_character.index.has_value());
-    return LeftPositionOf(RightEdgeOf(left_character.index.value()));
-  }
-
-  return {left_character.type, base::nullopt};
-}
-
-NGCaretNavigator::VisualCaretMovementResult NGCaretNavigator::RightPositionOf(
-    const Position& caret_position) const {
-  const unsigned index = AnchorCharacterIndex(caret_position);
-  if (caret_position == LeftEdgeOf(index)) {
-    // TODO(xiaochengh): Consider grapheme cluster
-    return {VisualMovementResultType::kWithinContext, RightEdgeOf(index)};
-  }
-
-  VisualCharacterMovementResult right_character = RightCharacterOf(index);
-  if (right_character.IsWithinContext()) {
-    DCHECK(right_character.index.has_value());
-    return RightPositionOf(LeftEdgeOf(right_character.index.value()));
-  }
-
-  return {right_character.type, base::nullopt};
-}
-
-}  // namespace blink
diff --git a/third_party/blink/renderer/core/layout/ng/inline/ng_caret_navigator.h b/third_party/blink/renderer/core/layout/ng/inline/ng_caret_navigator.h
deleted file mode 100644
index 297bda0..0000000
--- a/third_party/blink/renderer/core/layout/ng/inline/ng_caret_navigator.h
+++ /dev/null
@@ -1,129 +0,0 @@
-// Copyright 2018 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.
-
-#ifndef THIRD_PARTY_BLINK_RENDERER_CORE_LAYOUT_NG_INLINE_NG_CARET_NAVIGATOR_H_
-#define THIRD_PARTY_BLINK_RENDERER_CORE_LAYOUT_NG_INLINE_NG_CARET_NAVIGATOR_H_
-
-#include "base/optional.h"
-#include "third_party/blink/renderer/core/core_export.h"
-#include "third_party/blink/renderer/core/editing/text_affinity.h"
-#include "third_party/blink/renderer/platform/text/text_direction.h"
-#include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
-#include "third_party/blink/renderer/platform/wtf/vector.h"
-
-#include <unicode/ubidi.h>
-
-namespace blink {
-
-struct NGInlineNodeData;
-
-// Hosts the |text_content| of an inline formatting context and provides
-// bidi-related utilities, including checking bidi levels, computing visual
-// left/right characters and visual left/right caret movements.
-// Design doc: http://bit.ly/2QVAwGq
-class CORE_EXPORT NGCaretNavigator {
- public:
-  NGCaretNavigator(NGCaretNavigator&&);
-  explicit NGCaretNavigator(const NGInlineNodeData&);
-  ~NGCaretNavigator();
-
-  // Abstraction of a caret position in |text_|.
-  struct Position {
-    unsigned offset;
-    TextAffinity affinity;
-
-    bool operator==(const Position& other) const {
-      return offset == other.offset && affinity == other.affinity;
-    }
-  };
-
-  // Returns the bidi level or resolved direction of the character at the given
-  // logical |index|.
-  UBiDiLevel BidiLevelAt(unsigned index) const;
-  TextDirection TextDirectionAt(unsigned index) const;
-
-  // Returns true if the characters at indexes |offset - 1| and |offset| both
-  // exist and are at different bidi levels.
-  bool OffsetIsBidiBoundary(unsigned offset) const;
-
-  // Returns the resolved direction of the anchor character of a caret position.
-  TextDirection TextDirectionAt(const Position&) const;
-
-  // Returns the logical index that a Position is anchored to.
-  unsigned AnchorCharacterIndex(const Position&) const;
-
-  // Returns the visual left/right edge caret position of the character at the
-  // given logical |index|.
-  Position LeftEdgeOf(unsigned index) const;
-  Position RightEdgeOf(unsigned index) const;
-
-  // Left/right visual movements
-  // TODO(xiaochengh): Handle the following
-  // - Grapheme clusters
-  // - Enterable atomic inlines
-  // - Editing-ignored contents
-  // - Multiple lines
-
-  enum class VisualMovementResultType {
-    kWithinContext,
-    kBeforeContext,
-    kAfterContext
-  };
-
-  // Given the character at the logical |index|, returns the logical index of
-  // the character at its left/right side.
-  struct VisualCharacterMovementResult {
-    bool IsWithinContext() const {
-      return type == VisualMovementResultType::kWithinContext;
-    }
-    bool IsBeforeContext() const {
-      return type == VisualMovementResultType::kBeforeContext;
-    }
-    bool IsAfterContext() const {
-      return type == VisualMovementResultType::kAfterContext;
-    }
-
-    VisualMovementResultType type;
-    base::Optional<unsigned> index;
-  };
-  VisualCharacterMovementResult LeftCharacterOf(unsigned index) const;
-  VisualCharacterMovementResult RightCharacterOf(unsigned index) const;
-
-  // Given a caret position, moves it left/right by one grapheme cluster and
-  // returns the result.
-  struct VisualCaretMovementResult {
-    bool IsWithinContext() const {
-      return type == VisualMovementResultType::kWithinContext;
-    }
-    bool IsBeforeContext() const {
-      return type == VisualMovementResultType::kBeforeContext;
-    }
-    bool IsAfterContext() const {
-      return type == VisualMovementResultType::kAfterContext;
-    }
-
-    VisualMovementResultType type;
-    base::Optional<Position> position;
-  };
-  VisualCaretMovementResult LeftPositionOf(const Position&) const;
-  VisualCaretMovementResult RightPositionOf(const Position&) const;
-
- private:
-  String text_;
-
-  // TODO(xiaochengh): Add line-aware index.
-  // TODO(xiaochengh): Reduce memory consumption.
-  Vector<UBiDiLevel, 32> bidi_levels_;
-  Vector<int32_t, 32> indices_in_visual_order_;
-  Vector<int32_t, 32> visual_indices_;
-
-  bool is_bidi_enabled_;
-  TextDirection base_direction_;
-
-  DISALLOW_COPY_AND_ASSIGN(NGCaretNavigator);
-};
-
-}  // namespace blink
-
-#endif  // THIRD_PARTY_BLINK_RENDERER_CORE_LAYOUT_NG_INLINE_NG_CARET_NAVIGATOR_H_
diff --git a/third_party/blink/renderer/core/layout/ng/inline/ng_caret_navigator_test.cc b/third_party/blink/renderer/core/layout/ng/inline/ng_caret_navigator_test.cc
deleted file mode 100644
index a7cd9f9..0000000
--- a/third_party/blink/renderer/core/layout/ng/inline/ng_caret_navigator_test.cc
+++ /dev/null
@@ -1,306 +0,0 @@
-// Copyright 2018 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 "third_party/blink/renderer/core/layout/ng/inline/ng_caret_navigator.h"
-
-#include "third_party/blink/renderer/core/layout/ng/inline/ng_inline_node.h"
-#include "third_party/blink/renderer/core/layout/ng/inline/ng_offset_mapping.h"
-#include "third_party/blink/renderer/core/layout/ng/layout_ng_block_flow.h"
-#include "third_party/blink/renderer/core/layout/ng/ng_layout_test.h"
-
-namespace blink {
-
-class NGCaretNavigatorTest : public RenderingTest,
-                             public testing::WithParamInterface<bool>,
-                             private ScopedLayoutNGForTest,
-                             private ScopedBidiCaretAffinityForTest {
- public:
-  NGCaretNavigatorTest()
-      : ScopedLayoutNGForTest(GetParam()),
-        ScopedBidiCaretAffinityForTest(true) {}
-
-  void SetupHtml(const char* id, String html) {
-    SetBodyInnerHTML(html);
-
-    LayoutBlockFlow* layout_block_flow =
-        ToLayoutBlockFlow(GetLayoutObjectByElementId(id));
-    DCHECK(layout_block_flow);
-    DCHECK(layout_block_flow->ChildrenInline());
-    DCHECK_EQ(layout_block_flow->IsLayoutNGMixin(), GetParam());
-
-    const NGOffsetMapping* mapping =
-        NGInlineNode::GetOffsetMapping(layout_block_flow, &mapping_storage_);
-    DCHECK(mapping);
-    DCHECK_EQ(!mapping_storage_,
-              GetParam());  // |storage| is used only for legacy.
-
-    caret_navigator_ = mapping->GetCaretNavigator();
-    DCHECK(caret_navigator_);
-  }
-
-  UBiDiLevel BidiLevelAt(unsigned index) const {
-    return caret_navigator_->BidiLevelAt(index);
-  }
-
-  NGCaretNavigator::VisualCharacterMovementResult LeftCharacterOf(
-      unsigned index) const {
-    return caret_navigator_->LeftCharacterOf(index);
-  }
-
-  NGCaretNavigator::VisualCharacterMovementResult RightCharacterOf(
-      unsigned index) const {
-    return caret_navigator_->RightCharacterOf(index);
-  }
-
-  NGCaretNavigator::VisualCaretMovementResult LeftPositionOf(
-      unsigned offset,
-      TextAffinity affinity) const {
-    return caret_navigator_->LeftPositionOf({offset, affinity});
-  }
-
-  NGCaretNavigator::VisualCaretMovementResult RightPositionOf(
-      unsigned offset,
-      TextAffinity affinity) const {
-    return caret_navigator_->RightPositionOf({offset, affinity});
-  }
-
- protected:
-  std::unique_ptr<NGOffsetMapping> mapping_storage_;
-  const NGCaretNavigator* caret_navigator_;
-};
-
-INSTANTIATE_TEST_CASE_P(All, NGCaretNavigatorTest, testing::Bool());
-
-TEST_P(NGCaretNavigatorTest, BidiLevelAtBasic) {
-  SetupHtml("container",
-            "<div id=container>abc&#x05D0;&#x05D1;&#x05D2;123</div>");
-
-  EXPECT_EQ(0u, BidiLevelAt(0));
-  EXPECT_EQ(0u, BidiLevelAt(1));
-  EXPECT_EQ(0u, BidiLevelAt(2));
-  EXPECT_EQ(1u, BidiLevelAt(3));
-  EXPECT_EQ(1u, BidiLevelAt(4));
-  EXPECT_EQ(1u, BidiLevelAt(5));
-  EXPECT_EQ(2u, BidiLevelAt(6));
-  EXPECT_EQ(2u, BidiLevelAt(7));
-  EXPECT_EQ(2u, BidiLevelAt(8));
-}
-
-TEST_P(NGCaretNavigatorTest, LeftCharacterOfBasic) {
-  SetupHtml("container",
-            "<div id=container>abc&#x05D0;&#x05D1;&#x05D2;123</div>");
-
-  EXPECT_TRUE(LeftCharacterOf(0).IsBeforeContext());
-
-  EXPECT_TRUE(LeftCharacterOf(1).IsWithinContext());
-  EXPECT_EQ(0u, *LeftCharacterOf(1).index);
-
-  EXPECT_TRUE(LeftCharacterOf(2).IsWithinContext());
-  EXPECT_EQ(1u, *LeftCharacterOf(2).index);
-
-  EXPECT_TRUE(LeftCharacterOf(3).IsWithinContext());
-  EXPECT_EQ(4u, *LeftCharacterOf(3).index);
-
-  EXPECT_TRUE(LeftCharacterOf(4).IsWithinContext());
-  EXPECT_EQ(5u, *LeftCharacterOf(4).index);
-
-  EXPECT_TRUE(LeftCharacterOf(5).IsWithinContext());
-  EXPECT_EQ(8u, *LeftCharacterOf(5).index);
-
-  EXPECT_TRUE(LeftCharacterOf(6).IsWithinContext());
-  EXPECT_EQ(2u, *LeftCharacterOf(6).index);
-
-  EXPECT_TRUE(LeftCharacterOf(7).IsWithinContext());
-  EXPECT_EQ(6u, *LeftCharacterOf(7).index);
-
-  EXPECT_TRUE(LeftCharacterOf(8).IsWithinContext());
-  EXPECT_EQ(7u, *LeftCharacterOf(8).index);
-}
-
-TEST_P(NGCaretNavigatorTest, RightCharacterOfBasic) {
-  SetupHtml("container",
-            "<div id=container>abc&#x05D0;&#x05D1;&#x05D2;123</div>");
-
-  EXPECT_TRUE(RightCharacterOf(0).IsWithinContext());
-  EXPECT_EQ(1u, *RightCharacterOf(0).index);
-
-  EXPECT_TRUE(RightCharacterOf(1).IsWithinContext());
-  EXPECT_EQ(2u, *RightCharacterOf(1).index);
-
-  EXPECT_TRUE(RightCharacterOf(2).IsWithinContext());
-  EXPECT_EQ(6u, *RightCharacterOf(2).index);
-
-  EXPECT_TRUE(RightCharacterOf(3).IsAfterContext());
-
-  EXPECT_TRUE(RightCharacterOf(4).IsWithinContext());
-  EXPECT_EQ(3u, *RightCharacterOf(4).index);
-
-  EXPECT_TRUE(RightCharacterOf(5).IsWithinContext());
-  EXPECT_EQ(4u, *RightCharacterOf(5).index);
-
-  EXPECT_TRUE(RightCharacterOf(6).IsWithinContext());
-  EXPECT_EQ(7u, *RightCharacterOf(6).index);
-
-  EXPECT_TRUE(RightCharacterOf(7).IsWithinContext());
-  EXPECT_EQ(8u, *RightCharacterOf(7).index);
-
-  EXPECT_TRUE(RightCharacterOf(8).IsWithinContext());
-  EXPECT_EQ(5u, *RightCharacterOf(8).index);
-}
-
-TEST_P(NGCaretNavigatorTest, LeftPositionOfBasic) {
-  SetupHtml("container",
-            "<div id=container>abc&#x05D0;&#x05D1;&#x05D2;123</div>");
-
-  using Position = NGCaretNavigator::Position;
-
-  EXPECT_TRUE(LeftPositionOf(0u, TextAffinity::kDownstream).IsBeforeContext());
-
-  EXPECT_TRUE(LeftPositionOf(1u, TextAffinity::kUpstream).IsWithinContext());
-  EXPECT_EQ(Position({0u, TextAffinity::kDownstream}),
-            *LeftPositionOf(1u, TextAffinity::kUpstream).position);
-
-  EXPECT_TRUE(LeftPositionOf(1u, TextAffinity::kDownstream).IsWithinContext());
-  EXPECT_EQ(Position({0u, TextAffinity::kDownstream}),
-            *LeftPositionOf(1u, TextAffinity::kDownstream).position);
-
-  EXPECT_TRUE(LeftPositionOf(2u, TextAffinity::kUpstream).IsWithinContext());
-  EXPECT_EQ(Position({1u, TextAffinity::kDownstream}),
-            *LeftPositionOf(2u, TextAffinity::kUpstream).position);
-
-  EXPECT_TRUE(LeftPositionOf(2u, TextAffinity::kDownstream).IsWithinContext());
-  EXPECT_EQ(Position({1u, TextAffinity::kDownstream}),
-            *LeftPositionOf(2u, TextAffinity::kDownstream).position);
-
-  EXPECT_TRUE(LeftPositionOf(3u, TextAffinity::kUpstream).IsWithinContext());
-  EXPECT_EQ(Position({2u, TextAffinity::kDownstream}),
-            *LeftPositionOf(3u, TextAffinity::kUpstream).position);
-
-  EXPECT_TRUE(LeftPositionOf(3u, TextAffinity::kDownstream).IsWithinContext());
-  EXPECT_EQ(Position({4u, TextAffinity::kUpstream}),
-            *LeftPositionOf(3u, TextAffinity::kDownstream).position);
-
-  EXPECT_TRUE(LeftPositionOf(4u, TextAffinity::kUpstream).IsWithinContext());
-  EXPECT_EQ(Position({5u, TextAffinity::kUpstream}),
-            *LeftPositionOf(4u, TextAffinity::kUpstream).position);
-
-  EXPECT_TRUE(LeftPositionOf(4u, TextAffinity::kDownstream).IsWithinContext());
-  EXPECT_EQ(Position({5u, TextAffinity::kUpstream}),
-            *LeftPositionOf(4u, TextAffinity::kDownstream).position);
-
-  EXPECT_TRUE(LeftPositionOf(5u, TextAffinity::kUpstream).IsWithinContext());
-  EXPECT_EQ(Position({6u, TextAffinity::kUpstream}),
-            *LeftPositionOf(5u, TextAffinity::kUpstream).position);
-
-  EXPECT_TRUE(LeftPositionOf(5u, TextAffinity::kDownstream).IsWithinContext());
-  EXPECT_EQ(Position({6u, TextAffinity::kUpstream}),
-            *LeftPositionOf(5u, TextAffinity::kDownstream).position);
-
-  EXPECT_TRUE(LeftPositionOf(6u, TextAffinity::kUpstream).IsWithinContext());
-  EXPECT_EQ(Position({8u, TextAffinity::kDownstream}),
-            *LeftPositionOf(6u, TextAffinity::kUpstream).position);
-
-  EXPECT_TRUE(LeftPositionOf(6u, TextAffinity::kDownstream).IsWithinContext());
-  EXPECT_EQ(Position({2u, TextAffinity::kDownstream}),
-            *LeftPositionOf(6u, TextAffinity::kDownstream).position);
-
-  EXPECT_TRUE(LeftPositionOf(7u, TextAffinity::kUpstream).IsWithinContext());
-  EXPECT_EQ(Position({6u, TextAffinity::kDownstream}),
-            *LeftPositionOf(7u, TextAffinity::kUpstream).position);
-
-  EXPECT_TRUE(LeftPositionOf(7u, TextAffinity::kDownstream).IsWithinContext());
-  EXPECT_EQ(Position({6u, TextAffinity::kDownstream}),
-            *LeftPositionOf(7u, TextAffinity::kDownstream).position);
-
-  EXPECT_TRUE(LeftPositionOf(8u, TextAffinity::kUpstream).IsWithinContext());
-  EXPECT_EQ(Position({7u, TextAffinity::kDownstream}),
-            *LeftPositionOf(8u, TextAffinity::kUpstream).position);
-
-  EXPECT_TRUE(LeftPositionOf(8u, TextAffinity::kDownstream).IsWithinContext());
-  EXPECT_EQ(Position({7u, TextAffinity::kDownstream}),
-            *LeftPositionOf(8u, TextAffinity::kDownstream).position);
-
-  EXPECT_TRUE(LeftPositionOf(9u, TextAffinity::kUpstream).IsWithinContext());
-  EXPECT_EQ(Position({8u, TextAffinity::kDownstream}),
-            *LeftPositionOf(9u, TextAffinity::kUpstream).position);
-}
-
-TEST_P(NGCaretNavigatorTest, RightPositionOfBasic) {
-  SetupHtml("container",
-            "<div id=container>abc&#x05D0;&#x05D1;&#x05D2;123</div>");
-
-  using Position = NGCaretNavigator::Position;
-
-  EXPECT_TRUE(RightPositionOf(0u, TextAffinity::kDownstream).IsWithinContext());
-  EXPECT_EQ(Position({1u, TextAffinity::kUpstream}),
-            *RightPositionOf(0u, TextAffinity::kDownstream).position);
-
-  EXPECT_TRUE(RightPositionOf(1u, TextAffinity::kUpstream).IsWithinContext());
-  EXPECT_EQ(Position({2u, TextAffinity::kUpstream}),
-            *RightPositionOf(1u, TextAffinity::kUpstream).position);
-
-  EXPECT_TRUE(RightPositionOf(1u, TextAffinity::kDownstream).IsWithinContext());
-  EXPECT_EQ(Position({2u, TextAffinity::kUpstream}),
-            *RightPositionOf(1u, TextAffinity::kDownstream).position);
-
-  EXPECT_TRUE(RightPositionOf(2u, TextAffinity::kUpstream).IsWithinContext());
-  EXPECT_EQ(Position({3u, TextAffinity::kUpstream}),
-            *RightPositionOf(2u, TextAffinity::kUpstream).position);
-
-  EXPECT_TRUE(RightPositionOf(2u, TextAffinity::kDownstream).IsWithinContext());
-  EXPECT_EQ(Position({3u, TextAffinity::kUpstream}),
-            *RightPositionOf(2u, TextAffinity::kDownstream).position);
-
-  EXPECT_TRUE(RightPositionOf(3u, TextAffinity::kUpstream).IsWithinContext());
-  EXPECT_EQ(Position({7u, TextAffinity::kUpstream}),
-            *RightPositionOf(3u, TextAffinity::kUpstream).position);
-
-  EXPECT_TRUE(RightPositionOf(3u, TextAffinity::kDownstream).IsAfterContext());
-
-  EXPECT_TRUE(RightPositionOf(4u, TextAffinity::kUpstream).IsWithinContext());
-  EXPECT_EQ(Position({3u, TextAffinity::kDownstream}),
-            *RightPositionOf(4u, TextAffinity::kUpstream).position);
-
-  EXPECT_TRUE(RightPositionOf(4u, TextAffinity::kDownstream).IsWithinContext());
-  EXPECT_EQ(Position({3u, TextAffinity::kDownstream}),
-            *RightPositionOf(4u, TextAffinity::kDownstream).position);
-
-  EXPECT_TRUE(RightPositionOf(5u, TextAffinity::kUpstream).IsWithinContext());
-  EXPECT_EQ(Position({4u, TextAffinity::kDownstream}),
-            *RightPositionOf(5u, TextAffinity::kUpstream).position);
-
-  EXPECT_TRUE(RightPositionOf(5u, TextAffinity::kDownstream).IsWithinContext());
-  EXPECT_EQ(Position({4u, TextAffinity::kDownstream}),
-            *RightPositionOf(5u, TextAffinity::kDownstream).position);
-
-  EXPECT_TRUE(RightPositionOf(6u, TextAffinity::kUpstream).IsWithinContext());
-  EXPECT_EQ(Position({5u, TextAffinity::kDownstream}),
-            *RightPositionOf(6u, TextAffinity::kUpstream).position);
-
-  EXPECT_TRUE(RightPositionOf(6u, TextAffinity::kDownstream).IsWithinContext());
-  EXPECT_EQ(Position({7u, TextAffinity::kUpstream}),
-            *RightPositionOf(6u, TextAffinity::kDownstream).position);
-
-  EXPECT_TRUE(RightPositionOf(7u, TextAffinity::kUpstream).IsWithinContext());
-  EXPECT_EQ(Position({8u, TextAffinity::kUpstream}),
-            *RightPositionOf(7u, TextAffinity::kUpstream).position);
-
-  EXPECT_TRUE(RightPositionOf(7u, TextAffinity::kDownstream).IsWithinContext());
-  EXPECT_EQ(Position({8u, TextAffinity::kUpstream}),
-            *RightPositionOf(7u, TextAffinity::kDownstream).position);
-
-  EXPECT_TRUE(RightPositionOf(8u, TextAffinity::kUpstream).IsWithinContext());
-  EXPECT_EQ(Position({9u, TextAffinity::kUpstream}),
-            *RightPositionOf(8u, TextAffinity::kUpstream).position);
-
-  EXPECT_TRUE(RightPositionOf(8u, TextAffinity::kDownstream).IsWithinContext());
-  EXPECT_EQ(Position({9u, TextAffinity::kUpstream}),
-            *RightPositionOf(8u, TextAffinity::kDownstream).position);
-
-  EXPECT_TRUE(RightPositionOf(9u, TextAffinity::kUpstream).IsWithinContext());
-  EXPECT_EQ(Position({5u, TextAffinity::kDownstream}),
-            *RightPositionOf(9u, TextAffinity::kUpstream).position);
-}
-
-}  // namespace blink
diff --git a/third_party/blink/renderer/core/layout/ng/inline/ng_inline_node.cc b/third_party/blink/renderer/core/layout/ng/inline/ng_inline_node.cc
index 24d329b6..3705c5f1 100644
--- a/third_party/blink/renderer/core/layout/ng/inline/ng_inline_node.cc
+++ b/third_party/blink/renderer/core/layout/ng/inline/ng_inline_node.cc
@@ -14,7 +14,6 @@
 #include "third_party/blink/renderer/core/layout/logical_values.h"
 #include "third_party/blink/renderer/core/layout/ng/inline/layout_ng_text.h"
 #include "third_party/blink/renderer/core/layout/ng/inline/ng_bidi_paragraph.h"
-#include "third_party/blink/renderer/core/layout/ng/inline/ng_caret_navigator.h"
 #include "third_party/blink/renderer/core/layout/ng/inline/ng_inline_break_token.h"
 #include "third_party/blink/renderer/core/layout/ng/inline/ng_inline_item.h"
 #include "third_party/blink/renderer/core/layout/ng/inline/ng_inline_items_builder.h"
@@ -344,13 +343,6 @@
   }
 }
 
-template <typename OffsetMappingBuilder>
-bool MayBeBidiEnabled(
-    const String& text_content,
-    const NGInlineItemsBuilderTemplate<OffsetMappingBuilder>& builder) {
-  return !text_content.Is8Bit() || builder.HasBidiControls();
-}
-
 }  // namespace
 
 NGInlineNode::NGInlineNode(LayoutBlockFlow* block)
@@ -436,41 +428,19 @@
   CollectInlinesInternal(layout_block_flow, &builder, nullptr, nullptr,
                          update_layout);
 
-  // For non-NG object, we need the text, and also the inline items to resolve
-  // bidi levels. Otherwise |data| already has the text from the pre-layout
-  // phase, check they match.
-  if (data->text_content.IsNull()) {
-    DCHECK(!layout_block_flow->IsLayoutNGMixin());
+  // We need the text for non-NG object. Otherwise |data| already has the text
+  // from the pre-layout phase, check they match.
+  if (data->text_content.IsNull())
     data->text_content = builder.ToString();
-    if (RuntimeEnabledFeatures::BidiCaretAffinityEnabled()) {
-      // Set |is_bidi_enabled_| for all UTF-16 strings for now, because at this
-      // point the string may or may not contain RTL characters.
-      // |SegmentText()| will analyze the text and reset |is_bidi_enabled_| if
-      // it doesn't contain any RTL characters.
-      data->is_bidi_enabled_ = MayBeBidiEnabled(data->text_content, builder);
-      if (data->is_bidi_enabled_) {
-        // |builder| performs some validity checks with |items|, so we can't
-        // simply move them to |data|, but have to copy.
-        // TODO(xiaochengh): Change it into a move.
-        data->items = items;
-        SegmentBidiRunsInternal(data, layout_block_flow->StyleRef());
-      }
-    }
-  } else {
-    DCHECK(layout_block_flow->IsLayoutNGMixin());
+  else
     DCHECK_EQ(data->text_content, builder.ToString());
-  }
-
-  std::unique_ptr<NGCaretNavigator> caret_navigator;
-  if (RuntimeEnabledFeatures::BidiCaretAffinityEnabled())
-    caret_navigator = std::make_unique<NGCaretNavigator>(*data);
 
   // TODO(xiaochengh): This doesn't compute offset mapping correctly when
   // text-transform CSS property changes text length.
   NGOffsetMappingBuilder& mapping_builder = builder.GetOffsetMappingBuilder();
   mapping_builder.SetDestinationString(data->text_content);
-  data->offset_mapping = std::make_unique<NGOffsetMapping>(
-      mapping_builder.Build(std::move(caret_navigator)));
+  data->offset_mapping =
+      std::make_unique<NGOffsetMapping>(mapping_builder.Build());
   DCHECK(data->offset_mapping);
 }
 
@@ -530,7 +500,8 @@
   // point the string may or may not contain RTL characters.
   // |SegmentText()| will analyze the text and reset |is_bidi_enabled_| if it
   // doesn't contain any RTL characters.
-  data->is_bidi_enabled_ = MayBeBidiEnabled(data->text_content, builder);
+  data->is_bidi_enabled_ =
+      !data->text_content.Is8Bit() || builder.HasBidiControls();
   data->is_empty_inline_ = builder.IsEmptyInline();
 }
 
@@ -618,11 +589,9 @@
   }
 }
 
-// static
 // Segment bidi runs by resolving bidi embedding levels.
 // http://unicode.org/reports/tr9/#Resolving_Embedding_Levels
-void NGInlineNode::SegmentBidiRunsInternal(NGInlineNodeData* data,
-                                           const ComputedStyle& style) {
+void NGInlineNode::SegmentBidiRuns(NGInlineNodeData* data) {
   if (!data->is_bidi_enabled_) {
     data->SetBaseDirection(TextDirection::kLtr);
     return;
@@ -630,7 +599,7 @@
 
   NGBidiParagraph bidi;
   data->text_content.Ensure16Bit();
-  if (!bidi.SetParagraph(data->text_content, style)) {
+  if (!bidi.SetParagraph(data->text_content, Style())) {
     // On failure, give up bidi resolving and reordering.
     data->is_bidi_enabled_ = false;
     data->SetBaseDirection(TextDirection::kLtr);
@@ -665,10 +634,6 @@
 #endif
 }
 
-void NGInlineNode::SegmentBidiRuns(NGInlineNodeData* data) {
-  SegmentBidiRunsInternal(data, Style());
-}
-
 void NGInlineNode::ShapeText(NGInlineItemsData* data,
                              NGInlineItemsData* previous_data) {
   const String& text_content = data->text_content;
diff --git a/third_party/blink/renderer/core/layout/ng/inline/ng_inline_node.h b/third_party/blink/renderer/core/layout/ng/inline/ng_inline_node.h
index 0007417..56670dc 100644
--- a/third_party/blink/renderer/core/layout/ng/inline/ng_inline_node.h
+++ b/third_party/blink/renderer/core/layout/ng/inline/ng_inline_node.h
@@ -142,11 +142,6 @@
   static void ComputeOffsetMapping(LayoutBlockFlow* layout_block_flow,
                                    NGInlineNodeData* data);
 
-  // This function shares bidi segmentation code between inline layout algorithm
-  // and |NGCaretNavigator| building, which may run on legacy layout.
-  // TODO(layout-dev): Merge with |SegmentBidiRuns| when we remove legacy layout
-  static void SegmentBidiRunsInternal(NGInlineNodeData*, const ComputedStyle&);
-
   friend class NGLineBreakerTest;
   friend class NGInlineNodeLegacy;
 };
diff --git a/third_party/blink/renderer/core/layout/ng/inline/ng_inline_node_data.h b/third_party/blink/renderer/core/layout/ng/inline/ng_inline_node_data.h
index 2037022..dbf328bc 100644
--- a/third_party/blink/renderer/core/layout/ng/inline/ng_inline_node_data.h
+++ b/third_party/blink/renderer/core/layout/ng/inline/ng_inline_node_data.h
@@ -13,18 +13,15 @@
 
 // Data which is required for inline nodes.
 struct CORE_EXPORT NGInlineNodeData : NGInlineItemsData {
- public:
-  bool IsBidiEnabled() const { return is_bidi_enabled_; }
-  TextDirection BaseDirection() const {
-    return static_cast<TextDirection>(base_direction_);
-  }
-
  private:
   const NGInlineItemsData& ItemsData(bool is_first_line) const {
     return !is_first_line || !first_line_items_
                ? (const NGInlineItemsData&)*this
                : *first_line_items_;
   }
+  TextDirection BaseDirection() const {
+    return static_cast<TextDirection>(base_direction_);
+  }
   void SetBaseDirection(TextDirection direction) {
     base_direction_ = static_cast<unsigned>(direction);
   }
diff --git a/third_party/blink/renderer/core/layout/ng/inline/ng_offset_mapping.cc b/third_party/blink/renderer/core/layout/ng/inline/ng_offset_mapping.cc
index ded3d140..9b738bb 100644
--- a/third_party/blink/renderer/core/layout/ng/inline/ng_offset_mapping.cc
+++ b/third_party/blink/renderer/core/layout/ng/inline/ng_offset_mapping.cc
@@ -6,11 +6,9 @@
 
 #include "third_party/blink/renderer/core/dom/node.h"
 #include "third_party/blink/renderer/core/dom/text.h"
-#include "third_party/blink/renderer/core/editing/editing_utilities.h"
 #include "third_party/blink/renderer/core/editing/ephemeral_range.h"
 #include "third_party/blink/renderer/core/editing/position.h"
 #include "third_party/blink/renderer/core/layout/layout_text_fragment.h"
-#include "third_party/blink/renderer/core/layout/ng/inline/ng_caret_navigator.h"
 #include "third_party/blink/renderer/core/layout/ng/inline/ng_inline_node.h"
 #include "third_party/blink/renderer/core/layout/ng/ng_block_node.h"
 #include "third_party/blink/renderer/platform/text/character.h"
@@ -64,24 +62,12 @@
 LayoutBlockFlow* NGInlineFormattingContextOf(const Position& position) {
   if (!RuntimeEnabledFeatures::LayoutNGEnabled())
     return nullptr;
-  LayoutBlockFlow* block_flow =
-      NGOffsetMapping::GetInlineFormattingContextOf(position);
-  if (!block_flow || !block_flow->IsLayoutNGMixin())
-    return nullptr;
-  return block_flow;
-}
-
-// static
-LayoutBlockFlow* NGOffsetMapping::GetInlineFormattingContextOf(
-    const Position& position) {
-  if (!AcceptsPosition(position))
+  if (!NGOffsetMapping::AcceptsPosition(position))
     return nullptr;
   const auto node_offset_pair = ToNodeOffsetPair(position);
   const LayoutObject* layout_object =
       AssociatedLayoutObjectOf(node_offset_pair.first, node_offset_pair.second);
-  if (!layout_object)
-    return nullptr;
-  return GetInlineFormattingContextOf(*layout_object);
+  return layout_object->ContainingNGBlockFlow();
 }
 
 NGOffsetMappingUnit::NGOffsetMappingUnit(NGOffsetMappingUnitType type,
@@ -220,18 +206,12 @@
 NGOffsetMapping::NGOffsetMapping(NGOffsetMapping&& other)
     : NGOffsetMapping(std::move(other.units_),
                       std::move(other.ranges_),
-                      other.text_,
-                      std::move(other.caret_navigator_)) {}
+                      other.text_) {}
 
-NGOffsetMapping::NGOffsetMapping(
-    UnitVector&& units,
-    RangeMap&& ranges,
-    String text,
-    std::unique_ptr<NGCaretNavigator> caret_navigator)
-    : units_(std::move(units)),
-      ranges_(std::move(ranges)),
-      text_(text),
-      caret_navigator_(std::move(caret_navigator)) {}
+NGOffsetMapping::NGOffsetMapping(UnitVector&& units,
+                                 RangeMap&& ranges,
+                                 String text)
+    : units_(std::move(units)), ranges_(std::move(ranges)), text_(text) {}
 
 NGOffsetMapping::~NGOffsetMapping() = default;
 
diff --git a/third_party/blink/renderer/core/layout/ng/inline/ng_offset_mapping.h b/third_party/blink/renderer/core/layout/ng/inline/ng_offset_mapping.h
index 5ac360f..9fafd52 100644
--- a/third_party/blink/renderer/core/layout/ng/inline/ng_offset_mapping.h
+++ b/third_party/blink/renderer/core/layout/ng/inline/ng_offset_mapping.h
@@ -20,7 +20,6 @@
 
 class LayoutBlockFlow;
 class LayoutObject;
-class NGCaretNavigator;
 
 enum class NGOffsetMappingUnitType { kIdentity, kCollapsed, kExpanded };
 
@@ -106,10 +105,7 @@
       HashMap<Persistent<const Node>, std::pair<unsigned, unsigned>>;
 
   NGOffsetMapping(NGOffsetMapping&&);
-  NGOffsetMapping(UnitVector&&,
-                  RangeMap&&,
-                  String,
-                  std::unique_ptr<NGCaretNavigator>);
+  NGOffsetMapping(UnitVector&&, RangeMap&&, String);
   ~NGOffsetMapping();
 
   const UnitVector& GetUnits() const { return units_; }
@@ -143,9 +139,6 @@
   // NG layout, while NGOffsetMapping is supported on both of them.
   static LayoutBlockFlow* GetInlineFormattingContextOf(const LayoutObject&);
 
-  // Variants taking position instead of |LayoutObject|.
-  static LayoutBlockFlow* GetInlineFormattingContextOf(const Position&);
-
   // ------ Mapping APIs from DOM to text content ------
 
   // Returns the NGOffsetMappingUnit whose DOM range contains the position.
@@ -214,10 +207,6 @@
   // control charcters. Returns true otherwise.
   bool HasBidiControlCharactersOnly(unsigned start, unsigned end) const;
 
-  const NGCaretNavigator* GetCaretNavigator() const {
-    return caret_navigator_.get();
-  }
-
  private:
   // The NGOffsetMappingUnits of the inline formatting context in osrted order.
   UnitVector units_;
@@ -229,9 +218,6 @@
   // |NGInlineNodeData::text_content_|.
   String text_;
 
-  // Helper class for caret nagivation on |text_|.
-  std::unique_ptr<NGCaretNavigator> caret_navigator_;
-
   DISALLOW_COPY_AND_ASSIGN(NGOffsetMapping);
 };
 
diff --git a/third_party/blink/renderer/core/layout/ng/inline/ng_offset_mapping_builder.cc b/third_party/blink/renderer/core/layout/ng/inline/ng_offset_mapping_builder.cc
index 5fa4b9b3..f80da9ad 100644
--- a/third_party/blink/renderer/core/layout/ng/inline/ng_offset_mapping_builder.cc
+++ b/third_party/blink/renderer/core/layout/ng/inline/ng_offset_mapping_builder.cc
@@ -6,7 +6,6 @@
 
 #include "third_party/blink/renderer/core/layout/layout_text.h"
 #include "third_party/blink/renderer/core/layout/layout_text_fragment.h"
-#include "third_party/blink/renderer/core/layout/ng/inline/ng_caret_navigator.h"
 #include "third_party/blink/renderer/core/layout/ng/inline/ng_offset_mapping.h"
 
 namespace blink {
@@ -199,8 +198,7 @@
   destination_string_ = string;
 }
 
-NGOffsetMapping NGOffsetMappingBuilder::Build(
-    std::unique_ptr<NGCaretNavigator> caret_navigator) {
+NGOffsetMapping NGOffsetMappingBuilder::Build() {
   // All mapping units are already built. Scan them to build mapping ranges.
   for (unsigned range_start = 0; range_start < mapping_units_.size();) {
     const Node* node = &mapping_units_[range_start].GetOwner();
@@ -216,7 +214,7 @@
   }
 
   return NGOffsetMapping(std::move(mapping_units_), std::move(unit_ranges_),
-                         destination_string_, std::move(caret_navigator));
+                         destination_string_);
 }
 
 void NGOffsetMappingBuilder::EnterInline(const LayoutObject& layout_object) {
diff --git a/third_party/blink/renderer/core/layout/ng/inline/ng_offset_mapping_builder.h b/third_party/blink/renderer/core/layout/ng/inline/ng_offset_mapping_builder.h
index 545ef36..c24971a 100644
--- a/third_party/blink/renderer/core/layout/ng/inline/ng_offset_mapping_builder.h
+++ b/third_party/blink/renderer/core/layout/ng/inline/ng_offset_mapping_builder.h
@@ -15,7 +15,6 @@
 namespace blink {
 
 class LayoutObject;
-class NGCaretNavigator;
 
 // This is the helper class for constructing the DOM-to-TextContent offset
 // mapping. It holds an offset mapping, and provides APIs to modify the mapping
@@ -120,9 +119,7 @@
 
   // Finalize and return the offset mapping.
   // This method can only be called once, as it can invalidate the stored data.
-  // Also moves the passed-in |NGCaretNavigator| into the result
-  // |NGOffsetMapping|.
-  NGOffsetMapping Build(std::unique_ptr<NGCaretNavigator>);
+  NGOffsetMapping Build();
 
  private:
   // Helper function for CollapseTrailingSpace() to maintain unit ranges.
diff --git a/third_party/blink/web_tests/TestExpectations b/third_party/blink/web_tests/TestExpectations
index 8961497..63fedc23 100644
--- a/third_party/blink/web_tests/TestExpectations
+++ b/third_party/blink/web_tests/TestExpectations
@@ -1771,32 +1771,50 @@
 crbug.com/900060 virtual/bidi-caret-affinity/editing/selection/mixed-editability-8.html [ Failure ]
 crbug.com/751952 [ Mac ] virtual/bidi-caret-affinity/editing/selection/modify_extend/extend_by_character.html [ Failure Pass ]
 crbug.com/751952 [ Win ] virtual/bidi-caret-affinity/editing/selection/modify_extend/extend_by_character.html [ Failure Pass ]
+crbug.com/636424 virtual/bidi-caret-affinity/editing/selection/modify_move/move-by-word-visually-crash-test-5.html [ Pass Timeout ]
 crbug.com/851812 virtual/bidi-caret-affinity/editing/selection/paint-hyphen.html [ Failure ]
 crbug.com/725470 virtual/bidi-caret-affinity/editing/shadow/doubleclick-on-meter-in-shadow-crash.html [ Crash Failure ]
 
 ### True failures start from here
 
-### virtual/bidi-caret-affinity/editing/deleting/
-### Needs to implement: left and right movement crossing inline-block boundaries
-crbug.com/894651 virtual/bidi-caret-affinity/editing/deleting/delete-inserts-br-after-button.html [ Failure ]
-
 ### virtual/bidi-caret-affinity/editing/selection/
-crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/css-pseudo-element-hang.html [ Crash ]
-crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/css-pseudo-element.html [ Failure Crash ]
-crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/move-bidi-isolate.html [ Crash ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/css-pseudo-element.html [ Failure ]
 crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/select-bidi-run.html [ Failure ]
 
 ### virtual/bidi-caret-affinity/editing/selection/modify_move/
-crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move-by-word-visually-crash-test-3.html [ Crash ]
-crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move-by-word-visually-crash-test-5.html [ Pass Timeout Crash ]
-crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move-by-word-visually-inline-block-positioned-element.html [ Failure ]
 crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move-by-word-visually-mac.html [ Timeout ]
 crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move-by-word-visually-multi-space.html [ Timeout ]
 crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move-by-word-visually-single-space-inline-element.html [ Timeout ]
 crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move-by-word-visually-single-space-one-element.html [ Timeout ]
-crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move-by-word-visually-wrong-left-right.html [ Failure Crash ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move-by-word-visually-wrong-left-right.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_01_rtl.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_02_ltr.html [ Failure ]
 crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_03_rtl.html [ Failure ]
 crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_04_ltr.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_05_ltr.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_05_rtl.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_06_ltr.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_06_rtl.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_07_ltr.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_07_rtl.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_08_ltr.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_08_rtl.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_09_ltr.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_09_rtl.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_10_ltr.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_10_rtl.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_11_ltr.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_11_rtl.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_12_ltr.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_12_rtl.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_13_ltr.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_13_rtl.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_14_ltr.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_14_rtl.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_15_ltr.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_15_rtl.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_16_ltr.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_16_rtl.html [ Failure ]
 crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_17_ltr.html [ Failure ]
 crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_17_rtl.html [ Failure ]
 crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_18_ltr.html [ Failure ]
@@ -1809,30 +1827,78 @@
 crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_21_rtl.html [ Failure ]
 crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_22_ltr.html [ Failure ]
 crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_22_rtl.html [ Failure ]
-crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_23_ltr.html [ Failure ]
 crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_23_rtl.html [ Failure ]
 crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_24_ltr.html [ Failure ]
-crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_24_rtl.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_25_ltr.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_25_rtl.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_26_ltr.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_26_rtl.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_27_rtl.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_28_ltr.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_29_ltr.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_29_rtl.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_30_ltr.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_30_rtl.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_31_ltr.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_31_rtl.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_32_ltr.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_32_rtl.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_33_ltr.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_33_rtl.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_34_ltr.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_34_rtl.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_35_ltr.html [ Crash Timeout ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_35_rtl.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_36_ltr.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_36_rtl.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_37_ltr.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_37_rtl.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_38_ltr.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_38_rtl.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_39_ltr.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_39_rtl.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_40_ltr.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_40_rtl.html [ Failure ]
 crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_41_rtl.html [ Failure ]
 crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_42_ltr.html [ Failure ]
-crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_right_character_in_mixed_bidi.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_43_ltr.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_character_43_rtl.html [ Failure ]
 crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_word_01_rtl_multi_line.html [ Failure ]
-crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_word_02_ltr_multi_line.html [ Failure ]
-crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_word_02_rtl_multi_line.html [ Failure Crash ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_word_02_rtl_multi_line.html [ Failure ]
 crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_word_03_ltr_multi_line.html [ Failure ]
 crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_word_04_ltr_multi_line.html [ Failure ]
-crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_word_04_rtl_multi_line.html [ Crash ]
-crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_word_05_ltr_multi_line.html [ Timeout Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_word_05_ltr_multi_line.html [ Timeout ]
 crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_word_05_rtl_multi_line.html [ Failure ]
-crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_word_06_ltr_multi_line.html [ Timeout Failure ]
-crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_word_06_rtl_multi_line.html [ Failure Crash ]
-crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_word_07_ltr_multi_line.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_word_06_ltr_multi_line.html [ Timeout ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_word_06_rtl_multi_line.html [ Failure ]
 crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_word_07_rtl_multi_line.html [ Failure ]
 crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_word_08_rtl_multi_line.html [ Failure ]
-crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_word_09_ltr_multi_line.html [ Failure ]
 crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_left_word_09_rtl_multi_line.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_01_rtl.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_02_ltr.html [ Failure ]
 crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_03_rtl.html [ Failure ]
 crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_04_ltr.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_05_ltr.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_05_rtl.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_06_ltr.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_06_rtl.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_07_ltr.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_07_rtl.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_08_ltr.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_08_rtl.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_09_ltr.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_09_rtl.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_10_ltr.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_10_rtl.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_11_ltr.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_11_rtl.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_12_ltr.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_12_rtl.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_13_ltr.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_15_ltr.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_15_rtl.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_16_ltr.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_16_rtl.html [ Failure ]
 crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_17_ltr.html [ Failure ]
 crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_17_rtl.html [ Failure ]
 crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_18_ltr.html [ Failure ]
@@ -1845,26 +1911,52 @@
 crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_21_rtl.html [ Failure ]
 crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_22_ltr.html [ Failure ]
 crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_22_rtl.html [ Failure ]
-crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_23_ltr.html [ Failure ]
 crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_23_rtl.html [ Failure ]
 crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_24_ltr.html [ Failure ]
-crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_24_rtl.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_25_ltr.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_25_rtl.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_26_ltr.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_26_rtl.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_27_rtl.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_28_ltr.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_29_ltr.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_29_rtl.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_30_ltr.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_30_rtl.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_31_ltr.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_31_rtl.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_32_ltr.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_32_rtl.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_33_ltr.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_33_rtl.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_34_ltr.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_34_rtl.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_35_ltr.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_35_rtl.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_36_ltr.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_36_rtl.html [ Crash Timeout ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_37_ltr.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_37_rtl.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_38_ltr.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_38_rtl.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_39_ltr.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_39_rtl.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_40_ltr.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_40_rtl.html [ Failure ]
 crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_41_rtl.html [ Failure ]
 crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_42_ltr.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_43_ltr.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_character_43_rtl.html [ Failure ]
 crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_word_01_rtl_multi_line.html [ Failure ]
-crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_word_02_ltr_multi_line.html [ Crash ]
 crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_word_02_rtl_multi_line.html [ Failure ]
 crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_word_03_ltr_multi_line.html [ Failure ]
-crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_word_04_ltr_multi_line.html [ Failure Crash ]
-crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_word_04_rtl_multi_line.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_word_04_ltr_multi_line.html [ Failure ]
 crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_word_05_ltr_multi_line.html [ Failure Timeout ]
-crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_word_05_rtl_multi_line.html [ Timeout Failure ]
-crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_word_06_ltr_multi_line.html [ Failure Crash ]
-crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_word_06_rtl_multi_line.html [ Timeout Failure ]
-crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_word_07_ltr_multi_line.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_word_05_rtl_multi_line.html [ Timeout ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_word_06_ltr_multi_line.html [ Failure ]
+crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_word_06_rtl_multi_line.html [ Timeout ]
 crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_word_07_rtl_multi_line.html [ Failure ]
 crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_word_08_rtl_multi_line.html [ Failure ]
-crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_word_09_ltr_multi_line.html [ Failure ]
 crbug.com/894651 virtual/bidi-caret-affinity/editing/selection/modify_move/move_right_word_09_rtl_multi_line.html [ Failure ]
 
 # ====== Bidi caret affinity failures until here ======
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_01_rtl.html b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_01_rtl.html
index 14c3d82..374f74a0 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_01_rtl.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_01_rtl.html
@@ -3,22 +3,16 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="rtl">|abc</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">|abc</div>'
-      : '<div contenteditable dir="rtl">ab|c</div>',
+  '<div contenteditable dir="rtl">ab|c</div>',
   '1-0 rtl left character');
 
 selection_test(
   '<div contenteditable dir="rtl">a|bc</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">|abc</div>'
-      : '<div contenteditable dir="rtl">abc|</div>',
+  '<div contenteditable dir="rtl">abc|</div>',
   '1-1 rtl left character');
 
 selection_test(
@@ -30,8 +24,6 @@
 selection_test(
   '<div contenteditable dir="rtl">abc|</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">ab|c</div>'
-      : '<div contenteditable dir="rtl">abc|</div>',
+  '<div contenteditable dir="rtl">abc|</div>',
   '1-3 rtl left character');
 </script>
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_02_ltr.html b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_02_ltr.html
index 4962440..2680a3a 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_02_ltr.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_02_ltr.html
@@ -3,14 +3,10 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05D0|\u05D1\u05D2</div>'
-      : '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2</div>',
+  '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2</div>',
   '2-0 ltr left character');
 
 selection_test(
@@ -22,16 +18,12 @@
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1|\u05D2</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2|</div>'
-      : '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2</div>',
+  '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2</div>',
   '2-2 ltr left character');
 
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2|</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2|</div>'
-      : '<div contenteditable dir="ltr">\u05D0|\u05D1\u05D2</div>',
+  '<div contenteditable dir="ltr">\u05D0|\u05D1\u05D2</div>',
   '2-3 ltr left character');
 </script>
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_05_ltr.html b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_05_ltr.html
index 9cb88d3..97142d7 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_05_ltr.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_05_ltr.html
@@ -3,8 +3,6 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="ltr">|abc\u05D0\u05D1\u05D2def</div>',
   selection => selection.modify('move', 'left', 'character'),
@@ -26,9 +24,7 @@
 selection_test(
   '<div contenteditable dir="ltr">abc|\u05D0\u05D1\u05D2def</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">abc\u05D0|\u05D1\u05D2def</div>'
-      : '<div contenteditable dir="ltr">ab|c\u05D0\u05D1\u05D2def</div>',
+  '<div contenteditable dir="ltr">ab|c\u05D0\u05D1\u05D2def</div>',
   '5-3 ltr left character');
 
 selection_test(
@@ -40,9 +36,7 @@
 selection_test(
   '<div contenteditable dir="ltr">abc\u05D0\u05D1|\u05D2def</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">abc\u05D0\u05D1\u05D2|def</div>'
-      : '<div contenteditable dir="ltr">abc|\u05D0\u05D1\u05D2def</div>',
+  '<div contenteditable dir="ltr">abc|\u05D0\u05D1\u05D2def</div>',
   '5-5 ltr left character');
 
 selection_test(
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_05_rtl.html b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_05_rtl.html
index bda3a65..8241df3 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_05_rtl.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_05_rtl.html
@@ -3,22 +3,16 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="rtl">|abc\u05D0\u05D1\u05D2def</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc\u05D0|\u05D1\u05D2def</div>'
-      : '<div contenteditable dir="rtl">ab|c\u05D0\u05D1\u05D2def</div>',
+  '<div contenteditable dir="rtl">ab|c\u05D0\u05D1\u05D2def</div>',
   '5-0 rtl left character');
 
 selection_test(
   '<div contenteditable dir="rtl">a|bc\u05D0\u05D1\u05D2def</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">|abc\u05D0\u05D1\u05D2def</div>'
-      : '<div contenteditable dir="rtl">abc|\u05D0\u05D1\u05D2def</div>',
+  '<div contenteditable dir="rtl">abc|\u05D0\u05D1\u05D2def</div>',
   '5-1 rtl left character');
 
 selection_test(
@@ -48,17 +42,13 @@
 selection_test(
   '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2|def</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2|def</div>'
-      : '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2de|f</div>',
+  '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2de|f</div>',
   '5-6 rtl left character');
 
 selection_test(
   '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2d|ef</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2|def</div>'
-      : '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2def|</div>',
+  '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2def|</div>',
   '5-7 rtl left character');
 
 selection_test(
@@ -70,8 +60,6 @@
 selection_test(
   '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2def|</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2de|f</div>'
-      : '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2def|</div>',
+  '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2def|</div>',
   '5-9 rtl left character');
 </script>
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_06_ltr.html b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_06_ltr.html
index 6e52a74..34fee1a 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_06_ltr.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_06_ltr.html
@@ -3,14 +3,10 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2abc\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0|\u05d1\u05d2abc\u05d3\u05d4\u05d5</div>'
-      : '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2abc\u05D3\u05D4\u05D5</div>',
+  '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2abc\u05D3\u05D4\u05D5</div>',
   '6-0 ltr left character');
 
 selection_test(
@@ -22,9 +18,7 @@
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1|\u05D2abc\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1\u05d2|abc\u05d3\u05d4\u05d5</div>'
-      : '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2abc\u05D3\u05D4\u05D5</div>',
+  '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2abc\u05D3\u05D4\u05D5</div>',
   '6-2 ltr left character');
 
 selection_test(
@@ -48,9 +42,7 @@
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2abc|\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1\u05d2abc\u05d3|\u05d4\u05d5</div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2ab|c\u05D3\u05D4\u05D5</div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2ab|c\u05D3\u05D4\u05D5</div>',
   '6-6 ltr left character');
 
 selection_test(
@@ -62,16 +54,12 @@
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2abc\u05D3\u05D4|\u05D5</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1\u05d2abc\u05d3\u05d4\u05d5|</div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2abc|\u05D3\u05D4\u05D5</div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2abc|\u05D3\u05D4\u05D5</div>',
   '6-8 ltr left character');
 
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2abc\u05D3\u05D4\u05D5|</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1\u05d2ab|c\u05d3\u05d4\u05d5</div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2abc\u05D3|\u05D4\u05D5</div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2abc\u05D3|\u05D4\u05D5</div>',
   '6-9 ltr left character');
 </script>
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_06_rtl.html b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_06_rtl.html
index e600d40..6b25934 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_06_rtl.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_06_rtl.html
@@ -3,8 +3,6 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="rtl">|\u05D0\u05D1\u05D2abc\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'left', 'character'),
@@ -26,17 +24,13 @@
 selection_test(
   '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2|abc\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u05d0\u05d1\u05d2abc\u05d3|\u05d4\u05d5</div>'
-      : '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2ab|c\u05D3\u05D4\u05D5</div>',
+  '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2ab|c\u05D3\u05D4\u05D5</div>',
   '6-3 rtl left character');
 
 selection_test(
   '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2a|bc\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u05d0\u05d1\u05d2|abc\u05d3\u05d4\u05d5</div>'
-      : '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2abc|\u05D3\u05D4\u05D5</div>',
+  '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2abc|\u05D3\u05D4\u05D5</div>',
   '6-4 rtl left character');
 
 selection_test(
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_07_ltr.html b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_07_ltr.html
index 00df74b..fd91d830 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_07_ltr.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_07_ltr.html
@@ -3,8 +3,6 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="ltr">|abc\u05D0\u05D1\u05D2\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'left', 'character'),
@@ -26,9 +24,7 @@
 selection_test(
   '<div contenteditable dir="ltr">abc|\u05D0\u05D1\u05D2\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">abc\u05d0|\u05d1\u05d2\u05d3\u05d4\u05d5</div>'
-      : '<div contenteditable dir="ltr">ab|c\u05D0\u05D1\u05D2\u05D3\u05D4\u05D5</div>',
+  '<div contenteditable dir="ltr">ab|c\u05D0\u05D1\u05D2\u05D3\u05D4\u05D5</div>',
   '7-3 ltr left character');
 
 selection_test(
@@ -58,16 +54,12 @@
 selection_test(
   '<div contenteditable dir="ltr">abc\u05D0\u05D1\u05D2\u05D3\u05D4|\u05D5</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">abc\u05d0\u05d1\u05d2\u05d3\u05d4\u05d5|</div>'
-      : '<div contenteditable dir="ltr">abc|\u05D0\u05D1\u05D2\u05D3\u05D4\u05D5</div>',
+  '<div contenteditable dir="ltr">abc|\u05D0\u05D1\u05D2\u05D3\u05D4\u05D5</div>',
   '7-8 ltr left character');
 
 selection_test(
   '<div contenteditable dir="ltr">abc\u05D0\u05D1\u05D2\u05D3\u05D4\u05D5|</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">ab|c\u05d0\u05d1\u05d2\u05d3\u05d4\u05d5</div>'
-      : '<div contenteditable dir="ltr">abc\u05D0|\u05D1\u05D2\u05D3\u05D4\u05D5</div>',
+  '<div contenteditable dir="ltr">abc\u05D0|\u05D1\u05D2\u05D3\u05D4\u05D5</div>',
   '7-9 ltr left character');
 </script>
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_07_rtl.html b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_07_rtl.html
index 2eec1a9..26cfd71 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_07_rtl.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_07_rtl.html
@@ -3,22 +3,16 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="rtl">|abc\u05D0\u05D1\u05D2\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc\u05d0|\u05d1\u05d2\u05d3\u05d4\u05d5</div>'
-      : '<div contenteditable dir="rtl">ab|c\u05D0\u05D1\u05D2\u05D3\u05D4\u05D5</div>',
+  '<div contenteditable dir="rtl">ab|c\u05D0\u05D1\u05D2\u05D3\u05D4\u05D5</div>',
   '7-0 rtl left character');
 
 selection_test(
   '<div contenteditable dir="rtl">a|bc\u05D0\u05D1\u05D2\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">|abc\u05d0\u05d1\u05d2\u05d3\u05d4\u05d5</div>'
-      : '<div contenteditable dir="rtl">abc|\u05D0\u05D1\u05D2\u05D3\u05D4\u05D5</div>',
+  '<div contenteditable dir="rtl">abc|\u05D0\u05D1\u05D2\u05D3\u05D4\u05D5</div>',
   '7-1 rtl left character');
 
 selection_test(
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_08_ltr.html b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_08_ltr.html
index 709e703..2e49453 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_08_ltr.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_08_ltr.html
@@ -3,14 +3,10 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2abcdef</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0|\u05d1\u05d2abcdef</div>'
-      : '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2abcdef</div>',
+  '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2abcdef</div>',
   '8-0 ltr left character');
 
 selection_test(
@@ -22,9 +18,7 @@
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1|\u05D2abcdef</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1\u05d2|abcdef</div>'
-      : '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2abcdef</div>',
+  '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2abcdef</div>',
   '8-2 ltr left character');
 
 selection_test(
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_08_rtl.html b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_08_rtl.html
index c82390f..f51e9f0 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_08_rtl.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_08_rtl.html
@@ -3,8 +3,6 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="rtl">|\u05D0\u05D1\u05D2abcdef</div>',
   selection => selection.modify('move', 'left', 'character'),
@@ -26,17 +24,13 @@
 selection_test(
   '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2|abcdef</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u05d0\u05d1\u05d2|abcdef</div>'
-      : '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2abcde|f</div>',
+  '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2abcde|f</div>',
   '8-3 rtl left character');
 
 selection_test(
   '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2a|bcdef</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u05d0\u05d1\u05d2|abcdef</div>'
-      : '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2abcdef|</div>',
+  '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2abcdef|</div>',
   '8-4 rtl left character');
 
 selection_test(
@@ -66,8 +60,6 @@
 selection_test(
   '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2abcdef|</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u05d0\u05d1\u05d2abcde|f</div>'
-      : '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2abcdef|</div>',
+  '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2abcdef|</div>',
   '8-9 rtl left character');
 </script>
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_09_ltr.html b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_09_ltr.html
index 32063491..4efdf52 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_09_ltr.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_09_ltr.html
@@ -3,22 +3,16 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="ltr">|\u0661\u0662\u0663\u0627\u0628\u0629</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u0661\u0662\u0663\u0627|\u0628\u0629</div>'
-      : '<div contenteditable dir="ltr">|\u0661\u0662\u0663\u0627\u0628\u0629</div>',
+  '<div contenteditable dir="ltr">|\u0661\u0662\u0663\u0627\u0628\u0629</div>',
   '9-0 ltr left character');
 
 selection_test(
   '<div contenteditable dir="ltr">\u0661|\u0662\u0663\u0627\u0628\u0629</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">|\u0661\u0662\u0663\u0627\u0628\u0629</div>'
-      : '<div contenteditable dir="ltr">\u0661\u0662\u0663\u0627|\u0628\u0629</div>',
+  '<div contenteditable dir="ltr">\u0661\u0662\u0663\u0627|\u0628\u0629</div>',
   '9-1 ltr left character');
 
 selection_test(
@@ -30,9 +24,7 @@
 selection_test(
   '<div contenteditable dir="ltr">\u0661\u0662\u0663|\u0627\u0628\u0629</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u0661\u0662\u0663\u0627|\u0628\u0629</div>'
-      : '<div contenteditable dir="ltr">\u0661\u0662|\u0663\u0627\u0628\u0629</div>',
+  '<div contenteditable dir="ltr">\u0661\u0662|\u0663\u0627\u0628\u0629</div>',
   '9-3 ltr left character');
 
 selection_test(
@@ -44,16 +36,12 @@
 selection_test(
   '<div contenteditable dir="ltr">\u0661\u0662\u0663\u0627\u0628|\u0629</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u0661\u0662\u0663\u0627\u0628\u0629|</div>'
-      : '<div contenteditable dir="ltr">|\u0661\u0662\u0663\u0627\u0628\u0629</div>',
+  '<div contenteditable dir="ltr">|\u0661\u0662\u0663\u0627\u0628\u0629</div>',
   '9-5 ltr left character');
 
 selection_test(
   '<div contenteditable dir="ltr">\u0661\u0662\u0663\u0627\u0628\u0629|</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u0661\u0662\u0663\u0627\u0628\u0629|</div>'
-      : '<div contenteditable dir="ltr">\u0661\u0662|\u0663\u0627\u0628\u0629</div>',
+  '<div contenteditable dir="ltr">\u0661\u0662|\u0663\u0627\u0628\u0629</div>',
   '9-6 ltr left character');
 </script>
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_09_rtl.html b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_09_rtl.html
index 9fa78ac1..7929963 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_09_rtl.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_09_rtl.html
@@ -3,22 +3,16 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="rtl">|\u0661\u0662\u0663\u0627\u0628\u0629</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u0661\u0662\u0663\u0627|\u0628\u0629</div>'
-      : '<div contenteditable dir="rtl">\u0661\u0662|\u0663\u0627\u0628\u0629</div>',
+  '<div contenteditable dir="rtl">\u0661\u0662|\u0663\u0627\u0628\u0629</div>',
   '9-0 rtl left character');
 
 selection_test(
   '<div contenteditable dir="rtl">\u0661|\u0662\u0663\u0627\u0628\u0629</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">|\u0661\u0662\u0663\u0627\u0628\u0629</div>'
-      : '<div contenteditable dir="rtl">\u0661\u0662\u0663|\u0627\u0628\u0629</div>',
+  '<div contenteditable dir="rtl">\u0661\u0662\u0663|\u0627\u0628\u0629</div>',
   '9-1 rtl left character');
 
 selection_test(
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_10_ltr.html b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_10_ltr.html
index 5524368..d8acc84 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_10_ltr.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_10_ltr.html
@@ -3,14 +3,10 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="ltr">|\u0627\u0628\u0629\u0661\u0662\u0663</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u0627|\u0628\u0629\u0661\u0662\u0663</div>'
-      : '<div contenteditable dir="ltr">|\u0627\u0628\u0629\u0661\u0662\u0663</div>',
+  '<div contenteditable dir="ltr">|\u0627\u0628\u0629\u0661\u0662\u0663</div>',
   '10-0 ltr left character');
 
 selection_test(
@@ -22,9 +18,7 @@
 selection_test(
   '<div contenteditable dir="ltr">\u0627\u0628|\u0629\u0661\u0662\u0663</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u0627\u0628\u0629|\u0661\u0662\u0663</div>'
-      : '<div contenteditable dir="ltr">\u0627\u0628\u0629\u0661\u0662|\u0663</div>',
+  '<div contenteditable dir="ltr">\u0627\u0628\u0629\u0661\u0662|\u0663</div>',
   '10-2 ltr left character');
 
 selection_test(
@@ -36,9 +30,7 @@
 selection_test(
   '<div contenteditable dir="ltr">\u0627\u0628\u0629\u0661|\u0662\u0663</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u0627\u0628\u0629|\u0661\u0662\u0663</div>'
-      : '<div contenteditable dir="ltr">|\u0627\u0628\u0629\u0661\u0662\u0663</div>',
+  '<div contenteditable dir="ltr">|\u0627\u0628\u0629\u0661\u0662\u0663</div>',
   '10-4 ltr left character');
 
 selection_test(
@@ -50,8 +42,6 @@
 selection_test(
   '<div contenteditable dir="ltr">\u0627\u0628\u0629\u0661\u0662\u0663|</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u0627\u0628\u0629\u0661\u0662|\u0663</div>'
-      : '<div contenteditable dir="ltr">\u0627|\u0628\u0629\u0661\u0662\u0663</div>',
+  '<div contenteditable dir="ltr">\u0627|\u0628\u0629\u0661\u0662\u0663</div>',
   '10-6 ltr left character');
 </script>
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_10_rtl.html b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_10_rtl.html
index 1cdfd64..a0e63b9 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_10_rtl.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_10_rtl.html
@@ -3,8 +3,6 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="rtl">|\u0627\u0628\u0629\u0661\u0662\u0663</div>',
   selection => selection.modify('move', 'left', 'character'),
@@ -26,17 +24,13 @@
 selection_test(
   '<div contenteditable dir="rtl">\u0627\u0628\u0629|\u0661\u0662\u0663</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u0627\u0628\u0629|\u0661\u0662\u0663</div>'
-      : '<div contenteditable dir="rtl">\u0627\u0628\u0629\u0661\u0662|\u0663</div>',
+  '<div contenteditable dir="rtl">\u0627\u0628\u0629\u0661\u0662|\u0663</div>',
   '10-3 rtl left character');
 
 selection_test(
   '<div contenteditable dir="rtl">\u0627\u0628\u0629\u0661|\u0662\u0663</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u0627\u0628\u0629|\u0661\u0662\u0663</div>'
-      : '<div contenteditable dir="rtl">\u0627\u0628\u0629\u0661\u0662\u0663|</div>',
+  '<div contenteditable dir="rtl">\u0627\u0628\u0629\u0661\u0662\u0663|</div>',
   '10-4 rtl left character');
 
 selection_test(
@@ -48,8 +42,6 @@
 selection_test(
   '<div contenteditable dir="rtl">\u0627\u0628\u0629\u0661\u0662\u0663|</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u0627\u0628\u0629\u0661\u0662|\u0663</div>'
-      : '<div contenteditable dir="rtl">\u0627\u0628\u0629\u0661\u0662\u0663|</div>',
+  '<div contenteditable dir="rtl">\u0627\u0628\u0629\u0661\u0662\u0663|</div>',
   '10-6 rtl left character');
 </script>
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_11_ltr.html b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_11_ltr.html
index 1d68fb27..12687b9 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_11_ltr.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_11_ltr.html
@@ -3,8 +3,6 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="ltr">|<span>abc</span>\u05D0\u05D1\u05D2def</div>',
   selection => selection.modify('move', 'left', 'character'),
@@ -32,17 +30,13 @@
 selection_test(
   '<div contenteditable dir="ltr"><span>abc|</span>\u05D0\u05D1\u05D2def</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr"><span>abc</span>\u05d0|\u05d1\u05d2def</div>'
-      : '<div contenteditable dir="ltr"><span>ab|c</span>\u05D0\u05D1\u05D2def</div>',
+  '<div contenteditable dir="ltr"><span>ab|c</span>\u05D0\u05D1\u05D2def</div>',
   '11-4 ltr left character');
 
 selection_test(
   '<div contenteditable dir="ltr"><span>abc</span>|\u05D0\u05D1\u05D2def</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr"><span>abc</span>\u05d0|\u05d1\u05d2def</div>'
-      : '<div contenteditable dir="ltr"><span>ab|c</span>\u05D0\u05D1\u05D2def</div>',
+  '<div contenteditable dir="ltr"><span>ab|c</span>\u05D0\u05D1\u05D2def</div>',
   '11-5 ltr left character');
 
 selection_test(
@@ -54,9 +48,7 @@
 selection_test(
   '<div contenteditable dir="ltr"><span>abc</span>\u05D0\u05D1|\u05D2def</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr"><span>abc</span>\u05d0\u05d1\u05d2|def</div>'
-      : '<div contenteditable dir="ltr"><span>abc|</span>\u05D0\u05D1\u05D2def</div>',
+  '<div contenteditable dir="ltr"><span>abc|</span>\u05D0\u05D1\u05D2def</div>',
   '11-7 ltr left character');
 
 selection_test(
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_11_rtl.html b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_11_rtl.html
index 563a455..6df514b0 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_11_rtl.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_11_rtl.html
@@ -3,30 +3,22 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="rtl">|<span>abc</span>\u05D0\u05D1\u05D2def</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl"><span>abc</span>\u05d0|\u05d1\u05d2def</div>'
-      : '<div contenteditable dir="rtl"><span>ab|c</span>\u05D0\u05D1\u05D2def</div>',
+  '<div contenteditable dir="rtl"><span>ab|c</span>\u05D0\u05D1\u05D2def</div>',
   '11-0 rtl left character');
 
 selection_test(
   '<div contenteditable dir="rtl"><span>|abc</span>\u05D0\u05D1\u05D2def</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl"><span>abc</span>\u05d0|\u05d1\u05d2def</div>'
-      : '<div contenteditable dir="rtl"><span>ab|c</span>\u05D0\u05D1\u05D2def</div>',
+  '<div contenteditable dir="rtl"><span>ab|c</span>\u05D0\u05D1\u05D2def</div>',
   '11-1 rtl left character');
 
 selection_test(
   '<div contenteditable dir="rtl"><span>a|bc</span>\u05D0\u05D1\u05D2def</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl"><span>|abc</span>\u05d0\u05d1\u05d2def</div>'
-      : '<div contenteditable dir="rtl"><span>abc|</span>\u05D0\u05D1\u05D2def</div>',
+  '<div contenteditable dir="rtl"><span>abc|</span>\u05D0\u05D1\u05D2def</div>',
   '11-2 rtl left character');
 
 selection_test(
@@ -62,17 +54,13 @@
 selection_test(
   '<div contenteditable dir="rtl"><span>abc</span>\u05D0\u05D1\u05D2|def</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl"><span>abc</span>\u05d0\u05d1\u05d2|def</div>'
-      : '<div contenteditable dir="rtl"><span>abc</span>\u05D0\u05D1\u05D2de|f</div>',
+  '<div contenteditable dir="rtl"><span>abc</span>\u05D0\u05D1\u05D2de|f</div>',
   '11-8 rtl left character');
 
 selection_test(
   '<div contenteditable dir="rtl"><span>abc</span>\u05D0\u05D1\u05D2d|ef</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl"><span>abc</span>\u05d0\u05d1\u05d2|def</div>'
-      : '<div contenteditable dir="rtl"><span>abc</span>\u05D0\u05D1\u05D2def|</div>',
+  '<div contenteditable dir="rtl"><span>abc</span>\u05D0\u05D1\u05D2def|</div>',
   '11-9 rtl left character');
 
 selection_test(
@@ -84,8 +72,6 @@
 selection_test(
   '<div contenteditable dir="rtl"><span>abc</span>\u05D0\u05D1\u05D2def|</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl"><span>abc</span>\u05d0\u05d1\u05d2de|f</div>'
-      : '<div contenteditable dir="rtl"><span>abc</span>\u05D0\u05D1\u05D2def|</div>',
+  '<div contenteditable dir="rtl"><span>abc</span>\u05D0\u05D1\u05D2def|</div>',
   '11-11 rtl left character');
 </script>
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_12_ltr.html b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_12_ltr.html
index 844a71df..2132814 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_12_ltr.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_12_ltr.html
@@ -3,22 +3,16 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="ltr">|<span>\u05D0\u05D1\u05D2</span>abc\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr"><span>\u05d0|\u05d1\u05d2</span>abc\u05d3\u05d4\u05d5</div>'
-      : '<div contenteditable dir="ltr">|<span>\u05D0\u05D1\u05D2</span>abc\u05D3\u05D4\u05D5</div>',
+  '<div contenteditable dir="ltr">|<span>\u05D0\u05D1\u05D2</span>abc\u05D3\u05D4\u05D5</div>',
   '12-0 ltr left character');
 
 selection_test(
   '<div contenteditable dir="ltr"><span>|\u05D0\u05D1\u05D2</span>abc\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr"><span>\u05d0|\u05d1\u05d2</span>abc\u05d3\u05d4\u05d5</div>'
-      : '<div contenteditable dir="ltr"><span>|\u05D0\u05D1\u05D2</span>abc\u05D3\u05D4\u05D5</div>',
+  '<div contenteditable dir="ltr"><span>|\u05D0\u05D1\u05D2</span>abc\u05D3\u05D4\u05D5</div>',
   '12-1 ltr left character');
 
 selection_test(
@@ -30,9 +24,7 @@
 selection_test(
   '<div contenteditable dir="ltr"><span>\u05D0\u05D1|\u05D2</span>abc\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr"><span>\u05d0\u05d1\u05d2|</span>abc\u05d3\u05d4\u05d5</div>'
-      : '<div contenteditable dir="ltr"><span>|\u05D0\u05D1\u05D2</span>abc\u05D3\u05D4\u05D5</div>',
+  '<div contenteditable dir="ltr"><span>|\u05D0\u05D1\u05D2</span>abc\u05D3\u05D4\u05D5</div>',
   '12-3 ltr left character');
 
 selection_test(
@@ -62,9 +54,7 @@
 selection_test(
   '<div contenteditable dir="ltr"><span>\u05D0\u05D1\u05D2</span>abc|\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr"><span>\u05d0\u05d1\u05d2</span>abc\u05d3|\u05d4\u05d5</div>'
-      : '<div contenteditable dir="ltr"><span>\u05D0\u05D1\u05D2</span>ab|c\u05D3\u05D4\u05D5</div>',
+  '<div contenteditable dir="ltr"><span>\u05D0\u05D1\u05D2</span>ab|c\u05D3\u05D4\u05D5</div>',
   '12-8 ltr left character');
 
 selection_test(
@@ -76,16 +66,12 @@
 selection_test(
   '<div contenteditable dir="ltr"><span>\u05D0\u05D1\u05D2</span>abc\u05D3\u05D4|\u05D5</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr"><span>\u05d0\u05d1\u05d2</span>abc\u05d3\u05d4\u05d5|</div>'
-      : '<div contenteditable dir="ltr"><span>\u05D0\u05D1\u05D2</span>abc|\u05D3\u05D4\u05D5</div>',
+  '<div contenteditable dir="ltr"><span>\u05D0\u05D1\u05D2</span>abc|\u05D3\u05D4\u05D5</div>',
   '12-10 ltr left character');
 
 selection_test(
   '<div contenteditable dir="ltr"><span>\u05D0\u05D1\u05D2</span>abc\u05D3\u05D4\u05D5|</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr"><span>\u05d0\u05d1\u05d2</span>ab|c\u05d3\u05d4\u05d5</div>'
-      : '<div contenteditable dir="ltr"><span>\u05D0\u05D1\u05D2</span>abc\u05D3|\u05D4\u05D5</div>',
+  '<div contenteditable dir="ltr"><span>\u05D0\u05D1\u05D2</span>abc\u05D3|\u05D4\u05D5</div>',
   '12-11 ltr left character');
 </script>
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_12_rtl.html b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_12_rtl.html
index 9e980cd3..3748e5a 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_12_rtl.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_12_rtl.html
@@ -3,8 +3,6 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="rtl">|<span>\u05D0\u05D1\u05D2</span>abc\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'left', 'character'),
@@ -32,25 +30,19 @@
 selection_test(
   '<div contenteditable dir="rtl"><span>\u05D0\u05D1\u05D2|</span>abc\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl"><span>\u05d0\u05d1\u05d2</span>abc\u05d3|\u05d4\u05d5</div>'
-      : '<div contenteditable dir="rtl"><span>\u05D0\u05D1\u05D2</span>ab|c\u05D3\u05D4\u05D5</div>',
+  '<div contenteditable dir="rtl"><span>\u05D0\u05D1\u05D2</span>ab|c\u05D3\u05D4\u05D5</div>',
   '12-4 rtl left character');
 
 selection_test(
   '<div contenteditable dir="rtl"><span>\u05D0\u05D1\u05D2</span>|abc\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl"><span>\u05d0\u05d1\u05d2</span>abc\u05d3|\u05d4\u05d5</div>'
-      : '<div contenteditable dir="rtl"><span>\u05D0\u05D1\u05D2</span>ab|c\u05D3\u05D4\u05D5</div>',
+  '<div contenteditable dir="rtl"><span>\u05D0\u05D1\u05D2</span>ab|c\u05D3\u05D4\u05D5</div>',
   '12-5 rtl left character');
 
 selection_test(
   '<div contenteditable dir="rtl"><span>\u05D0\u05D1\u05D2</span>a|bc\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl"><span>\u05d0\u05d1\u05d2|</span>abc\u05d3\u05d4\u05d5</div>'
-      : '<div contenteditable dir="rtl"><span>\u05D0\u05D1\u05D2</span>abc|\u05D3\u05D4\u05D5</div>',
+  '<div contenteditable dir="rtl"><span>\u05D0\u05D1\u05D2</span>abc|\u05D3\u05D4\u05D5</div>',
   '12-6 rtl left character');
 
 selection_test(
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_13_ltr.html b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_13_ltr.html
index eba70b29..e60bf2a 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_13_ltr.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_13_ltr.html
@@ -3,8 +3,6 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="ltr">|abc\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5def</div>',
   selection => selection.modify('move', 'left', 'character'),
@@ -26,9 +24,7 @@
 selection_test(
   '<div contenteditable dir="ltr">abc|\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5def</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">abc\u05d0|\u05d1\u05d2123\u05d3\u05d4\u05d5def</div>'
-      : '<div contenteditable dir="ltr">ab|c\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5def</div>',
+  '<div contenteditable dir="ltr">ab|c\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5def</div>',
   '13-3 ltr left character');
 
 selection_test(
@@ -40,9 +36,7 @@
 selection_test(
   '<div contenteditable dir="ltr">abc\u05D0\u05D1|\u05D2123\u05D3\u05D4\u05D5def</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">abc\u05d0\u05d1\u05d2|123\u05d3\u05d4\u05d5def</div>'
-      : '<div contenteditable dir="ltr">abc\u05D0\u05D1\u05D2123|\u05D3\u05D4\u05D5def</div>',
+  '<div contenteditable dir="ltr">abc\u05D0\u05D1\u05D2123|\u05D3\u05D4\u05D5def</div>',
   '13-5 ltr left character');
 
 selection_test(
@@ -66,9 +60,7 @@
 selection_test(
   '<div contenteditable dir="ltr">abc\u05D0\u05D1\u05D2123|\u05D3\u05D4\u05D5def</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">abc\u05d0\u05d1\u05d2123\u05d3|\u05d4\u05d5def</div>'
-      : '<div contenteditable dir="ltr">abc\u05D0\u05D1\u05D212|3\u05D3\u05D4\u05D5def</div>',
+  '<div contenteditable dir="ltr">abc\u05D0\u05D1\u05D212|3\u05D3\u05D4\u05D5def</div>',
   '13-9 ltr left character');
 
 selection_test(
@@ -80,9 +72,7 @@
 selection_test(
   '<div contenteditable dir="ltr">abc\u05D0\u05D1\u05D2123\u05D3\u05D4|\u05D5def</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">abc\u05d0\u05d1\u05d2123\u05d3\u05d4\u05d5|def</div>'
-      : '<div contenteditable dir="ltr">abc|\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5def</div>',
+  '<div contenteditable dir="ltr">abc|\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5def</div>',
   '13-11 ltr left character');
 
 selection_test(
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_13_rtl.html b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_13_rtl.html
index d1013b649..d2a4d4b 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_13_rtl.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_13_rtl.html
@@ -3,22 +3,16 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="rtl">|abc\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5def</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc\u05d0|\u05d1\u05d2123\u05d3\u05d4\u05d5def</div>'
-      : '<div contenteditable dir="rtl">ab|c\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5def</div>',
+  '<div contenteditable dir="rtl">ab|c\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5def</div>',
   '13-0 rtl left character');
 
 selection_test(
   '<div contenteditable dir="rtl">a|bc\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5def</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">|abc\u05d0\u05d1\u05d2123\u05d3\u05d4\u05d5def</div>'
-      : '<div contenteditable dir="rtl">abc|\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5def</div>',
+  '<div contenteditable dir="rtl">abc|\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5def</div>',
   '13-1 rtl left character');
 
 selection_test(
@@ -48,17 +42,13 @@
 selection_test(
   '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2|123\u05D3\u05D4\u05D5def</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc\u05d0\u05d1\u05d2123\u05d3|\u05d4\u05d5def</div>'
-      : '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D212|3\u05D3\u05D4\u05D5def</div>',
+  '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D212|3\u05D3\u05D4\u05D5def</div>',
   '13-6 rtl left character');
 
 selection_test(
   '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D21|23\u05D3\u05D4\u05D5def</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc\u05d0\u05d1\u05d2|123\u05d3\u05d4\u05d5def</div>'
-      : '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2123|\u05D3\u05D4\u05D5def</div>',
+  '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2123|\u05D3\u05D4\u05D5def</div>',
   '13-7 rtl left character');
 
 selection_test(
@@ -88,17 +78,13 @@
 selection_test(
   '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5|def</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc\u05d0\u05d1\u05d2123\u05d3\u05d4\u05d5|def</div>'
-      : '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5de|f</div>',
+  '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5de|f</div>',
   '13-12 rtl left character');
 
 selection_test(
   '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5d|ef</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc\u05d0\u05d1\u05d2123\u05d3\u05d4\u05d5|def</div>'
-      : '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5def|</div>',
+  '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5def|</div>',
   '13-13 rtl left character');
 
 selection_test(
@@ -110,8 +96,6 @@
 selection_test(
   '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5def|</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc\u05d0\u05d1\u05d2123\u05d3\u05d4\u05d5de|f</div>'
-      : '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5def|</div>',
+  '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5def|</div>',
   '13-15 rtl left character');
 </script>
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_14_ltr.html b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_14_ltr.html
index 9d4c39c..4de0096 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_14_ltr.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_14_ltr.html
@@ -3,8 +3,6 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="ltr">|abc\u05D0\u05D1\u05D2123</div>',
   selection => selection.modify('move', 'left', 'character'),
@@ -26,9 +24,7 @@
 selection_test(
   '<div contenteditable dir="ltr">abc|\u05D0\u05D1\u05D2123</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">abc\u05d0|\u05d1\u05d2123</div>'
-      : '<div contenteditable dir="ltr">ab|c\u05D0\u05D1\u05D2123</div>',
+  '<div contenteditable dir="ltr">ab|c\u05D0\u05D1\u05D2123</div>',
   '14-3 ltr left character');
 
 selection_test(
@@ -40,9 +36,7 @@
 selection_test(
   '<div contenteditable dir="ltr">abc\u05D0\u05D1|\u05D2123</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">abc\u05d0\u05d1\u05d2|123</div>'
-      : '<div contenteditable dir="ltr">abc\u05D0\u05D1\u05D212|3</div>',
+  '<div contenteditable dir="ltr">abc\u05D0\u05D1\u05D212|3</div>',
   '14-5 ltr left character');
 
 selection_test(
@@ -54,9 +48,7 @@
 selection_test(
   '<div contenteditable dir="ltr">abc\u05D0\u05D1\u05D21|23</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">abc\u05d0\u05d1\u05d2|123</div>'
-      : '<div contenteditable dir="ltr">abc|\u05D0\u05D1\u05D2123</div>',
+  '<div contenteditable dir="ltr">abc|\u05D0\u05D1\u05D2123</div>',
   '14-7 ltr left character');
 
 selection_test(
@@ -68,8 +60,6 @@
 selection_test(
   '<div contenteditable dir="ltr">abc\u05D0\u05D1\u05D2123|</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">abc\u05d0\u05d1\u05d212|3</div>'
-      : '<div contenteditable dir="ltr">abc\u05D0|\u05D1\u05D2123</div>',
+  '<div contenteditable dir="ltr">abc\u05D0|\u05D1\u05D2123</div>',
   '14-9 ltr left character');
 </script>
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_14_rtl.html b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_14_rtl.html
index 4942e68..4a61bd4 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_14_rtl.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_14_rtl.html
@@ -3,22 +3,16 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="rtl">|abc\u05D0\u05D1\u05D2123</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc\u05d0|\u05d1\u05d2123</div>'
-      : '<div contenteditable dir="rtl">ab|c\u05D0\u05D1\u05D2123</div>',
+  '<div contenteditable dir="rtl">ab|c\u05D0\u05D1\u05D2123</div>',
   '14-0 rtl left character');
 
 selection_test(
   '<div contenteditable dir="rtl">a|bc\u05D0\u05D1\u05D2123</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">|abc\u05d0\u05d1\u05d2123</div>'
-      : '<div contenteditable dir="rtl">abc|\u05D0\u05D1\u05D2123</div>',
+  '<div contenteditable dir="rtl">abc|\u05D0\u05D1\u05D2123</div>',
   '14-1 rtl left character');
 
 selection_test(
@@ -48,17 +42,13 @@
 selection_test(
   '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2|123</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc\u05d0\u05d1\u05d2|123</div>'
-      : '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D212|3</div>',
+  '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D212|3</div>',
   '14-6 rtl left character');
 
 selection_test(
   '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D21|23</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc\u05d0\u05d1\u05d2|123</div>'
-      : '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2123|</div>',
+  '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2123|</div>',
   '14-7 rtl left character');
 
 selection_test(
@@ -70,8 +60,6 @@
 selection_test(
   '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2123|</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc\u05d0\u05d1\u05d212|3</div>'
-      : '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2123|</div>',
+  '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2123|</div>',
   '14-9 rtl left character');
 </script>
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_15_ltr.html b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_15_ltr.html
index 438396b..7f02b3d 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_15_ltr.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_15_ltr.html
@@ -3,8 +3,6 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="ltr">|abc\u05D0\u05D1\u05D2123def</div>',
   selection => selection.modify('move', 'left', 'character'),
@@ -26,9 +24,7 @@
 selection_test(
   '<div contenteditable dir="ltr">abc|\u05D0\u05D1\u05D2123def</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">abc\u05d0|\u05d1\u05d2123def</div>'
-      : '<div contenteditable dir="ltr">ab|c\u05D0\u05D1\u05D2123def</div>',
+  '<div contenteditable dir="ltr">ab|c\u05D0\u05D1\u05D2123def</div>',
   '15-3 ltr left character');
 
 selection_test(
@@ -40,9 +36,7 @@
 selection_test(
   '<div contenteditable dir="ltr">abc\u05D0\u05D1|\u05D2123def</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">abc\u05d0\u05d1\u05d2|123def</div>'
-      : '<div contenteditable dir="ltr">abc\u05D0\u05D1\u05D212|3def</div>',
+  '<div contenteditable dir="ltr">abc\u05D0\u05D1\u05D212|3def</div>',
   '15-5 ltr left character');
 
 selection_test(
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_15_rtl.html b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_15_rtl.html
index 7bb332a..3160668ce 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_15_rtl.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_15_rtl.html
@@ -3,22 +3,16 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="rtl">|abc\u05D0\u05D1\u05D2123def</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc\u05d0|\u05d1\u05d2123def</div>'
-      : '<div contenteditable dir="rtl">ab|c\u05D0\u05D1\u05D2123def</div>',
+  '<div contenteditable dir="rtl">ab|c\u05D0\u05D1\u05D2123def</div>',
   '15-0 rtl left character');
 
 selection_test(
   '<div contenteditable dir="rtl">a|bc\u05D0\u05D1\u05D2123def</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">|abc\u05d0\u05d1\u05d2123def</div>'
-      : '<div contenteditable dir="rtl">abc|\u05D0\u05D1\u05D2123def</div>',
+  '<div contenteditable dir="rtl">abc|\u05D0\u05D1\u05D2123def</div>',
   '15-1 rtl left character');
 
 selection_test(
@@ -48,17 +42,13 @@
 selection_test(
   '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2|123def</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc\u05d0\u05d1\u05d2|123def</div>'
-      : '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2123de|f</div>',
+  '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2123de|f</div>',
   '15-6 rtl left character');
 
 selection_test(
   '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D21|23def</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc\u05d0\u05d1\u05d2|123def</div>'
-      : '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2123def|</div>',
+  '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2123def|</div>',
   '15-7 rtl left character');
 
 selection_test(
@@ -88,8 +78,6 @@
 selection_test(
   '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2123def|</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc\u05d0\u05d1\u05d2123de|f</div>'
-      : '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2123def|</div>',
+  '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2123def|</div>',
   '15-12 rtl left character');
 </script>
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_16_ltr.html b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_16_ltr.html
index e9322ed..7f500e7 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_16_ltr.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_16_ltr.html
@@ -3,14 +3,10 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5abc\u05D6\u05D7\u05D8456\u05D9\u05DB\u05DC</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0|\u05d1\u05d2123\u05d3\u05d4\u05d5abc\u05d6\u05d7\u05d8456\u05d9\u05db\u05dc</div>'
-      : '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5abc\u05D6\u05D7\u05D8456\u05D9\u05DB\u05DC</div>',
+  '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5abc\u05D6\u05D7\u05D8456\u05D9\u05DB\u05DC</div>',
   '16-0 ltr left character');
 
 selection_test(
@@ -22,9 +18,7 @@
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1|\u05D2123\u05D3\u05D4\u05D5abc\u05D6\u05D7\u05D8456\u05D9\u05DB\u05DC</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1\u05d2|123\u05d3\u05d4\u05d5abc\u05d6\u05d7\u05d8456\u05d9\u05db\u05dc</div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2123|\u05D3\u05D4\u05D5abc\u05D6\u05D7\u05D8456\u05D9\u05DB\u05DC</div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2123|\u05D3\u05D4\u05D5abc\u05D6\u05D7\u05D8456\u05D9\u05DB\u05DC</div>',
   '16-2 ltr left character');
 
 selection_test(
@@ -48,9 +42,7 @@
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2123|\u05D3\u05D4\u05D5abc\u05D6\u05D7\u05D8456\u05D9\u05DB\u05DC</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1\u05d2123\u05d3|\u05d4\u05d5abc\u05d6\u05d7\u05d8456\u05d9\u05db\u05dc</div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D212|3\u05D3\u05D4\u05D5abc\u05D6\u05D7\u05D8456\u05D9\u05DB\u05DC</div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D212|3\u05D3\u05D4\u05D5abc\u05D6\u05D7\u05D8456\u05D9\u05DB\u05DC</div>',
   '16-6 ltr left character');
 
 selection_test(
@@ -62,9 +54,7 @@
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2123\u05D3\u05D4|\u05D5abc\u05D6\u05D7\u05D8456\u05D9\u05DB\u05DC</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1\u05d2123\u05d3\u05d4\u05d5|abc\u05d6\u05d7\u05d8456\u05d9\u05db\u05dc</div>'
-      : '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5abc\u05D6\u05D7\u05D8456\u05D9\u05DB\u05DC</div>',
+  '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5abc\u05D6\u05D7\u05D8456\u05D9\u05DB\u05DC</div>',
   '16-8 ltr left character');
 
 selection_test(
@@ -88,9 +78,7 @@
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5abc|\u05D6\u05D7\u05D8456\u05D9\u05DB\u05DC</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1\u05d2123\u05d3\u05d4\u05d5abc\u05d6|\u05d7\u05d8456\u05d9\u05db\u05dc</div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5ab|c\u05D6\u05D7\u05D8456\u05D9\u05DB\u05DC</div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5ab|c\u05D6\u05D7\u05D8456\u05D9\u05DB\u05DC</div>',
   '16-12 ltr left character');
 
 selection_test(
@@ -102,9 +90,7 @@
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5abc\u05D6\u05D7|\u05D8456\u05D9\u05DB\u05DC</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1\u05d2123\u05d3\u05d4\u05d5abc\u05d6\u05d7\u05d8|456\u05d9\u05db\u05dc</div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5abc\u05D6\u05D7\u05D8456|\u05D9\u05DB\u05DC</div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5abc\u05D6\u05D7\u05D8456|\u05D9\u05DB\u05DC</div>',
   '16-14 ltr left character');
 
 selection_test(
@@ -128,9 +114,7 @@
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5abc\u05D6\u05D7\u05D8456|\u05D9\u05DB\u05DC</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1\u05d2123\u05d3\u05d4\u05d5abc\u05d6\u05d7\u05d8456\u05d9|\u05db\u05dc</div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5abc\u05D6\u05D7\u05D845|6\u05D9\u05DB\u05DC</div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5abc\u05D6\u05D7\u05D845|6\u05D9\u05DB\u05DC</div>',
   '16-18 ltr left character');
 
 selection_test(
@@ -142,16 +126,12 @@
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5abc\u05D6\u05D7\u05D8456\u05D9\u05DB|\u05DC</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1\u05d2123\u05d3\u05d4\u05d5abc\u05d6\u05d7\u05d8456\u05d9\u05db\u05dc|</div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5abc|\u05D6\u05D7\u05D8456\u05D9\u05DB\u05DC</div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5abc|\u05D6\u05D7\u05D8456\u05D9\u05DB\u05DC</div>',
   '16-20 ltr left character');
 
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5abc\u05D6\u05D7\u05D8456\u05D9\u05DB\u05DC|</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1\u05d2123\u05d3\u05d4\u05d5ab|c\u05d6\u05d7\u05d8456\u05d9\u05db\u05dc</div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5abc\u05D6|\u05D7\u05D8456\u05D9\u05DB\u05DC</div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5abc\u05D6|\u05D7\u05D8456\u05D9\u05DB\u05DC</div>',
   '16-21 ltr left character');
 </script>
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_16_rtl.html b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_16_rtl.html
index 5115964..35ed3cc 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_16_rtl.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_16_rtl.html
@@ -3,8 +3,6 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="rtl">|\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5abc\u05D6\u05D7\u05D8456\u05D9\u05DB\u05DC</div>',
   selection => selection.modify('move', 'left', 'character'),
@@ -26,17 +24,13 @@
 selection_test(
   '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2|123\u05D3\u05D4\u05D5abc\u05D6\u05D7\u05D8456\u05D9\u05DB\u05DC</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u05d0\u05d1\u05d2123\u05d3|\u05d4\u05d5abc\u05d6\u05d7\u05d8456\u05d9\u05db\u05dc</div>'
-      : '<div contenteditable dir="rtl">\u05D0\u05D1\u05D212|3\u05D3\u05D4\u05D5abc\u05D6\u05D7\u05D8456\u05D9\u05DB\u05DC</div>',
+  '<div contenteditable dir="rtl">\u05D0\u05D1\u05D212|3\u05D3\u05D4\u05D5abc\u05D6\u05D7\u05D8456\u05D9\u05DB\u05DC</div>',
   '16-3 rtl left character');
 
 selection_test(
   '<div contenteditable dir="rtl">\u05D0\u05D1\u05D21|23\u05D3\u05D4\u05D5abc\u05D6\u05D7\u05D8456\u05D9\u05DB\u05DC</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u05d0\u05d1\u05d2|123\u05d3\u05d4\u05d5abc\u05d6\u05d7\u05d8456\u05d9\u05db\u05dc</div>'
-      : '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2123|\u05D3\u05D4\u05D5abc\u05D6\u05D7\u05D8456\u05D9\u05DB\u05DC</div>',
+  '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2123|\u05D3\u05D4\u05D5abc\u05D6\u05D7\u05D8456\u05D9\u05DB\u05DC</div>',
   '16-4 rtl left character');
 
 selection_test(
@@ -66,17 +60,13 @@
 selection_test(
   '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5|abc\u05D6\u05D7\u05D8456\u05D9\u05DB\u05DC</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u05d0\u05d1\u05d2123\u05d3\u05d4\u05d5abc\u05d6|\u05d7\u05d8456\u05d9\u05db\u05dc</div>'
-      : '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5ab|c\u05D6\u05D7\u05D8456\u05D9\u05DB\u05DC</div>',
+  '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5ab|c\u05D6\u05D7\u05D8456\u05D9\u05DB\u05DC</div>',
   '16-9 rtl left character');
 
 selection_test(
   '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5a|bc\u05D6\u05D7\u05D8456\u05D9\u05DB\u05DC</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u05d0\u05d1\u05d2123\u05d3\u05d4\u05d5|abc\u05d6\u05d7\u05d8456\u05d9\u05db\u05dc</div>'
-      : '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5abc|\u05D6\u05D7\u05D8456\u05D9\u05DB\u05DC</div>',
+  '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5abc|\u05D6\u05D7\u05D8456\u05D9\u05DB\u05DC</div>',
   '16-10 rtl left character');
 
 selection_test(
@@ -106,17 +96,13 @@
 selection_test(
   '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5abc\u05D6\u05D7\u05D8|456\u05D9\u05DB\u05DC</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u05d0\u05d1\u05d2123\u05d3\u05d4\u05d5abc\u05d6\u05d7\u05d8456\u05d9|\u05db\u05dc</div>'
-      : '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5abc\u05D6\u05D7\u05D845|6\u05D9\u05DB\u05DC</div>',
+  '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5abc\u05D6\u05D7\u05D845|6\u05D9\u05DB\u05DC</div>',
   '16-15 rtl left character');
 
 selection_test(
   '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5abc\u05D6\u05D7\u05D84|56\u05D9\u05DB\u05DC</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u05d0\u05d1\u05d2123\u05d3\u05d4\u05d5abc\u05d6\u05d7\u05d8|456\u05d9\u05db\u05dc</div>'
-      : '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5abc\u05D6\u05D7\u05D8456|\u05D9\u05DB\u05DC</div>',
+  '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5abc\u05D6\u05D7\u05D8456|\u05D9\u05DB\u05DC</div>',
   '16-16 rtl left character');
 
 selection_test(
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_25_ltr.html b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_25_ltr.html
index 1f9c64b..8bd9a684 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_25_ltr.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_25_ltr.html
@@ -3,8 +3,6 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="ltr">|abcdef\u05D0\u05D1\u05D2<img>\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'left', 'character'),
@@ -44,9 +42,7 @@
 selection_test(
   '<div contenteditable dir="ltr">abcdef|\u05D0\u05D1\u05D2<img>\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">abcdef\u05d0|\u05d1\u05d2<img>\u05d3\u05d4\u05d5</div>'
-      : '<div contenteditable dir="ltr">abcde|f\u05D0\u05D1\u05D2<img>\u05D3\u05D4\u05D5</div>',
+  '<div contenteditable dir="ltr">abcde|f\u05D0\u05D1\u05D2<img>\u05D3\u05D4\u05D5</div>',
   '25-6 ltr left character');
 
 selection_test(
@@ -82,16 +78,12 @@
 selection_test(
   '<div contenteditable dir="ltr">abcdef\u05D0\u05D1\u05D2<img>\u05D3\u05D4|\u05D5</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">abcdef\u05d0\u05d1\u05d2<img>\u05d3\u05d4\u05d5|</div>'
-      : '<div contenteditable dir="ltr">abcdef|\u05D0\u05D1\u05D2<img>\u05D3\u05D4\u05D5</div>',
+  '<div contenteditable dir="ltr">abcdef|\u05D0\u05D1\u05D2<img>\u05D3\u05D4\u05D5</div>',
   '25-12 ltr left character');
 
 selection_test(
   '<div contenteditable dir="ltr">abcdef\u05D0\u05D1\u05D2<img>\u05D3\u05D4\u05D5|</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">abcde|f\u05d0\u05d1\u05d2<img>\u05d3\u05d4\u05d5</div>'
-      : '<div contenteditable dir="ltr">abcdef\u05D0|\u05D1\u05D2<img>\u05D3\u05D4\u05D5</div>',
+  '<div contenteditable dir="ltr">abcdef\u05D0|\u05D1\u05D2<img>\u05D3\u05D4\u05D5</div>',
   '25-13 ltr left character');
 </script>
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_25_rtl.html b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_25_rtl.html
index b3f438e..dff132a 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_25_rtl.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_25_rtl.html
@@ -3,22 +3,16 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="rtl">|abcdef\u05D0\u05D1\u05D2<img>\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abcdef\u05d0|\u05d1\u05d2<img>\u05d3\u05d4\u05d5</div>'
-      : '<div contenteditable dir="rtl">abcde|f\u05D0\u05D1\u05D2<img>\u05D3\u05D4\u05D5</div>',
+  '<div contenteditable dir="rtl">abcde|f\u05D0\u05D1\u05D2<img>\u05D3\u05D4\u05D5</div>',
   '25-0 rtl left character');
 
 selection_test(
   '<div contenteditable dir="rtl">a|bcdef\u05D0\u05D1\u05D2<img>\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">|abcdef\u05d0\u05d1\u05d2<img>\u05d3\u05d4\u05d5</div>'
-      : '<div contenteditable dir="rtl">abcdef|\u05D0\u05D1\u05D2<img>\u05D3\u05D4\u05D5</div>',
+  '<div contenteditable dir="rtl">abcdef|\u05D0\u05D1\u05D2<img>\u05D3\u05D4\u05D5</div>',
   '25-1 rtl left character');
 
 selection_test(
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_26_ltr.html b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_26_ltr.html
index d7f4b5c..c3daf162 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_26_ltr.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_26_ltr.html
@@ -3,14 +3,10 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2\u05D3\u05D4\u05D5abc<img>def</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0|\u05d1\u05d2\u05d3\u05d4\u05d5abc<img>def</div>'
-      : '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2\u05D3\u05D4\u05D5abc<img>def</div>',
+  '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2\u05D3\u05D4\u05D5abc<img>def</div>',
   '26-0 ltr left character');
 
 selection_test(
@@ -40,9 +36,7 @@
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2\u05D3\u05D4|\u05D5abc<img>def</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1\u05d2\u05d3\u05d4\u05d5|abc<img>def</div>'
-      : '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2\u05D3\u05D4\u05D5abc<img>def</div>',
+  '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2\u05D3\u05D4\u05D5abc<img>def</div>',
   '26-5 ltr left character');
 
 selection_test(
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_26_rtl.html b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_26_rtl.html
index 0c5f38c..890990a 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_26_rtl.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_26_rtl.html
@@ -3,8 +3,6 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="rtl">|\u05D0\u05D1\u05D2\u05D3\u05D4\u05D5abc<img>def</div>',
   selection => selection.modify('move', 'left', 'character'),
@@ -44,17 +42,13 @@
 selection_test(
   '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2\u05D3\u05D4\u05D5|abc<img>def</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u05d0\u05d1\u05d2\u05d3\u05d4\u05d5|abc<img>def</div>'
-      : '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2\u05D3\u05D4\u05D5abc<img>de|f</div>',
+  '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2\u05D3\u05D4\u05D5abc<img>de|f</div>',
   '26-6 rtl left character');
 
 selection_test(
   '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2\u05D3\u05D4\u05D5a|bc<img>def</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u05d0\u05d1\u05d2\u05d3\u05d4\u05d5|abc<img>def</div>'
-      : '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2\u05D3\u05D4\u05D5abc<img>def|</div>',
+  '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2\u05D3\u05D4\u05D5abc<img>def|</div>',
   '26-7 rtl left character');
 
 selection_test(
@@ -90,8 +84,6 @@
 selection_test(
   '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2\u05D3\u05D4\u05D5abc<img>def|</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u05d0\u05d1\u05d2\u05d3\u05d4\u05d5abc<img>de|f</div>'
-      : '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2\u05D3\u05D4\u05D5abc<img>def|</div>',
+  '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2\u05D3\u05D4\u05D5abc<img>def|</div>',
   '26-13 rtl left character');
 </script>
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_27_ltr.html b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_27_ltr.html
index e4cd0951..561a473 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_27_ltr.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_27_ltr.html
@@ -3,8 +3,6 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="ltr">|abc<input>\u05D0\u05D1\u05D2<img><img>\u05D3\u05D4\u05D5ghi</div>',
   selection => selection.modify('move', 'left', 'character'),
@@ -32,9 +30,7 @@
 selection_test(
   '<div contenteditable dir="ltr">abc<input>|\u05D0\u05D1\u05D2<img><img>\u05D3\u05D4\u05D5ghi</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">abc<input>\u05D0|\u05D1\u05D2<img><img>\u05D3\u05D4\u05D5ghi</div>'
-      : '<div contenteditable dir="ltr">abc|<input>\u05D0\u05D1\u05D2<img><img>\u05D3\u05D4\u05D5ghi</div>',
+  '<div contenteditable dir="ltr">abc|<input>\u05D0\u05D1\u05D2<img><img>\u05D3\u05D4\u05D5ghi</div>',
   '27-4 ltr left character');
 
 selection_test(
@@ -76,9 +72,7 @@
 selection_test(
   '<div contenteditable dir="ltr">abc<input>\u05D0\u05D1\u05D2<img><img>\u05D3\u05D4|\u05D5ghi</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">abc<input>\u05D0\u05D1\u05D2<img><img>\u05D3\u05D4\u05D5|ghi</div>'
-      : '<div contenteditable dir="ltr">abc<input>|\u05D0\u05D1\u05D2<img><img>\u05D3\u05D4\u05D5ghi</div>',
+  '<div contenteditable dir="ltr">abc<input>|\u05D0\u05D1\u05D2<img><img>\u05D3\u05D4\u05D5ghi</div>',
   '27-11 ltr left character');
 
 selection_test(
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_27_rtl.html b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_27_rtl.html
index e61f5f8..0754521 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_27_rtl.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_27_rtl.html
@@ -3,22 +3,16 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="rtl">|abc<input>\u05D0\u05D1\u05D2<img><img>\u05D3\u05D4\u05D5ghi</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc<input>|\u05D0\u05D1\u05D2<img><img>\u05D3\u05D4\u05D5ghi</div>'
-      : '<div contenteditable dir="rtl">ab|c<input>\u05D0\u05D1\u05D2<img><img>\u05D3\u05D4\u05D5ghi</div>',
+  '<div contenteditable dir="rtl">ab|c<input>\u05D0\u05D1\u05D2<img><img>\u05D3\u05D4\u05D5ghi</div>',
   '27-0 rtl left character');
 
 selection_test(
   '<div contenteditable dir="rtl">a|bc<input>\u05D0\u05D1\u05D2<img><img>\u05D3\u05D4\u05D5ghi</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">|abc<input>\u05D0\u05D1\u05D2<img><img>\u05D3\u05D4\u05D5ghi</div>'
-      : '<div contenteditable dir="rtl">abc|<input>\u05D0\u05D1\u05D2<img><img>\u05D3\u05D4\u05D5ghi</div>',
+  '<div contenteditable dir="rtl">abc|<input>\u05D0\u05D1\u05D2<img><img>\u05D3\u05D4\u05D5ghi</div>',
   '27-1 rtl left character');
 
 selection_test(
@@ -84,17 +78,13 @@
 selection_test(
   '<div contenteditable dir="rtl">abc<input>\u05D0\u05D1\u05D2<img><img>\u05D3\u05D4\u05D5|ghi</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc<input>\u05D0\u05D1\u05D2<img><img>\u05D3\u05D4\u05D5|ghi</div>'
-      : '<div contenteditable dir="rtl">abc<input>\u05D0\u05D1\u05D2<img><img>\u05D3\u05D4\u05D5gh|i</div>',
+  '<div contenteditable dir="rtl">abc<input>\u05D0\u05D1\u05D2<img><img>\u05D3\u05D4\u05D5gh|i</div>',
   '27-12 rtl left character');
 
 selection_test(
   '<div contenteditable dir="rtl">abc<input>\u05D0\u05D1\u05D2<img><img>\u05D3\u05D4\u05D5g|hi</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc<input>\u05D0\u05D1\u05D2<img><img>\u05D3\u05D4\u05D5|ghi</div>'
-      : '<div contenteditable dir="rtl">abc<input>\u05D0\u05D1\u05D2<img><img>\u05D3\u05D4\u05D5ghi|</div>',
+  '<div contenteditable dir="rtl">abc<input>\u05D0\u05D1\u05D2<img><img>\u05D3\u05D4\u05D5ghi|</div>',
   '27-13 rtl left character');
 
 selection_test(
@@ -106,8 +96,6 @@
 selection_test(
   '<div contenteditable dir="rtl">abc<input>\u05D0\u05D1\u05D2<img><img>\u05D3\u05D4\u05D5ghi|</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc<input>\u05D0\u05D1\u05D2<img><img>\u05D3\u05D4\u05D5gh|i</div>'
-      : '<div contenteditable dir="rtl">abc<input>\u05D0\u05D1\u05D2<img><img>\u05D3\u05D4\u05D5ghi|</div>',
+  '<div contenteditable dir="rtl">abc<input>\u05D0\u05D1\u05D2<img><img>\u05D3\u05D4\u05D5ghi|</div>',
   '27-15 rtl left character');
 </script>
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_28_ltr.html b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_28_ltr.html
index 5224f3f..0c1c148d 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_28_ltr.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_28_ltr.html
@@ -3,14 +3,10 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2<input>abc<img><img>def\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05D0|\u05D1\u05D2<input>abc<img><img>def\u05D3\u05D4\u05D5</div>'
-      : '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2<input>abc<img><img>def\u05D3\u05D4\u05D5</div>',
+  '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2<input>abc<img><img>def\u05D3\u05D4\u05D5</div>',
   '28-0 ltr left character');
 
 selection_test(
@@ -22,9 +18,7 @@
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1|\u05D2<input>abc<img><img>def\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2|<input>abc<img><img>def\u05D3\u05D4\u05D5</div>'
-      : '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2<input>abc<img><img>def\u05D3\u05D4\u05D5</div>',
+  '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2<input>abc<img><img>def\u05D3\u05D4\u05D5</div>',
   '28-2 ltr left character');
 
 selection_test(
@@ -84,9 +78,7 @@
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2<input>abc<img><img>def|\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2<input>abc<img><img>def\u05D3|\u05D4\u05D5</div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2<input>abc<img><img>de|f\u05D3\u05D4\u05D5</div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2<input>abc<img><img>de|f\u05D3\u05D4\u05D5</div>',
   '28-12 ltr left character');
 
 selection_test(
@@ -98,16 +90,12 @@
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2<input>abc<img><img>def\u05D3\u05D4|\u05D5</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2<input>abc<img><img>def\u05D3\u05D4\u05D5|</div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2<input>abc<img><img>def|\u05D3\u05D4\u05D5</div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2<input>abc<img><img>def|\u05D3\u05D4\u05D5</div>',
   '28-14 ltr left character');
 
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2<input>abc<img><img>def\u05D3\u05D4\u05D5|</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2<input>abc<img><img>de|f\u05D3\u05D4\u05D5</div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2<input>abc<img><img>def\u05D3|\u05D4\u05D5</div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2<input>abc<img><img>def\u05D3|\u05D4\u05D5</div>',
   '28-15 ltr left character');
 </script>
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_28_rtl.html b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_28_rtl.html
index f2512aa..1d511f6 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_28_rtl.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_28_rtl.html
@@ -3,8 +3,6 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="rtl">|\u05D0\u05D1\u05D2<input>abc<img><img>def\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'left', 'character'),
@@ -32,17 +30,13 @@
 selection_test(
   '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2<input>|abc<img><img>def\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2<input>abc<img><img>def\u05D3|\u05D4\u05D5</div>'
-      : '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2<input>abc<img><img>de|f\u05D3\u05D4\u05D5</div>',
+  '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2<input>abc<img><img>de|f\u05D3\u05D4\u05D5</div>',
   '28-4 rtl left character');
 
 selection_test(
   '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2<input>a|bc<img><img>def\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2<input>|abc<img><img>def\u05D3\u05D4\u05D5</div>'
-      : '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2<input>abc<img><img>def|\u05D3\u05D4\u05D5</div>',
+  '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2<input>abc<img><img>def|\u05D3\u05D4\u05D5</div>',
   '28-5 rtl left character');
 
 selection_test(
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_29_ltr.html b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_29_ltr.html
index b197f893..aeaae02 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_29_ltr.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_29_ltr.html
@@ -3,8 +3,6 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="ltr">|abc\u05D0\u05D1\u05D2<span>\u05D3\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'left', 'character'),
@@ -26,9 +24,7 @@
 selection_test(
   '<div contenteditable dir="ltr">abc|\u05D0\u05D1\u05D2<span>\u05D3\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">abc\u05d0|\u05d1\u05d2<span>\u05d3\u05d4\u05d5</span></div>'
-      : '<div contenteditable dir="ltr">ab|c\u05D0\u05D1\u05D2<span>\u05D3\u05D4\u05D5</span></div>',
+  '<div contenteditable dir="ltr">ab|c\u05D0\u05D1\u05D2<span>\u05D3\u05D4\u05D5</span></div>',
   '29-3 ltr left character');
 
 selection_test(
@@ -64,24 +60,18 @@
 selection_test(
   '<div contenteditable dir="ltr">abc\u05D0\u05D1\u05D2<span>\u05D3\u05D4|\u05D5</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">abc\u05d0\u05d1\u05d2<span>\u05d3\u05d4\u05d5|</span></div>'
-      : '<div contenteditable dir="ltr">abc|\u05D0\u05D1\u05D2<span>\u05D3\u05D4\u05D5</span></div>',
+  '<div contenteditable dir="ltr">abc|\u05D0\u05D1\u05D2<span>\u05D3\u05D4\u05D5</span></div>',
   '29-9 ltr left character');
 
 selection_test(
   '<div contenteditable dir="ltr">abc\u05D0\u05D1\u05D2<span>\u05D3\u05D4\u05D5|</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">ab|c\u05d0\u05d1\u05d2<span>\u05d3\u05d4\u05d5</span></div>'
-      : '<div contenteditable dir="ltr">abc\u05D0|\u05D1\u05D2<span>\u05D3\u05D4\u05D5</span></div>',
+  '<div contenteditable dir="ltr">abc\u05D0|\u05D1\u05D2<span>\u05D3\u05D4\u05D5</span></div>',
   '29-10 ltr left character');
 
 selection_test(
   '<div contenteditable dir="ltr">abc\u05D0\u05D1\u05D2<span>\u05D3\u05D4\u05D5</span>|</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">ab|c\u05d0\u05d1\u05d2<span>\u05d3\u05d4\u05d5</span></div>'
-      : '<div contenteditable dir="ltr">abc\u05D0|\u05D1\u05D2<span>\u05D3\u05D4\u05D5</span></div>',
+  '<div contenteditable dir="ltr">abc\u05D0|\u05D1\u05D2<span>\u05D3\u05D4\u05D5</span></div>',
   '29-11 ltr left character');
 </script>
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_29_rtl.html b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_29_rtl.html
index 80fa7f92..a4d9547 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_29_rtl.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_29_rtl.html
@@ -3,22 +3,16 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="rtl">|abc\u05D0\u05D1\u05D2<span>\u05D3\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc\u05d0|\u05d1\u05d2<span>\u05d3\u05d4\u05d5</span></div>'
-      : '<div contenteditable dir="rtl">ab|c\u05D0\u05D1\u05D2<span>\u05D3\u05D4\u05D5</span></div>',
+  '<div contenteditable dir="rtl">ab|c\u05D0\u05D1\u05D2<span>\u05D3\u05D4\u05D5</span></div>',
   '29-0 rtl left character');
 
 selection_test(
   '<div contenteditable dir="rtl">a|bc\u05D0\u05D1\u05D2<span>\u05D3\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">|abc\u05d0\u05d1\u05d2<span>\u05d3\u05d4\u05d5</span></div>'
-      : '<div contenteditable dir="rtl">abc|\u05D0\u05D1\u05D2<span>\u05D3\u05D4\u05D5</span></div>',
+  '<div contenteditable dir="rtl">abc|\u05D0\u05D1\u05D2<span>\u05D3\u05D4\u05D5</span></div>',
   '29-1 rtl left character');
 
 selection_test(
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_30_ltr.html b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_30_ltr.html
index 77c48d3..e48fdd62 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_30_ltr.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_30_ltr.html
@@ -3,14 +3,10 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2abc<span>def</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0|\u05d1\u05d2abc<span>def</span></div>'
-      : '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2abc<span>def</span></div>',
+  '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2abc<span>def</span></div>',
   '30-0 ltr left character');
 
 selection_test(
@@ -22,9 +18,7 @@
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1|\u05D2abc<span>def</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1\u05d2|abc<span>def</span></div>'
-      : '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2abc<span>def</span></div>',
+  '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2abc<span>def</span></div>',
   '30-2 ltr left character');
 
 selection_test(
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_30_rtl.html b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_30_rtl.html
index bc41af6..64930ad4 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_30_rtl.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_30_rtl.html
@@ -3,8 +3,6 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="rtl">|\u05D0\u05D1\u05D2abc<span>def</span></div>',
   selection => selection.modify('move', 'left', 'character'),
@@ -26,17 +24,13 @@
 selection_test(
   '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2|abc<span>def</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u05d0\u05d1\u05d2|abc<span>def</span></div>'
-      : '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2abc<span>de|f</span></div>',
+  '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2abc<span>de|f</span></div>',
   '30-3 rtl left character');
 
 selection_test(
   '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2a|bc<span>def</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u05d0\u05d1\u05d2|abc<span>def</span></div>'
-      : '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2abc<span>def|</span></div>',
+  '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2abc<span>def|</span></div>',
   '30-4 rtl left character');
 
 selection_test(
@@ -72,16 +66,12 @@
 selection_test(
   '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2abc<span>def|</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u05d0\u05d1\u05d2abc<span>de|f</span></div>'
-      : '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2abc<span>def|</span></div>',
+  '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2abc<span>def|</span></div>',
   '30-10 rtl left character');
 
 selection_test(
   '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2abc<span>def</span>|</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u05d0\u05d1\u05d2abc<span>de|f</span></div>'
-      : '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2abc<span>def</span>|</div>',
+  '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2abc<span>def</span>|</div>',
   '30-11 rtl left character');
 </script>
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_31_ltr.html b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_31_ltr.html
index b3be925..6f3dbea 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_31_ltr.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_31_ltr.html
@@ -3,8 +3,6 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="ltr">|ab<span>c\u05D0\u05D1\u05D2def</span></div>',
   selection => selection.modify('move', 'left', 'character'),
@@ -32,9 +30,7 @@
 selection_test(
   '<div contenteditable dir="ltr">ab<span>c|\u05D0\u05D1\u05D2def</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">ab<span>c\u05d0|\u05d1\u05d2def</span></div>'
-      : '<div contenteditable dir="ltr">ab|<span>c\u05D0\u05D1\u05D2def</span></div>',
+  '<div contenteditable dir="ltr">ab|<span>c\u05D0\u05D1\u05D2def</span></div>',
   '31-4 ltr left character');
 
 selection_test(
@@ -46,9 +42,7 @@
 selection_test(
   '<div contenteditable dir="ltr">ab<span>c\u05D0\u05D1|\u05D2def</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">ab<span>c\u05d0\u05d1\u05d2|def</span></div>'
-      : '<div contenteditable dir="ltr">ab<span>c|\u05D0\u05D1\u05D2def</span></div>',
+  '<div contenteditable dir="ltr">ab<span>c|\u05D0\u05D1\u05D2def</span></div>',
   '31-6 ltr left character');
 
 selection_test(
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_31_rtl.html b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_31_rtl.html
index 1e44a60..bf743c04 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_31_rtl.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_31_rtl.html
@@ -3,22 +3,16 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="rtl">|ab<span>c\u05D0\u05D1\u05D2def</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">ab<span>c\u05d0|\u05d1\u05d2def</span></div>'
-      : '<div contenteditable dir="rtl">ab|<span>c\u05D0\u05D1\u05D2def</span></div>',
+  '<div contenteditable dir="rtl">ab|<span>c\u05D0\u05D1\u05D2def</span></div>',
   '31-0 rtl left character');
 
 selection_test(
   '<div contenteditable dir="rtl">a|b<span>c\u05D0\u05D1\u05D2def</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">|ab<span>c\u05d0\u05d1\u05d2def</span></div>'
-      : '<div contenteditable dir="rtl">ab<span>c|\u05D0\u05D1\u05D2def</span></div>',
+  '<div contenteditable dir="rtl">ab<span>c|\u05D0\u05D1\u05D2def</span></div>',
   '31-1 rtl left character');
 
 selection_test(
@@ -54,17 +48,13 @@
 selection_test(
   '<div contenteditable dir="rtl">ab<span>c\u05D0\u05D1\u05D2|def</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">ab<span>c\u05d0\u05d1\u05d2|def</span></div>'
-      : '<div contenteditable dir="rtl">ab<span>c\u05D0\u05D1\u05D2de|f</span></div>',
+  '<div contenteditable dir="rtl">ab<span>c\u05D0\u05D1\u05D2de|f</span></div>',
   '31-7 rtl left character');
 
 selection_test(
   '<div contenteditable dir="rtl">ab<span>c\u05D0\u05D1\u05D2d|ef</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">ab<span>c\u05d0\u05d1\u05d2|def</span></div>'
-      : '<div contenteditable dir="rtl">ab<span>c\u05D0\u05D1\u05D2def|</span></div>',
+  '<div contenteditable dir="rtl">ab<span>c\u05D0\u05D1\u05D2def|</span></div>',
   '31-8 rtl left character');
 
 selection_test(
@@ -76,16 +66,12 @@
 selection_test(
   '<div contenteditable dir="rtl">ab<span>c\u05D0\u05D1\u05D2def|</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">ab<span>c\u05d0\u05d1\u05d2de|f</span></div>'
-      : '<div contenteditable dir="rtl">ab<span>c\u05D0\u05D1\u05D2def|</span></div>',
+  '<div contenteditable dir="rtl">ab<span>c\u05D0\u05D1\u05D2def|</span></div>',
   '31-10 rtl left character');
 
 selection_test(
   '<div contenteditable dir="rtl">ab<span>c\u05D0\u05D1\u05D2def</span>|</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">ab<span>c\u05d0\u05d1\u05d2de|f</span></div>'
-      : '<div contenteditable dir="rtl">ab<span>c\u05D0\u05D1\u05D2def</span>|</div>',
+  '<div contenteditable dir="rtl">ab<span>c\u05D0\u05D1\u05D2def</span>|</div>',
   '31-11 rtl left character');
 </script>
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_32_ltr.html b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_32_ltr.html
index 00c3a02..9f309cd4 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_32_ltr.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_32_ltr.html
@@ -3,14 +3,10 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="ltr">|\u05D0\u05D1<span>\u05D2abc\u05D3\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0|\u05d1<span>\u05d2abc\u05d3\u05d4\u05d5</span></div>'
-      : '<div contenteditable dir="ltr">|\u05D0\u05D1<span>\u05D2abc\u05D3\u05D4\u05D5</span></div>',
+  '<div contenteditable dir="ltr">|\u05D0\u05D1<span>\u05D2abc\u05D3\u05D4\u05D5</span></div>',
   '32-0 ltr left character');
 
 selection_test(
@@ -22,17 +18,13 @@
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1|<span>\u05D2abc\u05D3\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1<span>\u05d2|abc\u05d3\u05d4\u05d5</span></div>'
-      : '<div contenteditable dir="ltr">|\u05D0\u05D1<span>\u05D2abc\u05D3\u05D4\u05D5</span></div>',
+  '<div contenteditable dir="ltr">|\u05D0\u05D1<span>\u05D2abc\u05D3\u05D4\u05D5</span></div>',
   '32-2 ltr left character');
 
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1<span>|\u05D2abc\u05D3\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1<span>\u05d2|abc\u05d3\u05d4\u05d5</span></div>'
-      : '<div contenteditable dir="ltr">|\u05D0\u05D1<span>\u05D2abc\u05D3\u05D4\u05D5</span></div>',
+  '<div contenteditable dir="ltr">|\u05D0\u05D1<span>\u05D2abc\u05D3\u05D4\u05D5</span></div>',
   '32-3 ltr left character');
 
 selection_test(
@@ -56,9 +48,7 @@
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1<span>\u05D2abc|\u05D3\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1<span>\u05d2abc\u05d3|\u05d4\u05d5</span></div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1<span>\u05D2ab|c\u05D3\u05D4\u05D5</span></div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1<span>\u05D2ab|c\u05D3\u05D4\u05D5</span></div>',
   '32-7 ltr left character');
 
 selection_test(
@@ -70,24 +60,18 @@
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1<span>\u05D2abc\u05D3\u05D4|\u05D5</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1<span>\u05d2abc\u05d3\u05d4\u05d5|</span></div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1<span>\u05D2abc|\u05D3\u05D4\u05D5</span></div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1<span>\u05D2abc|\u05D3\u05D4\u05D5</span></div>',
   '32-9 ltr left character');
 
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1<span>\u05D2abc\u05D3\u05D4\u05D5|</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1<span>\u05d2ab|c\u05d3\u05d4\u05d5</span></div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1<span>\u05D2abc\u05D3|\u05D4\u05D5</span></div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1<span>\u05D2abc\u05D3|\u05D4\u05D5</span></div>',
   '32-10 ltr left character');
 
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1<span>\u05D2abc\u05D3\u05D4\u05D5</span>|</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1<span>\u05d2ab|c\u05d3\u05d4\u05d5</span></div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1<span>\u05D2abc\u05D3|\u05D4\u05D5</span></div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1<span>\u05D2abc\u05D3|\u05D4\u05D5</span></div>',
   '32-11 ltr left character');
 </script>
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_32_rtl.html b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_32_rtl.html
index 2e47540..3aa0c11d 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_32_rtl.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_32_rtl.html
@@ -3,8 +3,6 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="rtl">|\u05D0\u05D1<span>\u05D2abc\u05D3\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'left', 'character'),
@@ -32,17 +30,13 @@
 selection_test(
   '<div contenteditable dir="rtl">\u05D0\u05D1<span>\u05D2|abc\u05D3\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u05d0\u05d1<span>\u05d2abc\u05d3|\u05d4\u05d5</span></div>'
-      : '<div contenteditable dir="rtl">\u05D0\u05D1<span>\u05D2ab|c\u05D3\u05D4\u05D5</span></div>',
+  '<div contenteditable dir="rtl">\u05D0\u05D1<span>\u05D2ab|c\u05D3\u05D4\u05D5</span></div>',
   '32-4 rtl left character');
 
 selection_test(
   '<div contenteditable dir="rtl">\u05D0\u05D1<span>\u05D2a|bc\u05D3\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u05d0\u05d1<span>\u05d2|abc\u05d3\u05d4\u05d5</span></div>'
-      : '<div contenteditable dir="rtl">\u05D0\u05D1<span>\u05D2abc|\u05D3\u05D4\u05D5</span></div>',
+  '<div contenteditable dir="rtl">\u05D0\u05D1<span>\u05D2abc|\u05D3\u05D4\u05D5</span></div>',
   '32-5 rtl left character');
 
 selection_test(
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_33_ltr.html b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_33_ltr.html
index 006ed22..1ef4e11 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_33_ltr.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_33_ltr.html
@@ -3,8 +3,6 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="ltr">|abc<span>\u05D0\u05D1\u05D2def</span></div>',
   selection => selection.modify('move', 'left', 'character'),
@@ -26,17 +24,13 @@
 selection_test(
   '<div contenteditable dir="ltr">abc|<span>\u05D0\u05D1\u05D2def</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">abc<span>\u05d0|\u05d1\u05d2def</span></div>'
-      : '<div contenteditable dir="ltr">ab|c<span>\u05D0\u05D1\u05D2def</span></div>',
+  '<div contenteditable dir="ltr">ab|c<span>\u05D0\u05D1\u05D2def</span></div>',
   '33-3 ltr left character');
 
 selection_test(
   '<div contenteditable dir="ltr">abc<span>|\u05D0\u05D1\u05D2def</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">abc<span>\u05d0|\u05d1\u05d2def</span></div>'
-      : '<div contenteditable dir="ltr">ab|c<span>\u05D0\u05D1\u05D2def</span></div>',
+  '<div contenteditable dir="ltr">ab|c<span>\u05D0\u05D1\u05D2def</span></div>',
   '33-4 ltr left character');
 
 selection_test(
@@ -48,9 +42,7 @@
 selection_test(
   '<div contenteditable dir="ltr">abc<span>\u05D0\u05D1|\u05D2def</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">abc<span>\u05d0\u05d1\u05d2|def</span></div>'
-      : '<div contenteditable dir="ltr">abc|<span>\u05D0\u05D1\u05D2def</span></div>',
+  '<div contenteditable dir="ltr">abc|<span>\u05D0\u05D1\u05D2def</span></div>',
   '33-6 ltr left character');
 
 selection_test(
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_33_rtl.html b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_33_rtl.html
index 46d80a7..13c6155 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_33_rtl.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_33_rtl.html
@@ -3,22 +3,16 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="rtl">|abc<span>\u05D0\u05D1\u05D2def</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc<span>\u05d0|\u05d1\u05d2def</span></div>'
-      : '<div contenteditable dir="rtl">ab|c<span>\u05D0\u05D1\u05D2def</span></div>',
+  '<div contenteditable dir="rtl">ab|c<span>\u05D0\u05D1\u05D2def</span></div>',
   '33-0 rtl left character');
 
 selection_test(
   '<div contenteditable dir="rtl">a|bc<span>\u05D0\u05D1\u05D2def</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">|abc<span>\u05d0\u05d1\u05d2def</span></div>'
-      : '<div contenteditable dir="rtl">abc|<span>\u05D0\u05D1\u05D2def</span></div>',
+  '<div contenteditable dir="rtl">abc|<span>\u05D0\u05D1\u05D2def</span></div>',
   '33-1 rtl left character');
 
 selection_test(
@@ -54,17 +48,13 @@
 selection_test(
   '<div contenteditable dir="rtl">abc<span>\u05D0\u05D1\u05D2|def</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc<span>\u05d0\u05d1\u05d2|def</span></div>'
-      : '<div contenteditable dir="rtl">abc<span>\u05D0\u05D1\u05D2de|f</span></div>',
+  '<div contenteditable dir="rtl">abc<span>\u05D0\u05D1\u05D2de|f</span></div>',
   '33-7 rtl left character');
 
 selection_test(
   '<div contenteditable dir="rtl">abc<span>\u05D0\u05D1\u05D2d|ef</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc<span>\u05d0\u05d1\u05d2|def</span></div>'
-      : '<div contenteditable dir="rtl">abc<span>\u05D0\u05D1\u05D2def|</span></div>',
+  '<div contenteditable dir="rtl">abc<span>\u05D0\u05D1\u05D2def|</span></div>',
   '33-8 rtl left character');
 
 selection_test(
@@ -76,16 +66,12 @@
 selection_test(
   '<div contenteditable dir="rtl">abc<span>\u05D0\u05D1\u05D2def|</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc<span>\u05d0\u05d1\u05d2de|f</span></div>'
-      : '<div contenteditable dir="rtl">abc<span>\u05D0\u05D1\u05D2def|</span></div>',
+  '<div contenteditable dir="rtl">abc<span>\u05D0\u05D1\u05D2def|</span></div>',
   '33-10 rtl left character');
 
 selection_test(
   '<div contenteditable dir="rtl">abc<span>\u05D0\u05D1\u05D2def</span>|</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc<span>\u05d0\u05d1\u05d2de|f</span></div>'
-      : '<div contenteditable dir="rtl">abc<span>\u05D0\u05D1\u05D2def</span>|</div>',
+  '<div contenteditable dir="rtl">abc<span>\u05D0\u05D1\u05D2def</span>|</div>',
   '33-11 rtl left character');
 </script>
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_34_ltr.html b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_34_ltr.html
index 9cbcd277..1a5f97a 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_34_ltr.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_34_ltr.html
@@ -3,14 +3,10 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2<span>abc\u05D3\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0|\u05d1\u05d2<span>abc\u05d3\u05d4\u05d5</span></div>'
-      : '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2<span>abc\u05D3\u05D4\u05D5</span></div>',
+  '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2<span>abc\u05D3\u05D4\u05D5</span></div>',
   '34-0 ltr left character');
 
 selection_test(
@@ -22,9 +18,7 @@
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1|\u05D2<span>abc\u05D3\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1\u05d2|<span>abc\u05d3\u05d4\u05d5</span></div>'
-      : '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2<span>abc\u05D3\u05D4\u05D5</span></div>',
+  '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2<span>abc\u05D3\u05D4\u05D5</span></div>',
   '34-2 ltr left character');
 
 selection_test(
@@ -54,9 +48,7 @@
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2<span>abc|\u05D3\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1\u05d2<span>abc\u05d3|\u05d4\u05d5</span></div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2<span>ab|c\u05D3\u05D4\u05D5</span></div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2<span>ab|c\u05D3\u05D4\u05D5</span></div>',
   '34-7 ltr left character');
 
 selection_test(
@@ -68,24 +60,18 @@
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2<span>abc\u05D3\u05D4|\u05D5</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1\u05d2<span>abc\u05d3\u05d4\u05d5|</span></div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2<span>abc|\u05D3\u05D4\u05D5</span></div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2<span>abc|\u05D3\u05D4\u05D5</span></div>',
   '34-9 ltr left character');
 
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2<span>abc\u05D3\u05D4\u05D5|</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1\u05d2<span>ab|c\u05d3\u05d4\u05d5</span></div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2<span>abc\u05D3|\u05D4\u05D5</span></div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2<span>abc\u05D3|\u05D4\u05D5</span></div>',
   '34-10 ltr left character');
 
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2<span>abc\u05D3\u05D4\u05D5</span>|</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1\u05d2<span>ab|c\u05d3\u05d4\u05d5</span></div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2<span>abc\u05D3|\u05D4\u05D5</span></div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2<span>abc\u05D3|\u05D4\u05D5</span></div>',
   '34-11 ltr left character');
 </script>
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_34_rtl.html b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_34_rtl.html
index b16fd00..d5f83dfa 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_34_rtl.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_34_rtl.html
@@ -3,8 +3,6 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="rtl">|\u05D0\u05D1\u05D2<span>abc\u05D3\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'left', 'character'),
@@ -26,25 +24,19 @@
 selection_test(
   '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2|<span>abc\u05D3\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u05d0\u05d1\u05d2<span>abc\u05d3|\u05d4\u05d5</span></div>'
-      : '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2<span>ab|c\u05D3\u05D4\u05D5</span></div>',
+  '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2<span>ab|c\u05D3\u05D4\u05D5</span></div>',
   '34-3 rtl left character');
 
 selection_test(
   '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2<span>|abc\u05D3\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u05d0\u05d1\u05d2<span>abc\u05d3|\u05d4\u05d5</span></div>'
-      : '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2<span>ab|c\u05D3\u05D4\u05D5</span></div>',
+  '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2<span>ab|c\u05D3\u05D4\u05D5</span></div>',
   '34-4 rtl left character');
 
 selection_test(
   '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2<span>a|bc\u05D3\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u05d0\u05d1\u05d2|<span>abc\u05d3\u05d4\u05d5</span></div>'
-      : '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2<span>abc|\u05D3\u05D4\u05D5</span></div>',
+  '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2<span>abc|\u05D3\u05D4\u05D5</span></div>',
   '34-5 rtl left character');
 
 selection_test(
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_35_ltr.html b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_35_ltr.html
index 56a547a..f10bca2 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_35_ltr.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_35_ltr.html
@@ -3,8 +3,6 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="ltr">|abc\u05D0def</div>',
   selection => selection.modify('move', 'left', 'character'),
@@ -26,17 +24,13 @@
 selection_test(
   '<div contenteditable dir="ltr">abc|\u05D0def</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">abc\u05D0|def</div>'
-      : '<div contenteditable dir="ltr">ab|c\u05D0def</div>',
+  '<div contenteditable dir="ltr">ab|c\u05D0def</div>',
   '35-3 ltr left character');
 
 selection_test(
   '<div contenteditable dir="ltr">abc\u05D0|def</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">abc\u05D0|def</div>'
-      : '<div contenteditable dir="ltr">abc|\u05D0def</div>',
+  '<div contenteditable dir="ltr">abc|\u05D0def</div>',
   '35-4 ltr left character');
 
 selection_test(
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_35_rtl.html b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_35_rtl.html
index c7f53ee2..925732e 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_35_rtl.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_35_rtl.html
@@ -3,22 +3,16 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="rtl">|abc\u05D0def</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc\u05D0|def</div>'
-      : '<div contenteditable dir="rtl">ab|c\u05D0def</div>',
+  '<div contenteditable dir="rtl">ab|c\u05D0def</div>',
   '35-0 rtl left character');
 
 selection_test(
   '<div contenteditable dir="rtl">a|bc\u05D0def</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">|abc\u05D0def</div>'
-      : '<div contenteditable dir="rtl">abc|\u05D0def</div>',
+  '<div contenteditable dir="rtl">abc|\u05D0def</div>',
   '35-1 rtl left character');
 
 selection_test(
@@ -36,17 +30,13 @@
 selection_test(
   '<div contenteditable dir="rtl">abc\u05D0|def</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc\u05D0|def</div>'
-      : '<div contenteditable dir="rtl">abc\u05D0de|f</div>',
+  '<div contenteditable dir="rtl">abc\u05D0de|f</div>',
   '35-4 rtl left character');
 
 selection_test(
   '<div contenteditable dir="rtl">abc\u05D0d|ef</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc\u05D0|def</div>'
-      : '<div contenteditable dir="rtl">abc\u05D0def|</div>',
+  '<div contenteditable dir="rtl">abc\u05D0def|</div>',
   '35-5 rtl left character');
 
 selection_test(
@@ -58,8 +48,6 @@
 selection_test(
   '<div contenteditable dir="rtl">abc\u05D0def|</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc\u05D0de|f</div>'
-      : '<div contenteditable dir="rtl">abc\u05D0def|</div>',
+  '<div contenteditable dir="rtl">abc\u05D0def|</div>',
   '35-7 rtl left character');
 </script>
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_36_ltr.html b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_36_ltr.html
index 28c720b..de7a945 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_36_ltr.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_36_ltr.html
@@ -3,14 +3,10 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2a\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05D0|\u05D1\u05D2a\u05D3\u05D4\u05D5</div>'
-      : '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2a\u05D3\u05D4\u05D5</div>',
+  '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2a\u05D3\u05D4\u05D5</div>',
   '36-0 ltr left character');
 
 selection_test(
@@ -22,9 +18,7 @@
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1|\u05D2a\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2|a\u05D3\u05D4\u05D5</div>'
-      : '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2a\u05D3\u05D4\u05D5</div>',
+  '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2a\u05D3\u05D4\u05D5</div>',
   '36-2 ltr left character');
 
 selection_test(
@@ -36,9 +30,7 @@
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2a|\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2a\u05D3|\u05D4\u05D5</div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2|a\u05D3\u05D4\u05D5</div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2|a\u05D3\u05D4\u05D5</div>',
   '36-4 ltr left character');
 
 selection_test(
@@ -50,16 +42,12 @@
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2a\u05D3\u05D4|\u05D5</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2a\u05D3\u05D4\u05D5|</div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2a|\u05D3\u05D4\u05D5</div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2a|\u05D3\u05D4\u05D5</div>',
   '36-6 ltr left character');
 
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2a\u05D3\u05D4\u05D5|</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2|a\u05D3\u05D4\u05D5</div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2a\u05D3|\u05D4\u05D5</div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2a\u05D3|\u05D4\u05D5</div>',
   '36-7 ltr left character');
 </script>
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_36_rtl.html b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_36_rtl.html
index c950e1b..e7e04215 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_36_rtl.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_36_rtl.html
@@ -3,8 +3,6 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="rtl">|\u05D0\u05D1\u05D2a\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'left', 'character'),
@@ -26,9 +24,7 @@
 selection_test(
   '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2|a\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2a\u05D3|\u05D4\u05D5</div>'
-      : '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2a|\u05D3\u05D4\u05D5</div>',
+  '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2a|\u05D3\u05D4\u05D5</div>',
   '36-3 rtl left character');
 
 selection_test(
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_37_ltr.html b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_37_ltr.html
index 3104db3d..dd6a145 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_37_ltr.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_37_ltr.html
@@ -3,8 +3,6 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="ltr">|abc\u05D0\u05D1\u05D2<span>def</span></div>',
   selection => selection.modify('move', 'left', 'character'),
@@ -26,9 +24,7 @@
 selection_test(
   '<div contenteditable dir="ltr">abc|\u05D0\u05D1\u05D2<span>def</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">abc\u05d0|\u05d1\u05d2<span>def</span></div>'
-      : '<div contenteditable dir="ltr">ab|c\u05D0\u05D1\u05D2<span>def</span></div>',
+  '<div contenteditable dir="ltr">ab|c\u05D0\u05D1\u05D2<span>def</span></div>',
   '37-3 ltr left character');
 
 selection_test(
@@ -40,9 +36,7 @@
 selection_test(
   '<div contenteditable dir="ltr">abc\u05D0\u05D1|\u05D2<span>def</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">abc\u05d0\u05d1\u05d2|<span>def</span></div>'
-      : '<div contenteditable dir="ltr">abc|\u05D0\u05D1\u05D2<span>def</span></div>',
+  '<div contenteditable dir="ltr">abc|\u05D0\u05D1\u05D2<span>def</span></div>',
   '37-5 ltr left character');
 
 selection_test(
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_37_rtl.html b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_37_rtl.html
index 8a947aa..1bfbe8e 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_37_rtl.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_37_rtl.html
@@ -3,22 +3,16 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="rtl">|abc\u05D0\u05D1\u05D2<span>def</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc\u05D0|\u05D1\u05D2<span>def</span></div>'
-      : '<div contenteditable dir="rtl">ab|c\u05D0\u05D1\u05D2<span>def</span></div>',
+  '<div contenteditable dir="rtl">ab|c\u05D0\u05D1\u05D2<span>def</span></div>',
   '37-0 rtl left character');
 
 selection_test(
   '<div contenteditable dir="rtl">a|bc\u05D0\u05D1\u05D2<span>def</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">|abc\u05D0\u05D1\u05D2<span>def</span></div>'
-      : '<div contenteditable dir="rtl">abc|\u05D0\u05D1\u05D2<span>def</span></div>',
+  '<div contenteditable dir="rtl">abc|\u05D0\u05D1\u05D2<span>def</span></div>',
   '37-1 rtl left character');
 
 selection_test(
@@ -48,25 +42,19 @@
 selection_test(
   '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2|<span>def</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2|<span>def</span></div>'
-      : '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2<span>de|f</span></div>',
+  '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2<span>de|f</span></div>',
   '37-6 rtl left character');
 
 selection_test(
   '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2<span>|def</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2<span>|def</span></div>'
-      : '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2<span>de|f</span></div>',
+  '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2<span>de|f</span></div>',
   '37-7 rtl left character');
 
 selection_test(
   '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2<span>d|ef</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2|<span>def</span></div>'
-      : '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2<span>def|</span></div>',
+  '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2<span>def|</span></div>',
   '37-8 rtl left character');
 
 selection_test(
@@ -78,16 +66,12 @@
 selection_test(
   '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2<span>def|</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2<span>de|f</span></div>'
-      : '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2<span>def|</span></div>',
+  '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2<span>def|</span></div>',
   '37-10 rtl left character');
 
 selection_test(
   '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2<span>def</span>|</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2<span>de|f</span></div>'
-      : '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2<span>def</span>|</div>',
+  '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2<span>def</span>|</div>',
   '37-11 rtl left character');
 </script>
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_38_ltr.html b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_38_ltr.html
index a8d5ff8..87cc808 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_38_ltr.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_38_ltr.html
@@ -3,14 +3,10 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2abc<span>\u05D3\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0|\u05d1\u05d2abc<span>\u05d3\u05d4\u05d5</span></div>'
-      : '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2abc<span>\u05D3\u05D4\u05D5</span></div>',
+  '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2abc<span>\u05D3\u05D4\u05D5</span></div>',
   '38-0 ltr left character');
 
 selection_test(
@@ -22,9 +18,7 @@
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1|\u05D2abc<span>\u05D3\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1\u05d2|abc<span>\u05d3\u05d4\u05d5</span></div>'
-      : '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2abc<span>\u05D3\u05D4\u05D5</span></div>',
+  '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2abc<span>\u05D3\u05D4\u05D5</span></div>',
   '38-2 ltr left character');
 
 selection_test(
@@ -48,17 +42,13 @@
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2abc|<span>\u05D3\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1\u05d2abc<span>\u05d3|\u05d4\u05d5</span></div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2ab|c<span>\u05D3\u05D4\u05D5</span></div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2ab|c<span>\u05D3\u05D4\u05D5</span></div>',
   '38-6 ltr left character');
 
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2abc<span>|\u05D3\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1\u05d2abc<span>\u05d3|\u05d4\u05d5</span></div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2ab|c<span>\u05D3\u05D4\u05D5</span></div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2ab|c<span>\u05D3\u05D4\u05D5</span></div>',
   '38-7 ltr left character');
 
 selection_test(
@@ -70,24 +60,18 @@
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2abc<span>\u05D3\u05D4|\u05D5</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1\u05d2abc<span>\u05d3\u05d4\u05d5|</span></div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2abc|<span>\u05D3\u05D4\u05D5</span></div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2abc|<span>\u05D3\u05D4\u05D5</span></div>',
   '38-9 ltr left character');
 
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2abc<span>\u05D3\u05D4\u05D5|</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1\u05d2ab|c<span>\u05d3\u05d4\u05d5</span></div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2abc<span>\u05D3|\u05D4\u05D5</span></div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2abc<span>\u05D3|\u05D4\u05D5</span></div>',
   '38-10 ltr left character');
 
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2abc<span>\u05D3\u05D4\u05D5</span>|</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1\u05d2ab|c<span>\u05d3\u05d4\u05d5</span></div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2abc<span>\u05D3|\u05D4\u05D5</span></div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2abc<span>\u05D3|\u05D4\u05D5</span></div>',
   '38-11 ltr left character');
 </script>
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_38_rtl.html b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_38_rtl.html
index 05276330..6a82cf7 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_38_rtl.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_38_rtl.html
@@ -3,8 +3,6 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="rtl">|\u05D0\u05D1\u05D2abc<span>\u05D3\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'left', 'character'),
@@ -26,17 +24,13 @@
 selection_test(
   '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2|abc<span>\u05D3\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2abc<span>\u05D3|\u05D4\u05D5</span></div>'
-      : '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2ab|c<span>\u05D3\u05D4\u05D5</span></div>',
+  '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2ab|c<span>\u05D3\u05D4\u05D5</span></div>',
   '38-3 rtl left character');
 
 selection_test(
   '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2a|bc<span>\u05D3\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2|abc<span>\u05D3\u05D4\u05D5</span></div>'
-      : '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2abc|<span>\u05D3\u05D4\u05D5</span></div>',
+  '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2abc|<span>\u05D3\u05D4\u05D5</span></div>',
   '38-4 rtl left character');
 
 selection_test(
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_39_ltr.html b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_39_ltr.html
index 751e853..68a2965 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_39_ltr.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_39_ltr.html
@@ -3,8 +3,6 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="ltr">|abc\u05D0<span>\u05D1\u05D2def</span></div>',
   selection => selection.modify('move', 'left', 'character'),
@@ -26,9 +24,7 @@
 selection_test(
   '<div contenteditable dir="ltr">abc|\u05D0<span>\u05D1\u05D2def</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">abc\u05d0|<span>\u05d1\u05d2def</span></div>'
-      : '<div contenteditable dir="ltr">ab|c\u05D0<span>\u05D1\u05D2def</span></div>',
+  '<div contenteditable dir="ltr">ab|c\u05D0<span>\u05D1\u05D2def</span></div>',
   '39-3 ltr left character');
 
 selection_test(
@@ -46,9 +42,7 @@
 selection_test(
   '<div contenteditable dir="ltr">abc\u05D0<span>\u05D1|\u05D2def</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">abc\u05d0<span>\u05d1\u05d2|def</span></div>'
-      : '<div contenteditable dir="ltr">abc|\u05D0<span>\u05D1\u05D2def</span></div>',
+  '<div contenteditable dir="ltr">abc|\u05D0<span>\u05D1\u05D2def</span></div>',
   '39-6 ltr left character');
 
 selection_test(
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_39_rtl.html b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_39_rtl.html
index 2d2ecd9..2a409037 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_39_rtl.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_39_rtl.html
@@ -3,22 +3,16 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="rtl">|abc\u05D0<span>\u05D1\u05D2def</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc\u05d0|<span>\u05d1\u05d2def</span></div>'
-      : '<div contenteditable dir="rtl">ab|c\u05D0<span>\u05D1\u05D2def</span></div>',
+  '<div contenteditable dir="rtl">ab|c\u05D0<span>\u05D1\u05D2def</span></div>',
   '39-0 rtl left character');
 
 selection_test(
   '<div contenteditable dir="rtl">a|bc\u05D0<span>\u05D1\u05D2def</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">|abc\u05d0<span>\u05d1\u05d2def</span></div>'
-      : '<div contenteditable dir="rtl">abc|\u05D0<span>\u05D1\u05D2def</span></div>',
+  '<div contenteditable dir="rtl">abc|\u05D0<span>\u05D1\u05D2def</span></div>',
   '39-1 rtl left character');
 
 selection_test(
@@ -54,17 +48,13 @@
 selection_test(
   '<div contenteditable dir="rtl">abc\u05D0<span>\u05D1\u05D2|def</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc\u05d0<span>\u05d1\u05d2|def</span></div>'
-      : '<div contenteditable dir="rtl">abc\u05D0<span>\u05D1\u05D2de|f</span></div>',
+  '<div contenteditable dir="rtl">abc\u05D0<span>\u05D1\u05D2de|f</span></div>',
   '39-7 rtl left character');
 
 selection_test(
   '<div contenteditable dir="rtl">abc\u05D0<span>\u05D1\u05D2d|ef</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc\u05d0<span>\u05d1\u05d2|def</span></div>'
-      : '<div contenteditable dir="rtl">abc\u05D0<span>\u05D1\u05D2def|</span></div>',
+  '<div contenteditable dir="rtl">abc\u05D0<span>\u05D1\u05D2def|</span></div>',
   '39-8 rtl left character');
 
 selection_test(
@@ -76,16 +66,12 @@
 selection_test(
   '<div contenteditable dir="rtl">abc\u05D0<span>\u05D1\u05D2def|</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc\u05d0<span>\u05d1\u05d2de|f</span></div>'
-      : '<div contenteditable dir="rtl">abc\u05D0<span>\u05D1\u05D2def|</span></div>',
+  '<div contenteditable dir="rtl">abc\u05D0<span>\u05D1\u05D2def|</span></div>',
   '39-10 rtl left character');
 
 selection_test(
   '<div contenteditable dir="rtl">abc\u05D0<span>\u05D1\u05D2def</span>|</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc\u05d0<span>\u05d1\u05d2de|f</span></div>'
-      : '<div contenteditable dir="rtl">abc\u05D0<span>\u05D1\u05D2def</span>|</div>',
+  '<div contenteditable dir="rtl">abc\u05D0<span>\u05D1\u05D2def</span>|</div>',
   '39-11 rtl left character');
 </script>
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_40_ltr.html b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_40_ltr.html
index 9f26225..1b1732c 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_40_ltr.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_40_ltr.html
@@ -3,14 +3,10 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2a<span>bc\u05D3\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0|\u05d1\u05d2a<span>bc\u05d3\u05d4\u05d5</span></div>'
-      : '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2a<span>bc\u05D3\u05D4\u05D5</span></div>',
+  '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2a<span>bc\u05D3\u05D4\u05D5</span></div>',
   '40-0 ltr left character');
 
 selection_test(
@@ -22,9 +18,7 @@
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1|\u05D2a<span>bc\u05D3\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1\u05d2|a<span>bc\u05d3\u05d4\u05d5</span></div>'
-      : '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2a<span>bc\u05D3\u05D4\u05D5</span></div>',
+  '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2a<span>bc\u05D3\u05D4\u05D5</span></div>',
   '40-2 ltr left character');
 
 selection_test(
@@ -54,9 +48,7 @@
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2a<span>bc|\u05D3\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1\u05d2a<span>bc\u05d3|\u05d4\u05d5</span></div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2a<span>b|c\u05D3\u05D4\u05D5</span></div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2a<span>b|c\u05D3\u05D4\u05D5</span></div>',
   '40-7 ltr left character');
 
 selection_test(
@@ -68,24 +60,18 @@
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2a<span>bc\u05D3\u05D4|\u05D5</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1\u05d2a<span>bc\u05d3\u05d4\u05d5|</span></div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2a<span>bc|\u05D3\u05D4\u05D5</span></div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2a<span>bc|\u05D3\u05D4\u05D5</span></div>',
   '40-9 ltr left character');
 
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2a<span>bc\u05D3\u05D4\u05D5|</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1\u05d2a<span>b|c\u05d3\u05d4\u05d5</span></div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2a<span>bc\u05D3|\u05D4\u05D5</span></div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2a<span>bc\u05D3|\u05D4\u05D5</span></div>',
   '40-10 ltr left character');
 
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2a<span>bc\u05D3\u05D4\u05D5</span>|</div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1\u05d2a<span>b|c\u05d3\u05d4\u05d5</span></div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2a<span>bc\u05D3|\u05D4\u05D5</span></div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2a<span>bc\u05D3|\u05D4\u05D5</span></div>',
   '40-11 ltr left character');
 </script>
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_40_rtl.html b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_40_rtl.html
index 441937c..485a0c1 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_40_rtl.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_40_rtl.html
@@ -3,8 +3,6 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="rtl">|\u05D0\u05D1\u05D2a<span>bc\u05D3\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'left', 'character'),
@@ -26,25 +24,19 @@
 selection_test(
   '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2|a<span>bc\u05D3\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u05d0\u05d1\u05d2a<span>bc\u05d3|\u05d4\u05d5</span></div>'
-      : '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2a<span>b|c\u05D3\u05D4\u05D5</span></div>',
+  '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2a<span>b|c\u05D3\u05D4\u05D5</span></div>',
   '40-3 rtl left character');
 
 selection_test(
   '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2a|<span>bc\u05D3\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u05d0\u05d1\u05d2|a<span>bc\u05d3\u05d4\u05d5</span></div>'
-      : '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2a<span>bc|\u05D3\u05D4\u05D5</span></div>',
+  '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2a<span>bc|\u05D3\u05D4\u05D5</span></div>',
   '40-4 rtl left character');
 
 selection_test(
   '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2a<span>|bc\u05D3\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u05d0\u05d1\u05d2|a<span>bc\u05d3\u05d4\u05d5</span></div>'
-      : '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2a<span>bc|\u05D3\u05D4\u05D5</span></div>',
+  '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2a<span>bc|\u05D3\u05D4\u05D5</span></div>',
   '40-5 rtl left character');
 
 selection_test(
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_43_ltr.html b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_43_ltr.html
index b74c48e..a2e135f 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_43_ltr.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_43_ltr.html
@@ -3,30 +3,22 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="ltr">|<span dir="rtl">abc\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0def</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr"><span dir="rtl">abc\u05E7|\u05E7\u05E7123\u05E0\u05E0\u05E0def</span></div>'
-      : '<div contenteditable dir="ltr">|<span dir="rtl">abc\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0def</span></div>',
+  '<div contenteditable dir="ltr">|<span dir="rtl">abc\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0def</span></div>',
   '43-0 ltr left character');
 
 selection_test(
   '<div contenteditable dir="ltr"><span dir="rtl">|abc\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0def</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr"><span dir="rtl">abc\u05E7|\u05E7\u05E7123\u05E0\u05E0\u05E0def</span></div>'
-      : '<div contenteditable dir="ltr"><span dir="rtl">|abc\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0def</span></div>',
+  '<div contenteditable dir="ltr"><span dir="rtl">|abc\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0def</span></div>',
   '43-1 ltr left character');
 
 selection_test(
   '<div contenteditable dir="ltr"><span dir="rtl">a|bc\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0def</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr"><span dir="rtl">|abc\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0def</span></div>'
-      : '<div contenteditable dir="ltr"><span dir="rtl">abc\u05E7|\u05E7\u05E7123\u05E0\u05E0\u05E0def</span></div>',
+  '<div contenteditable dir="ltr"><span dir="rtl">abc\u05E7|\u05E7\u05E7123\u05E0\u05E0\u05E0def</span></div>',
   '43-2 ltr left character');
 
 selection_test(
@@ -38,9 +30,7 @@
 selection_test(
   '<div contenteditable dir="ltr"><span dir="rtl">abc|\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0def</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr"><span dir="rtl">abc\u05E7|\u05E7\u05E7123\u05E0\u05E0\u05E0def</span></div>'
-      : '<div contenteditable dir="ltr"><span dir="rtl">ab|c\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0def</span></div>',
+  '<div contenteditable dir="ltr"><span dir="rtl">ab|c\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0def</span></div>',
   '43-4 ltr left character');
 
 selection_test(
@@ -52,9 +42,7 @@
 selection_test(
   '<div contenteditable dir="ltr"><span dir="rtl">abc\u05E7\u05E7|\u05E7123\u05E0\u05E0\u05E0def</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr"><span dir="rtl">abc\u05E7\u05E7\u05E7|123\u05E0\u05E0\u05E0def</span></div>'
-      : '<div contenteditable dir="ltr"><span dir="rtl">abc\u05E7\u05E7\u05E7123|\u05E0\u05E0\u05E0def</span></div>',
+  '<div contenteditable dir="ltr"><span dir="rtl">abc\u05E7\u05E7\u05E7123|\u05E0\u05E0\u05E0def</span></div>',
   '43-6 ltr left character');
 
 selection_test(
@@ -78,9 +66,7 @@
 selection_test(
   '<div contenteditable dir="ltr"><span dir="rtl">abc\u05E7\u05E7\u05E7123|\u05E0\u05E0\u05E0def</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr"><span dir="rtl">abc\u05E7\u05E7\u05E7123\u05E0|\u05E0\u05E0def</span></div>'
-      : '<div contenteditable dir="ltr"><span dir="rtl">abc\u05E7\u05E7\u05E712|3\u05E0\u05E0\u05E0def</span></div>',
+  '<div contenteditable dir="ltr"><span dir="rtl">abc\u05E7\u05E7\u05E712|3\u05E0\u05E0\u05E0def</span></div>',
   '43-10 ltr left character');
 
 selection_test(
@@ -92,9 +78,7 @@
 selection_test(
   '<div contenteditable dir="ltr"><span dir="rtl">abc\u05E7\u05E7\u05E7123\u05E0\u05E0|\u05E0def</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr"><span dir="rtl">abc\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0|def</span></div>'
-      : '<div contenteditable dir="ltr"><span dir="rtl">abc\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0de|f</span></div>',
+  '<div contenteditable dir="ltr"><span dir="rtl">abc\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0de|f</span></div>',
   '43-12 ltr left character');
 
 selection_test(
@@ -106,9 +90,7 @@
 selection_test(
   '<div contenteditable dir="ltr"><span dir="rtl">abc\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0d|ef</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr"><span dir="rtl">abc\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0|def</span></div>'
-      : '<div contenteditable dir="ltr"><span dir="rtl">|abc\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0def</span></div>',
+  '<div contenteditable dir="ltr"><span dir="rtl">|abc\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0def</span></div>',
   '43-14 ltr left character');
 
 selection_test(
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_43_rtl.html b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_43_rtl.html
index 7745f5d6..cad0084 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_43_rtl.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_left_character_43_rtl.html
@@ -3,30 +3,22 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="rtl">|<span dir="rtl">abc\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0def</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl"><span dir="rtl">abc\u05E7|\u05E7\u05E7123\u05E0\u05E0\u05E0def</span></div>'
-      : '<div contenteditable dir="rtl"><span dir="rtl">ab|c\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0def</span></div>',
+  '<div contenteditable dir="rtl"><span dir="rtl">ab|c\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0def</span></div>',
   '43-0 rtl left character');
 
 selection_test(
   '<div contenteditable dir="rtl"><span dir="rtl">|abc\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0def</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl"><span dir="rtl">abc\u05E7|\u05E7\u05E7123\u05E0\u05E0\u05E0def</span></div>'
-      : '<div contenteditable dir="rtl"><span dir="rtl">ab|c\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0def</span></div>',
+  '<div contenteditable dir="rtl"><span dir="rtl">ab|c\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0def</span></div>',
   '43-1 rtl left character');
 
 selection_test(
   '<div contenteditable dir="rtl"><span dir="rtl">a|bc\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0def</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl"><span dir="rtl">|abc\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0def</span></div>'
-      : '<div contenteditable dir="rtl"><span dir="rtl">abc|\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0def</span></div>',
+  '<div contenteditable dir="rtl"><span dir="rtl">abc|\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0def</span></div>',
   '43-2 rtl left character');
 
 selection_test(
@@ -56,17 +48,13 @@
 selection_test(
   '<div contenteditable dir="rtl"><span dir="rtl">abc\u05E7\u05E7\u05E7|123\u05E0\u05E0\u05E0def</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl"><span dir="rtl">abc\u05E7\u05E7\u05E7123\u05E0|\u05E0\u05E0def</span></div>'
-      : '<div contenteditable dir="rtl"><span dir="rtl">abc\u05E7\u05E7\u05E712|3\u05E0\u05E0\u05E0def</span></div>',
+  '<div contenteditable dir="rtl"><span dir="rtl">abc\u05E7\u05E7\u05E712|3\u05E0\u05E0\u05E0def</span></div>',
   '43-7 rtl left character');
 
 selection_test(
   '<div contenteditable dir="rtl"><span dir="rtl">abc\u05E7\u05E7\u05E71|23\u05E0\u05E0\u05E0def</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl"><span dir="rtl">abc\u05E7\u05E7\u05E7|123\u05E0\u05E0\u05E0def</span></div>'
-      : '<div contenteditable dir="rtl"><span dir="rtl">abc\u05E7\u05E7\u05E7123|\u05E0\u05E0\u05E0def</span></div>',
+  '<div contenteditable dir="rtl"><span dir="rtl">abc\u05E7\u05E7\u05E7123|\u05E0\u05E0\u05E0def</span></div>',
   '43-8 rtl left character');
 
 selection_test(
@@ -96,17 +84,13 @@
 selection_test(
   '<div contenteditable dir="rtl"><span dir="rtl">abc\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0|def</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl"><span dir="rtl">abc\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0|def</span></div>'
-      : '<div contenteditable dir="rtl"><span dir="rtl">abc\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0de|f</span></div>',
+  '<div contenteditable dir="rtl"><span dir="rtl">abc\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0de|f</span></div>',
   '43-13 rtl left character');
 
 selection_test(
   '<div contenteditable dir="rtl"><span dir="rtl">abc\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0d|ef</span></div>',
   selection => selection.modify('move', 'left', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl"><span dir="rtl">abc\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0|def</span></div>'
-      : '<div contenteditable dir="rtl"><span dir="rtl">abc\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0def|</span></div>',
+  '<div contenteditable dir="rtl"><span dir="rtl">abc\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0def|</span></div>',
   '43-14 rtl left character');
 
 selection_test(
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_01_rtl.html b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_01_rtl.html
index 79fa7bb0..4cc6651 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_01_rtl.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_01_rtl.html
@@ -3,14 +3,10 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="rtl">|abc</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">a|bc</div>'
-      : '<div contenteditable dir="rtl">|abc</div>',
+  '<div contenteditable dir="rtl">|abc</div>',
   '1-0 rtl right character');
 
 selection_test(
@@ -22,16 +18,12 @@
 selection_test(
   '<div contenteditable dir="rtl">ab|c</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc|</div>'
-      : '<div contenteditable dir="rtl">|abc</div>',
+  '<div contenteditable dir="rtl">|abc</div>',
   '1-2 rtl right character');
 
 selection_test(
   '<div contenteditable dir="rtl">abc|</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc|</div>'
-      : '<div contenteditable dir="rtl">a|bc</div>',
+  '<div contenteditable dir="rtl">a|bc</div>',
   '1-3 rtl right character');
 </script>
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_02_ltr.html b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_02_ltr.html
index c0d4343..d35d5b6 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_02_ltr.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_02_ltr.html
@@ -3,22 +3,16 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2</div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1|\u05D2</div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1|\u05D2</div>',
   '2-0 ltr right character');
 
 selection_test(
   '<div contenteditable dir="ltr">\u05D0|\u05D1\u05D2</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2</div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2|</div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2|</div>',
   '2-1 ltr right character');
 
 selection_test(
@@ -30,8 +24,6 @@
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2|</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05D0\u05D1|\u05D2</div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2|</div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2|</div>',
   '2-3 ltr right character');
 </script>
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_05_ltr.html b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_05_ltr.html
index 795e4db0..f0db4c8 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_05_ltr.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_05_ltr.html
@@ -3,8 +3,6 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="ltr">|abc\u05D0\u05D1\u05D2def</div>',
   selection => selection.modify('move', 'right', 'character'),
@@ -26,17 +24,13 @@
 selection_test(
   '<div contenteditable dir="ltr">abc|\u05D0\u05D1\u05D2def</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">abc\u05d0\u05d1\u05d2d|ef</div>'
-      : '<div contenteditable dir="ltr">abc\u05D0\u05D1|\u05D2def</div>',
+  '<div contenteditable dir="ltr">abc\u05D0\u05D1|\u05D2def</div>',
   '5-3 ltr right character');
 
 selection_test(
   '<div contenteditable dir="ltr">abc\u05D0|\u05D1\u05D2def</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">abc|\u05d0\u05d1\u05d2def</div>'
-      : '<div contenteditable dir="ltr">abc\u05D0\u05D1\u05D2|def</div>',
+  '<div contenteditable dir="ltr">abc\u05D0\u05D1\u05D2|def</div>',
   '5-4 ltr right character');
 
 selection_test(
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_05_rtl.html b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_05_rtl.html
index c4a1bc6..5ee5467 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_05_rtl.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_05_rtl.html
@@ -3,14 +3,10 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="rtl">|abc\u05D0\u05D1\u05D2def</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">a|bc\u05d0\u05d1\u05d2def</div>'
-      : '<div contenteditable dir="rtl">|abc\u05D0\u05D1\u05D2def</div>',
+  '<div contenteditable dir="rtl">|abc\u05D0\u05D1\u05D2def</div>',
   '5-0 rtl right character');
 
 selection_test(
@@ -22,9 +18,7 @@
 selection_test(
   '<div contenteditable dir="rtl">ab|c\u05D0\u05D1\u05D2def</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc|\u05d0\u05d1\u05d2def</div>'
-      : '<div contenteditable dir="rtl">|abc\u05D0\u05D1\u05D2def</div>',
+  '<div contenteditable dir="rtl">|abc\u05D0\u05D1\u05D2def</div>',
   '5-2 rtl right character');
 
 selection_test(
@@ -48,9 +42,7 @@
 selection_test(
   '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2|def</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc\u05d0\u05d1\u05d2d|ef</div>'
-      : '<div contenteditable dir="rtl">abc\u05D0\u05D1|\u05D2def</div>',
+  '<div contenteditable dir="rtl">abc\u05D0\u05D1|\u05D2def</div>',
   '5-6 rtl right character');
 
 selection_test(
@@ -62,16 +54,12 @@
 selection_test(
   '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2de|f</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc\u05d0\u05d1\u05d2def|</div>'
-      : '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2|def</div>',
+  '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2|def</div>',
   '5-8 rtl right character');
 
 selection_test(
   '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2def|</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc\u05d0\u05d1|\u05d2def</div>'
-      : '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2d|ef</div>',
+  '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2d|ef</div>',
   '5-9 rtl right character');
 </script>
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_06_ltr.html b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_06_ltr.html
index 37055b77..20170571 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_06_ltr.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_06_ltr.html
@@ -3,22 +3,16 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2abc\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1\u05d2a|bc\u05d3\u05d4\u05d5</div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1|\u05D2abc\u05D3\u05D4\u05D5</div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1|\u05D2abc\u05D3\u05D4\u05D5</div>',
   '6-0 ltr right character');
 
 selection_test(
   '<div contenteditable dir="ltr">\u05D0|\u05D1\u05D2abc\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">|\u05d0\u05d1\u05d2abc\u05d3\u05d4\u05d5</div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2|abc\u05D3\u05D4\u05D5</div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2|abc\u05D3\u05D4\u05D5</div>',
   '6-1 ltr right character');
 
 selection_test(
@@ -48,17 +42,13 @@
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2abc|\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1\u05d2abc|\u05d3\u05d4\u05d5</div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2abc\u05D3\u05D4|\u05D5</div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2abc\u05D3\u05D4|\u05D5</div>',
   '6-6 ltr right character');
 
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2abc\u05D3|\u05D4\u05D5</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1\u05d2abc|\u05d3\u05d4\u05d5</div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2abc\u05D3\u05D4\u05D5|</div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2abc\u05D3\u05D4\u05D5|</div>',
   '6-7 ltr right character');
 
 selection_test(
@@ -70,8 +60,6 @@
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2abc\u05D3\u05D4\u05D5|</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1\u05d2abc\u05d3\u05d4|\u05d5</div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2abc\u05D3\u05D4\u05D5|</div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2abc\u05D3\u05D4\u05D5|</div>',
   '6-9 ltr right character');
 </script>
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_06_rtl.html b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_06_rtl.html
index 20580e1..a6f7a90 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_06_rtl.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_06_rtl.html
@@ -3,8 +3,6 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="rtl">|\u05D0\u05D1\u05D2abc\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'right', 'character'),
@@ -26,9 +24,7 @@
 selection_test(
   '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2|abc\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u05d0\u05d1\u05d2a|bc\u05d3\u05d4\u05d5</div>'
-      : '<div contenteditable dir="rtl">\u05D0\u05D1|\u05D2abc\u05D3\u05D4\u05D5</div>',
+  '<div contenteditable dir="rtl">\u05D0\u05D1|\u05D2abc\u05D3\u05D4\u05D5</div>',
   '6-3 rtl right character');
 
 selection_test(
@@ -40,9 +36,7 @@
 selection_test(
   '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2ab|c\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u05d0\u05d1\u05d2abc|\u05d3\u05d4\u05d5</div>'
-      : '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2|abc\u05D3\u05D4\u05D5</div>',
+  '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2|abc\u05D3\u05D4\u05D5</div>',
   '6-5 rtl right character');
 
 selection_test(
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_07_ltr.html b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_07_ltr.html
index 6fec319..a76541d 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_07_ltr.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_07_ltr.html
@@ -3,8 +3,6 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="ltr">|abc\u05D0\u05D1\u05D2\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'right', 'character'),
@@ -26,17 +24,13 @@
 selection_test(
   '<div contenteditable dir="ltr">abc|\u05D0\u05D1\u05D2\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">abc|\u05d0\u05d1\u05d2\u05d3\u05d4\u05d5</div>'
-      : '<div contenteditable dir="ltr">abc\u05D0\u05D1\u05D2\u05D3\u05D4|\u05D5</div>',
+  '<div contenteditable dir="ltr">abc\u05D0\u05D1\u05D2\u05D3\u05D4|\u05D5</div>',
   '7-3 ltr right character');
 
 selection_test(
   '<div contenteditable dir="ltr">abc\u05D0|\u05D1\u05D2\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">abc|\u05d0\u05d1\u05d2\u05d3\u05d4\u05d5</div>'
-      : '<div contenteditable dir="ltr">abc\u05D0\u05D1\u05D2\u05D3\u05D4\u05D5|</div>',
+  '<div contenteditable dir="ltr">abc\u05D0\u05D1\u05D2\u05D3\u05D4\u05D5|</div>',
   '7-4 ltr right character');
 
 selection_test(
@@ -66,8 +60,6 @@
 selection_test(
   '<div contenteditable dir="ltr">abc\u05D0\u05D1\u05D2\u05D3\u05D4\u05D5|</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">abc\u05d0\u05d1\u05d2\u05d3\u05d4|\u05d5</div>'
-      : '<div contenteditable dir="ltr">abc\u05D0\u05D1\u05D2\u05D3\u05D4\u05D5|</div>',
+  '<div contenteditable dir="ltr">abc\u05D0\u05D1\u05D2\u05D3\u05D4\u05D5|</div>',
   '7-9 ltr right character');
 </script>
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_07_rtl.html b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_07_rtl.html
index e141077f..3a201ef 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_07_rtl.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_07_rtl.html
@@ -3,14 +3,10 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="rtl">|abc\u05D0\u05D1\u05D2\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">a|bc\u05d0\u05d1\u05d2\u05d3\u05d4\u05d5</div>'
-      : '<div contenteditable dir="rtl">|abc\u05D0\u05D1\u05D2\u05D3\u05D4\u05D5</div>',
+  '<div contenteditable dir="rtl">|abc\u05D0\u05D1\u05D2\u05D3\u05D4\u05D5</div>',
   '7-0 rtl right character');
 
 selection_test(
@@ -22,9 +18,7 @@
 selection_test(
   '<div contenteditable dir="rtl">ab|c\u05D0\u05D1\u05D2\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc|\u05d0\u05d1\u05d2\u05d3\u05d4\u05d5</div>'
-      : '<div contenteditable dir="rtl">|abc\u05D0\u05D1\u05D2\u05D3\u05D4\u05D5</div>',
+  '<div contenteditable dir="rtl">|abc\u05D0\u05D1\u05D2\u05D3\u05D4\u05D5</div>',
   '7-2 rtl right character');
 
 selection_test(
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_08_ltr.html b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_08_ltr.html
index 5062f12..41733cd 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_08_ltr.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_08_ltr.html
@@ -3,22 +3,16 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2abcdef</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1\u05d2a|bcdef</div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1|\u05D2abcdef</div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1|\u05D2abcdef</div>',
   '8-0 ltr right character');
 
 selection_test(
   '<div contenteditable dir="ltr">\u05D0|\u05D1\u05D2abcdef</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">|\u05d0\u05d1\u05d2abcdef</div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2|abcdef</div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2|abcdef</div>',
   '8-1 ltr right character');
 
 selection_test(
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_08_rtl.html b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_08_rtl.html
index a0061f8..1bbf020 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_08_rtl.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_08_rtl.html
@@ -3,8 +3,6 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="rtl">|\u05D0\u05D1\u05D2abcdef</div>',
   selection => selection.modify('move', 'right', 'character'),
@@ -26,9 +24,7 @@
 selection_test(
   '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2|abcdef</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u05d0\u05d1\u05d2a|bcdef</div>'
-      : '<div contenteditable dir="rtl">\u05D0\u05D1|\u05D2abcdef</div>',
+  '<div contenteditable dir="rtl">\u05D0\u05D1|\u05D2abcdef</div>',
   '8-3 rtl right character');
 
 selection_test(
@@ -58,16 +54,12 @@
 selection_test(
   '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2abcde|f</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u05d0\u05d1\u05d2abcdef|</div>'
-      : '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2|abcdef</div>',
+  '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2|abcdef</div>',
   '8-8 rtl right character');
 
 selection_test(
   '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2abcdef|</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u05d0\u05d1|\u05d2abcdef</div>'
-      : '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2a|bcdef</div>',
+  '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2a|bcdef</div>',
   '8-9 rtl right character');
 </script>
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_09_ltr.html b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_09_ltr.html
index da1d29c..2cc1e0aa 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_09_ltr.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_09_ltr.html
@@ -3,14 +3,10 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="ltr">|\u0661\u0662\u0663\u0627\u0628\u0629</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u0661|\u0662\u0663\u0627\u0628\u0629</div>'
-      : '<div contenteditable dir="ltr">\u0661\u0662\u0663\u0627\u0628|\u0629</div>',
+  '<div contenteditable dir="ltr">\u0661\u0662\u0663\u0627\u0628|\u0629</div>',
   '9-0 ltr right character');
 
 selection_test(
@@ -22,25 +18,19 @@
 selection_test(
   '<div contenteditable dir="ltr">\u0661\u0662|\u0663\u0627\u0628\u0629</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u0661\u0662\u0663|\u0627\u0628\u0629</div>'
-      : '<div contenteditable dir="ltr">\u0661\u0662\u0663\u0627\u0628\u0629|</div>',
+  '<div contenteditable dir="ltr">\u0661\u0662\u0663\u0627\u0628\u0629|</div>',
   '9-2 ltr right character');
 
 selection_test(
   '<div contenteditable dir="ltr">\u0661\u0662\u0663|\u0627\u0628\u0629</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u0661|\u0662\u0663\u0627\u0628\u0629</div>'
-      : '<div contenteditable dir="ltr">\u0661\u0662\u0663|\u0627\u0628\u0629</div>',
+  '<div contenteditable dir="ltr">\u0661\u0662\u0663|\u0627\u0628\u0629</div>',
   '9-3 ltr right character');
 
 selection_test(
   '<div contenteditable dir="ltr">\u0661\u0662\u0663\u0627|\u0628\u0629</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u0661\u0662\u0663|\u0627\u0628\u0629</div>'
-      : '<div contenteditable dir="ltr">\u0661|\u0662\u0663\u0627\u0628\u0629</div>',
+  '<div contenteditable dir="ltr">\u0661|\u0662\u0663\u0627\u0628\u0629</div>',
   '9-4 ltr right character');
 
 selection_test(
@@ -52,8 +42,6 @@
 selection_test(
   '<div contenteditable dir="ltr">\u0661\u0662\u0663\u0627\u0628\u0629|</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u0661\u0662\u0663\u0627\u0628|\u0629</div>'
-      : '<div contenteditable dir="ltr">\u0661\u0662\u0663\u0627\u0628\u0629|</div>',
+  '<div contenteditable dir="ltr">\u0661\u0662\u0663\u0627\u0628\u0629|</div>',
   '9-6 ltr right character');
 </script>
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_09_rtl.html b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_09_rtl.html
index e3770fa63..bcfb5ee 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_09_rtl.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_09_rtl.html
@@ -3,14 +3,10 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="rtl">|\u0661\u0662\u0663\u0627\u0628\u0629</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u0661|\u0662\u0663\u0627\u0628\u0629</div>'
-      : '<div contenteditable dir="rtl">|\u0661\u0662\u0663\u0627\u0628\u0629</div>',
+  '<div contenteditable dir="rtl">|\u0661\u0662\u0663\u0627\u0628\u0629</div>',
   '9-0 rtl right character');
 
 selection_test(
@@ -22,9 +18,7 @@
 selection_test(
   '<div contenteditable dir="rtl">\u0661\u0662|\u0663\u0627\u0628\u0629</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u0661\u0662\u0663|\u0627\u0628\u0629</div>'
-      : '<div contenteditable dir="rtl">|\u0661\u0662\u0663\u0627\u0628\u0629</div>',
+  '<div contenteditable dir="rtl">|\u0661\u0662\u0663\u0627\u0628\u0629</div>',
   '9-2 rtl right character');
 
 selection_test(
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_10_ltr.html b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_10_ltr.html
index d39a8d1a..7c1c5046 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_10_ltr.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_10_ltr.html
@@ -3,22 +3,16 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="ltr">|\u0627\u0628\u0629\u0661\u0662\u0663</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">|\u0627\u0628\u0629\u0661\u0662\u0663</div>'
-      : '<div contenteditable dir="ltr">\u0627\u0628\u0629\u0661|\u0662\u0663</div>',
+  '<div contenteditable dir="ltr">\u0627\u0628\u0629\u0661|\u0662\u0663</div>',
   '10-0 ltr right character');
 
 selection_test(
   '<div contenteditable dir="ltr">\u0627|\u0628\u0629\u0661\u0662\u0663</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">|\u0627\u0628\u0629\u0661\u0662\u0663</div>'
-      : '<div contenteditable dir="ltr">\u0627\u0628\u0629\u0661\u0662\u0663|</div>',
+  '<div contenteditable dir="ltr">\u0627\u0628\u0629\u0661\u0662\u0663|</div>',
   '10-1 ltr right character');
 
 selection_test(
@@ -42,16 +36,12 @@
 selection_test(
   '<div contenteditable dir="ltr">\u0627\u0628\u0629\u0661\u0662|\u0663</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u0627\u0628\u0629\u0661\u0662\u0663|</div>'
-      : '<div contenteditable dir="ltr">\u0627\u0628|\u0629\u0661\u0662\u0663</div>',
+  '<div contenteditable dir="ltr">\u0627\u0628|\u0629\u0661\u0662\u0663</div>',
   '10-5 ltr right character');
 
 selection_test(
   '<div contenteditable dir="ltr">\u0627\u0628\u0629\u0661\u0662\u0663|</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u0627\u0628|\u0629\u0661\u0662\u0663</div>'
-      : '<div contenteditable dir="ltr">\u0627\u0628\u0629\u0661\u0662\u0663|</div>',
+  '<div contenteditable dir="ltr">\u0627\u0628\u0629\u0661\u0662\u0663|</div>',
   '10-6 ltr right character');
 </script>
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_10_rtl.html b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_10_rtl.html
index 0dd23e6..e9c1d7df 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_10_rtl.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_10_rtl.html
@@ -3,8 +3,6 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="rtl">|\u0627\u0628\u0629\u0661\u0662\u0663</div>',
   selection => selection.modify('move', 'right', 'character'),
@@ -26,9 +24,7 @@
 selection_test(
   '<div contenteditable dir="rtl">\u0627\u0628\u0629|\u0661\u0662\u0663</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u0627\u0628\u0629\u0661|\u0662\u0663</div>'
-      : '<div contenteditable dir="rtl">\u0627\u0628|\u0629\u0661\u0662\u0663</div>',
+  '<div contenteditable dir="rtl">\u0627\u0628|\u0629\u0661\u0662\u0663</div>',
   '10-3 rtl right character');
 
 selection_test(
@@ -40,16 +36,12 @@
 selection_test(
   '<div contenteditable dir="rtl">\u0627\u0628\u0629\u0661\u0662|\u0663</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u0627\u0628\u0629\u0661\u0662\u0663|</div>'
-      : '<div contenteditable dir="rtl">\u0627\u0628\u0629|\u0661\u0662\u0663</div>',
+  '<div contenteditable dir="rtl">\u0627\u0628\u0629|\u0661\u0662\u0663</div>',
   '10-5 rtl right character');
 
 selection_test(
   '<div contenteditable dir="rtl">\u0627\u0628\u0629\u0661\u0662\u0663|</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u0627\u0628|\u0629\u0661\u0662\u0663</div>'
-      : '<div contenteditable dir="rtl">\u0627\u0628\u0629\u0661|\u0662\u0663</div>',
+  '<div contenteditable dir="rtl">\u0627\u0628\u0629\u0661|\u0662\u0663</div>',
   '10-6 rtl right character');
 </script>
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_11_ltr.html b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_11_ltr.html
index b99d1f90..5f0cfd8 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_11_ltr.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_11_ltr.html
@@ -3,8 +3,6 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="ltr">|<span>abc</span>\u05D0\u05D1\u05D2def</div>',
   selection => selection.modify('move', 'right', 'character'),
@@ -32,25 +30,19 @@
 selection_test(
   '<div contenteditable dir="ltr"><span>abc|</span>\u05D0\u05D1\u05D2def</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr"><span>abc</span>\u05d0\u05d1\u05d2d|ef</div>'
-      : '<div contenteditable dir="ltr"><span>abc</span>\u05D0\u05D1|\u05D2def</div>',
+  '<div contenteditable dir="ltr"><span>abc</span>\u05D0\u05D1|\u05D2def</div>',
   '11-4 ltr right character');
 
 selection_test(
   '<div contenteditable dir="ltr"><span>abc</span>|\u05D0\u05D1\u05D2def</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr"><span>abc</span>\u05d0\u05d1\u05d2d|ef</div>'
-      : '<div contenteditable dir="ltr"><span>abc</span>\u05D0\u05D1|\u05D2def</div>',
+  '<div contenteditable dir="ltr"><span>abc</span>\u05D0\u05D1|\u05D2def</div>',
   '11-5 ltr right character');
 
 selection_test(
   '<div contenteditable dir="ltr"><span>abc</span>\u05D0|\u05D1\u05D2def</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr"><span>abc|</span>\u05d0\u05d1\u05d2def</div>'
-      : '<div contenteditable dir="ltr"><span>abc</span>\u05D0\u05D1\u05D2|def</div>',
+  '<div contenteditable dir="ltr"><span>abc</span>\u05D0\u05D1\u05D2|def</div>',
   '11-6 ltr right character');
 
 selection_test(
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_11_rtl.html b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_11_rtl.html
index a816397a..f2df883 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_11_rtl.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_11_rtl.html
@@ -3,22 +3,16 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="rtl">|<span>abc</span>\u05D0\u05D1\u05D2def</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl"><span>a|bc</span>\u05d0\u05d1\u05d2def</div>'
-      : '<div contenteditable dir="rtl">|<span>abc</span>\u05D0\u05D1\u05D2def</div>',
+  '<div contenteditable dir="rtl">|<span>abc</span>\u05D0\u05D1\u05D2def</div>',
   '11-0 rtl right character');
 
 selection_test(
   '<div contenteditable dir="rtl"><span>|abc</span>\u05D0\u05D1\u05D2def</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl"><span>a|bc</span>\u05d0\u05d1\u05d2def</div>'
-      : '<div contenteditable dir="rtl"><span>|abc</span>\u05D0\u05D1\u05D2def</div>',
+  '<div contenteditable dir="rtl"><span>|abc</span>\u05D0\u05D1\u05D2def</div>',
   '11-1 rtl right character');
 
 selection_test(
@@ -30,9 +24,7 @@
 selection_test(
   '<div contenteditable dir="rtl"><span>ab|c</span>\u05D0\u05D1\u05D2def</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl"><span>abc|</span>\u05d0\u05d1\u05d2def</div>'
-      : '<div contenteditable dir="rtl"><span>|abc</span>\u05D0\u05D1\u05D2def</div>',
+  '<div contenteditable dir="rtl"><span>|abc</span>\u05D0\u05D1\u05D2def</div>',
   '11-3 rtl right character');
 
 selection_test(
@@ -62,9 +54,7 @@
 selection_test(
   '<div contenteditable dir="rtl"><span>abc</span>\u05D0\u05D1\u05D2|def</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl"><span>abc</span>\u05d0\u05d1\u05d2d|ef</div>'
-      : '<div contenteditable dir="rtl"><span>abc</span>\u05D0\u05D1|\u05D2def</div>',
+  '<div contenteditable dir="rtl"><span>abc</span>\u05D0\u05D1|\u05D2def</div>',
   '11-8 rtl right character');
 
 selection_test(
@@ -76,16 +66,12 @@
 selection_test(
   '<div contenteditable dir="rtl"><span>abc</span>\u05D0\u05D1\u05D2de|f</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl"><span>abc</span>\u05d0\u05d1\u05d2def|</div>'
-      : '<div contenteditable dir="rtl"><span>abc</span>\u05D0\u05D1\u05D2|def</div>',
+  '<div contenteditable dir="rtl"><span>abc</span>\u05D0\u05D1\u05D2|def</div>',
   '11-10 rtl right character');
 
 selection_test(
   '<div contenteditable dir="rtl"><span>abc</span>\u05D0\u05D1\u05D2def|</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl"><span>abc</span>\u05d0\u05d1|\u05d2def</div>'
-      : '<div contenteditable dir="rtl"><span>abc</span>\u05D0\u05D1\u05D2d|ef</div>',
+  '<div contenteditable dir="rtl"><span>abc</span>\u05D0\u05D1\u05D2d|ef</div>',
   '11-11 rtl right character');
 </script>
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_12_ltr.html b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_12_ltr.html
index b75e5a0b..54a3b2e 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_12_ltr.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_12_ltr.html
@@ -3,30 +3,22 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="ltr">|<span>\u05D0\u05D1\u05D2</span>abc\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr"><span>\u05d0\u05d1\u05d2</span>a|bc\u05d3\u05d4\u05d5</div>'
-      : '<div contenteditable dir="ltr"><span>\u05D0\u05D1|\u05D2</span>abc\u05D3\u05D4\u05D5</div>',
+  '<div contenteditable dir="ltr"><span>\u05D0\u05D1|\u05D2</span>abc\u05D3\u05D4\u05D5</div>',
   '12-0 ltr right character');
 
 selection_test(
   '<div contenteditable dir="ltr"><span>|\u05D0\u05D1\u05D2</span>abc\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr"><span>\u05d0\u05d1\u05d2</span>a|bc\u05d3\u05d4\u05d5</div>'
-      : '<div contenteditable dir="ltr"><span>\u05D0\u05D1|\u05D2</span>abc\u05D3\u05D4\u05D5</div>',
+  '<div contenteditable dir="ltr"><span>\u05D0\u05D1|\u05D2</span>abc\u05D3\u05D4\u05D5</div>',
   '12-1 ltr right character');
 
 selection_test(
   '<div contenteditable dir="ltr"><span>\u05D0|\u05D1\u05D2</span>abc\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr"><span>|\u05d0\u05d1\u05d2</span>abc\u05d3\u05d4\u05d5</div>'
-      : '<div contenteditable dir="ltr"><span>\u05D0\u05D1\u05D2|</span>abc\u05D3\u05D4\u05D5</div>',
+  '<div contenteditable dir="ltr"><span>\u05D0\u05D1\u05D2|</span>abc\u05D3\u05D4\u05D5</div>',
   '12-2 ltr right character');
 
 selection_test(
@@ -62,17 +54,13 @@
 selection_test(
   '<div contenteditable dir="ltr"><span>\u05D0\u05D1\u05D2</span>abc|\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr"><span>\u05d0\u05d1\u05d2</span>abc|\u05d3\u05d4\u05d5</div>'
-      : '<div contenteditable dir="ltr"><span>\u05D0\u05D1\u05D2</span>abc\u05D3\u05D4|\u05D5</div>',
+  '<div contenteditable dir="ltr"><span>\u05D0\u05D1\u05D2</span>abc\u05D3\u05D4|\u05D5</div>',
   '12-8 ltr right character');
 
 selection_test(
   '<div contenteditable dir="ltr"><span>\u05D0\u05D1\u05D2</span>abc\u05D3|\u05D4\u05D5</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr"><span>\u05d0\u05d1\u05d2</span>abc|\u05d3\u05d4\u05d5</div>'
-      : '<div contenteditable dir="ltr"><span>\u05D0\u05D1\u05D2</span>abc\u05D3\u05D4\u05D5|</div>',
+  '<div contenteditable dir="ltr"><span>\u05D0\u05D1\u05D2</span>abc\u05D3\u05D4\u05D5|</div>',
   '12-9 ltr right character');
 
 selection_test(
@@ -84,8 +72,6 @@
 selection_test(
   '<div contenteditable dir="ltr"><span>\u05D0\u05D1\u05D2</span>abc\u05D3\u05D4\u05D5|</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr"><span>\u05d0\u05d1\u05d2</span>abc\u05d3\u05d4|\u05d5</div>'
-      : '<div contenteditable dir="ltr"><span>\u05D0\u05D1\u05D2</span>abc\u05D3\u05D4\u05D5|</div>',
+  '<div contenteditable dir="ltr"><span>\u05D0\u05D1\u05D2</span>abc\u05D3\u05D4\u05D5|</div>',
   '12-11 ltr right character');
 </script>
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_12_rtl.html b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_12_rtl.html
index daf4853..505d755 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_12_rtl.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_12_rtl.html
@@ -3,8 +3,6 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="rtl">|<span>\u05D0\u05D1\u05D2</span>abc\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'right', 'character'),
@@ -32,17 +30,13 @@
 selection_test(
   '<div contenteditable dir="rtl"><span>\u05D0\u05D1\u05D2|</span>abc\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl"><span>\u05d0\u05d1\u05d2</span>a|bc\u05d3\u05d4\u05d5</div>'
-      : '<div contenteditable dir="rtl"><span>\u05D0\u05D1|\u05D2</span>abc\u05D3\u05D4\u05D5</div>',
+  '<div contenteditable dir="rtl"><span>\u05D0\u05D1|\u05D2</span>abc\u05D3\u05D4\u05D5</div>',
   '12-4 rtl right character');
 
 selection_test(
   '<div contenteditable dir="rtl"><span>\u05D0\u05D1\u05D2</span>|abc\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl"><span>\u05d0\u05d1\u05d2</span>a|bc\u05d3\u05d4\u05d5</div>'
-      : '<div contenteditable dir="rtl"><span>\u05D0\u05D1|\u05D2</span>abc\u05D3\u05D4\u05D5</div>',
+  '<div contenteditable dir="rtl"><span>\u05D0\u05D1|\u05D2</span>abc\u05D3\u05D4\u05D5</div>',
   '12-5 rtl right character');
 
 selection_test(
@@ -54,9 +48,7 @@
 selection_test(
   '<div contenteditable dir="rtl"><span>\u05D0\u05D1\u05D2</span>ab|c\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl"><span>\u05d0\u05d1\u05d2</span>abc|\u05d3\u05d4\u05d5</div>'
-      : '<div contenteditable dir="rtl"><span>\u05D0\u05D1\u05D2|</span>abc\u05D3\u05D4\u05D5</div>',
+  '<div contenteditable dir="rtl"><span>\u05D0\u05D1\u05D2|</span>abc\u05D3\u05D4\u05D5</div>',
   '12-7 rtl right character');
 
 selection_test(
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_13_ltr.html b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_13_ltr.html
index 60ec21d..89bb0e5 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_13_ltr.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_13_ltr.html
@@ -3,8 +3,6 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="ltr">|abc\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5def</div>',
   selection => selection.modify('move', 'right', 'character'),
@@ -26,17 +24,13 @@
 selection_test(
   '<div contenteditable dir="ltr">abc|\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5def</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">abc\u05d0\u05d1\u05d2123\u05d3\u05d4\u05d5d|ef</div>'
-      : '<div contenteditable dir="ltr">abc\u05D0\u05D1\u05D2123\u05D3\u05D4|\u05D5def</div>',
+  '<div contenteditable dir="ltr">abc\u05D0\u05D1\u05D2123\u05D3\u05D4|\u05D5def</div>',
   '13-3 ltr right character');
 
 selection_test(
   '<div contenteditable dir="ltr">abc\u05D0|\u05D1\u05D2123\u05D3\u05D4\u05D5def</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">abc|\u05d0\u05d1\u05d2123\u05d3\u05d4\u05d5def</div>'
-      : '<div contenteditable dir="ltr">abc\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5|def</div>',
+  '<div contenteditable dir="ltr">abc\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5|def</div>',
   '13-4 ltr right character');
 
 selection_test(
@@ -66,17 +60,13 @@
 selection_test(
   '<div contenteditable dir="ltr">abc\u05D0\u05D1\u05D2123|\u05D3\u05D4\u05D5def</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">abc\u05d0\u05d1\u05d21|23\u05d3\u05d4\u05d5def</div>'
-      : '<div contenteditable dir="ltr">abc\u05D0\u05D1|\u05D2123\u05D3\u05D4\u05D5def</div>',
+  '<div contenteditable dir="ltr">abc\u05D0\u05D1|\u05D2123\u05D3\u05D4\u05D5def</div>',
   '13-9 ltr right character');
 
 selection_test(
   '<div contenteditable dir="ltr">abc\u05D0\u05D1\u05D2123\u05D3|\u05D4\u05D5def</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">abc\u05d0\u05d1\u05d2123|\u05d3\u05d4\u05d5def</div>'
-      : '<div contenteditable dir="ltr">abc\u05D0\u05D1\u05D2|123\u05D3\u05D4\u05D5def</div>',
+  '<div contenteditable dir="ltr">abc\u05D0\u05D1\u05D2|123\u05D3\u05D4\u05D5def</div>',
   '13-10 ltr right character');
 
 selection_test(
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_15_ltr.html b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_15_ltr.html
index 17857fe6..ada28691 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_15_ltr.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_15_ltr.html
@@ -3,8 +3,6 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="ltr">|abc\u05D0\u05D1\u05D2123def</div>',
   selection => selection.modify('move', 'right', 'character'),
@@ -26,17 +24,13 @@
 selection_test(
   '<div contenteditable dir="ltr">abc|\u05D0\u05D1\u05D2123def</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">abc\u05d0\u05d1\u05d2123d|ef</div>'
-      : '<div contenteditable dir="ltr">abc\u05D0\u05D1\u05D21|23def</div>',
+  '<div contenteditable dir="ltr">abc\u05D0\u05D1\u05D21|23def</div>',
   '15-3 ltr right character');
 
 selection_test(
   '<div contenteditable dir="ltr">abc\u05D0|\u05D1\u05D2123def</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">abc|\u05d0\u05d1\u05d2123def</div>'
-      : '<div contenteditable dir="ltr">abc\u05D0\u05D1\u05D2123|def</div>',
+  '<div contenteditable dir="ltr">abc\u05D0\u05D1\u05D2123|def</div>',
   '15-4 ltr right character');
 
 selection_test(
@@ -60,9 +54,7 @@
 selection_test(
   '<div contenteditable dir="ltr">abc\u05D0\u05D1\u05D212|3def</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">abc\u05d0\u05d1\u05d2123|def</div>'
-      : '<div contenteditable dir="ltr">abc\u05D0\u05D1|\u05D2123def</div>',
+  '<div contenteditable dir="ltr">abc\u05D0\u05D1|\u05D2123def</div>',
   '15-8 ltr right character');
 
 selection_test(
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_15_rtl.html b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_15_rtl.html
index e4150c7..20409a3 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_15_rtl.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_15_rtl.html
@@ -3,14 +3,10 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="rtl">|abc\u05D0\u05D1\u05D2123def</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">a|bc\u05d0\u05d1\u05d2123def</div>'
-      : '<div contenteditable dir="rtl">|abc\u05D0\u05D1\u05D2123def</div>',
+  '<div contenteditable dir="rtl">|abc\u05D0\u05D1\u05D2123def</div>',
   '15-0 rtl right character');
 
 selection_test(
@@ -22,9 +18,7 @@
 selection_test(
   '<div contenteditable dir="rtl">ab|c\u05D0\u05D1\u05D2123def</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc|\u05d0\u05d1\u05d2123def</div>'
-      : '<div contenteditable dir="rtl">|abc\u05D0\u05D1\u05D2123def</div>',
+  '<div contenteditable dir="rtl">|abc\u05D0\u05D1\u05D2123def</div>',
   '15-2 rtl right character');
 
 selection_test(
@@ -48,9 +42,7 @@
 selection_test(
   '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2|123def</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc\u05d0\u05d1\u05d21|23def</div>'
-      : '<div contenteditable dir="rtl">abc\u05D0\u05D1|\u05D2123def</div>',
+  '<div contenteditable dir="rtl">abc\u05D0\u05D1|\u05D2123def</div>',
   '15-6 rtl right character');
 
 selection_test(
@@ -80,16 +72,12 @@
 selection_test(
   '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2123de|f</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc\u05d0\u05d1\u05d2123def|</div>'
-      : '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2|123def</div>',
+  '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2|123def</div>',
   '15-11 rtl right character');
 
 selection_test(
   '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2123def|</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc\u05d0\u05d1|\u05d2123def</div>'
-      : '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D21|23def</div>',
+  '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D21|23def</div>',
   '15-12 rtl right character');
 </script>
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_16_ltr.html b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_16_ltr.html
index 54c0562..4f31a21 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_16_ltr.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_16_ltr.html
@@ -3,22 +3,16 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5abc\u05D6\u05D7\u05D8456\u05D9\u05DB\u05DC</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1\u05d2123\u05d3\u05d4\u05d5a|bc\u05d6\u05d7\u05d8456\u05d9\u05db\u05dc</div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2123\u05D3\u05D4|\u05D5abc\u05D6\u05D7\u05D8456\u05D9\u05DB\u05DC</div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2123\u05D3\u05D4|\u05D5abc\u05D6\u05D7\u05D8456\u05D9\u05DB\u05DC</div>',
   '16-0 ltr right character');
 
 selection_test(
   '<div contenteditable dir="ltr">\u05D0|\u05D1\u05D2123\u05D3\u05D4\u05D5abc\u05D6\u05D7\u05D8456\u05D9\u05DB\u05DC</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">|\u05d0\u05d1\u05d2123\u05d3\u05d4\u05d5abc\u05d6\u05d7\u05d8456\u05d9\u05db\u05dc</div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5|abc\u05D6\u05D7\u05D8456\u05D9\u05DB\u05DC</div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5|abc\u05D6\u05D7\u05D8456\u05D9\u05DB\u05DC</div>',
   '16-1 ltr right character');
 
 selection_test(
@@ -48,17 +42,13 @@
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2123|\u05D3\u05D4\u05D5abc\u05D6\u05D7\u05D8456\u05D9\u05DB\u05DC</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1\u05d21|23\u05d3\u05d4\u05d5abc\u05d6\u05d7\u05d8456\u05d9\u05db\u05dc</div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1|\u05D2123\u05D3\u05D4\u05D5abc\u05D6\u05D7\u05D8456\u05D9\u05DB\u05DC</div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1|\u05D2123\u05D3\u05D4\u05D5abc\u05D6\u05D7\u05D8456\u05D9\u05DB\u05DC</div>',
   '16-6 ltr right character');
 
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2123\u05D3|\u05D4\u05D5abc\u05D6\u05D7\u05D8456\u05D9\u05DB\u05DC</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1\u05d2123|\u05d3\u05d4\u05d5abc\u05d6\u05d7\u05d8456\u05d9\u05db\u05dc</div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2|123\u05D3\u05D4\u05D5abc\u05D6\u05D7\u05D8456\u05D9\u05DB\u05DC</div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2|123\u05D3\u05D4\u05D5abc\u05D6\u05D7\u05D8456\u05D9\u05DB\u05DC</div>',
   '16-7 ltr right character');
 
 selection_test(
@@ -88,17 +78,13 @@
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5abc|\u05D6\u05D7\u05D8456\u05D9\u05DB\u05DC</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1\u05d2123\u05d3\u05d4\u05d5abc|\u05d6\u05d7\u05d8456\u05d9\u05db\u05dc</div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5abc\u05D6\u05D7\u05D8456\u05D9\u05DB|\u05DC</div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5abc\u05D6\u05D7\u05D8456\u05D9\u05DB|\u05DC</div>',
   '16-12 ltr right character');
 
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5abc\u05D6|\u05D7\u05D8456\u05D9\u05DB\u05DC</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1\u05d2123\u05d3\u05d4\u05d5abc|\u05d6\u05d7\u05d8456\u05d9\u05db\u05dc</div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5abc\u05D6\u05D7\u05D8456\u05D9\u05DB\u05DC|</div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5abc\u05D6\u05D7\u05D8456\u05D9\u05DB\u05DC|</div>',
   '16-13 ltr right character');
 
 selection_test(
@@ -128,17 +114,13 @@
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5abc\u05D6\u05D7\u05D8456|\u05D9\u05DB\u05DC</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1\u05d2123\u05d3\u05d4\u05d5abc\u05d6\u05d7\u05d84|56\u05d9\u05db\u05dc</div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5abc\u05D6\u05D7|\u05D8456\u05D9\u05DB\u05DC</div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5abc\u05D6\u05D7|\u05D8456\u05D9\u05DB\u05DC</div>',
   '16-18 ltr right character');
 
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5abc\u05D6\u05D7\u05D8456\u05D9|\u05DB\u05DC</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1\u05d2123\u05d3\u05d4\u05d5abc\u05d6\u05d7\u05d8456|\u05d9\u05db\u05dc</div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5abc\u05D6\u05D7\u05D8|456\u05D9\u05DB\u05DC</div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5abc\u05D6\u05D7\u05D8|456\u05D9\u05DB\u05DC</div>',
   '16-19 ltr right character');
 
 selection_test(
@@ -150,8 +132,6 @@
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5abc\u05D6\u05D7\u05D8456\u05D9\u05DB\u05DC|</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1\u05d2123\u05d3\u05d4\u05d5abc\u05d6\u05d7\u05d8456\u05d9\u05db|\u05dc</div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5abc\u05D6\u05D7\u05D8456\u05D9\u05DB\u05DC|</div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5abc\u05D6\u05D7\u05D8456\u05D9\u05DB\u05DC|</div>',
   '16-21 ltr right character');
 </script>
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_16_rtl.html b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_16_rtl.html
index 167d9c0..12f1c09 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_16_rtl.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_16_rtl.html
@@ -3,8 +3,6 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="rtl">|\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5abc\u05D6\u05D7\u05D8456\u05D9\u05DB\u05DC</div>',
   selection => selection.modify('move', 'right', 'character'),
@@ -26,9 +24,7 @@
 selection_test(
   '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2|123\u05D3\u05D4\u05D5abc\u05D6\u05D7\u05D8456\u05D9\u05DB\u05DC</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u05d0\u05d1\u05d21|23\u05d3\u05d4\u05d5abc\u05d6\u05d7\u05d8456\u05d9\u05db\u05dc</div>'
-      : '<div contenteditable dir="rtl">\u05D0\u05D1|\u05D2123\u05D3\u05D4\u05D5abc\u05D6\u05D7\u05D8456\u05D9\u05DB\u05DC</div>',
+  '<div contenteditable dir="rtl">\u05D0\u05D1|\u05D2123\u05D3\u05D4\u05D5abc\u05D6\u05D7\u05D8456\u05D9\u05DB\u05DC</div>',
   '16-3 rtl right character');
 
 selection_test(
@@ -40,9 +36,7 @@
 selection_test(
   '<div contenteditable dir="rtl">\u05D0\u05D1\u05D212|3\u05D3\u05D4\u05D5abc\u05D6\u05D7\u05D8456\u05D9\u05DB\u05DC</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u05d0\u05d1\u05d2123|\u05d3\u05d4\u05d5abc\u05d6\u05d7\u05d8456\u05d9\u05db\u05dc</div>'
-      : '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2|123\u05D3\u05D4\u05D5abc\u05D6\u05D7\u05D8456\u05D9\u05DB\u05DC</div>',
+  '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2|123\u05D3\u05D4\u05D5abc\u05D6\u05D7\u05D8456\u05D9\u05DB\u05DC</div>',
   '16-5 rtl right character');
 
 selection_test(
@@ -66,9 +60,7 @@
 selection_test(
   '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5|abc\u05D6\u05D7\u05D8456\u05D9\u05DB\u05DC</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u05d0\u05d1\u05d2123\u05d3\u05d4\u05d5a|bc\u05d6\u05d7\u05d8456\u05d9\u05db\u05dc</div>'
-      : '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2123\u05D3\u05D4|\u05D5abc\u05D6\u05D7\u05D8456\u05D9\u05DB\u05DC</div>',
+  '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2123\u05D3\u05D4|\u05D5abc\u05D6\u05D7\u05D8456\u05D9\u05DB\u05DC</div>',
   '16-9 rtl right character');
 
 selection_test(
@@ -80,9 +72,7 @@
 selection_test(
   '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5ab|c\u05D6\u05D7\u05D8456\u05D9\u05DB\u05DC</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u05d0\u05d1\u05d2123\u05d3\u05d4\u05d5abc|\u05d6\u05d7\u05d8456\u05d9\u05db\u05dc</div>'
-      : '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5|abc\u05D6\u05D7\u05D8456\u05D9\u05DB\u05DC</div>',
+  '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5|abc\u05D6\u05D7\u05D8456\u05D9\u05DB\u05DC</div>',
   '16-11 rtl right character');
 
 selection_test(
@@ -106,9 +96,7 @@
 selection_test(
   '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5abc\u05D6\u05D7\u05D8|456\u05D9\u05DB\u05DC</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u05d0\u05d1\u05d2123\u05d3\u05d4\u05d5abc\u05d6\u05d7\u05d84|56\u05d9\u05db\u05dc</div>'
-      : '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5abc\u05D6\u05D7|\u05D8456\u05D9\u05DB\u05DC</div>',
+  '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5abc\u05D6\u05D7|\u05D8456\u05D9\u05DB\u05DC</div>',
   '16-15 rtl right character');
 
 selection_test(
@@ -120,9 +108,7 @@
 selection_test(
   '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5abc\u05D6\u05D7\u05D845|6\u05D9\u05DB\u05DC</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u05d0\u05d1\u05d2123\u05d3\u05d4\u05d5abc\u05d6\u05d7\u05d8456|\u05d9\u05db\u05dc</div>'
-      : '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5abc\u05D6\u05D7\u05D8|456\u05D9\u05DB\u05DC</div>',
+  '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2123\u05D3\u05D4\u05D5abc\u05D6\u05D7\u05D8|456\u05D9\u05DB\u05DC</div>',
   '16-17 rtl right character');
 
 selection_test(
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_25_ltr.html b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_25_ltr.html
index bd7940c9..cc5f792 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_25_ltr.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_25_ltr.html
@@ -3,8 +3,6 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="ltr">|abcdef\u05D0\u05D1\u05D2<img>\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'right', 'character'),
@@ -44,17 +42,13 @@
 selection_test(
   '<div contenteditable dir="ltr">abcdef|\u05D0\u05D1\u05D2<img>\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">abcdef|\u05d0\u05d1\u05d2<img>\u05d3\u05d4\u05d5</div>'
-      : '<div contenteditable dir="ltr">abcdef\u05D0\u05D1\u05D2<img>\u05D3\u05D4|\u05D5</div>',
+  '<div contenteditable dir="ltr">abcdef\u05D0\u05D1\u05D2<img>\u05D3\u05D4|\u05D5</div>',
   '25-6 ltr right character');
 
 selection_test(
   '<div contenteditable dir="ltr">abcdef\u05D0|\u05D1\u05D2<img>\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">abcdef|\u05d0\u05d1\u05d2<img>\u05d3\u05d4\u05d5</div>'
-      : '<div contenteditable dir="ltr">abcdef\u05D0\u05D1\u05D2<img>\u05D3\u05D4\u05D5|</div>',
+  '<div contenteditable dir="ltr">abcdef\u05D0\u05D1\u05D2<img>\u05D3\u05D4\u05D5|</div>',
   '25-7 ltr right character');
 
 selection_test(
@@ -90,8 +84,6 @@
 selection_test(
   '<div contenteditable dir="ltr">abcdef\u05D0\u05D1\u05D2<img>\u05D3\u05D4\u05D5|</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">abcdef\u05d0\u05d1\u05d2<img>\u05d3\u05d4|\u05d5</div>'
-      : '<div contenteditable dir="ltr">abcdef\u05D0\u05D1\u05D2<img>\u05D3\u05D4\u05D5|</div>',
+  '<div contenteditable dir="ltr">abcdef\u05D0\u05D1\u05D2<img>\u05D3\u05D4\u05D5|</div>',
   '25-13 ltr right character');
 </script>
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_25_rtl.html b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_25_rtl.html
index 49f47e93..29e6ad6 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_25_rtl.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_25_rtl.html
@@ -3,14 +3,10 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="rtl">|abcdef\u05D0\u05D1\u05D2<img>\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">a|bcdef\u05d0\u05d1\u05d2<img>\u05d3\u05d4\u05d5</div>'
-      : '<div contenteditable dir="rtl">|abcdef\u05D0\u05D1\u05D2<img>\u05D3\u05D4\u05D5</div>',
+  '<div contenteditable dir="rtl">|abcdef\u05D0\u05D1\u05D2<img>\u05D3\u05D4\u05D5</div>',
   '25-0 rtl right character');
 
 selection_test(
@@ -40,9 +36,7 @@
 selection_test(
   '<div contenteditable dir="rtl">abcde|f\u05D0\u05D1\u05D2<img>\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abcdef|\u05d0\u05d1\u05d2<img>\u05d3\u05d4\u05d5</div>'
-      : '<div contenteditable dir="rtl">|abcdef\u05D0\u05D1\u05D2<img>\u05D3\u05D4\u05D5</div>',
+  '<div contenteditable dir="rtl">|abcdef\u05D0\u05D1\u05D2<img>\u05D3\u05D4\u05D5</div>',
   '25-5 rtl right character');
 
 selection_test(
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_26_ltr.html b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_26_ltr.html
index 63be6d4..2066a0fc 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_26_ltr.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_26_ltr.html
@@ -3,22 +3,16 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2\u05D3\u05D4\u05D5abc<img>def</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1\u05d2\u05d3\u05d4\u05d5a|bc<img>def</div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2\u05D3\u05D4|\u05D5abc<img>def</div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2\u05D3\u05D4|\u05D5abc<img>def</div>',
   '26-0 ltr right character');
 
 selection_test(
   '<div contenteditable dir="ltr">\u05D0|\u05D1\u05D2\u05D3\u05D4\u05D5abc<img>def</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">|\u05d0\u05d1\u05d2\u05d3\u05d4\u05d5abc<img>def</div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2\u05D3\u05D4\u05D5|abc<img>def</div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2\u05D3\u05D4\u05D5|abc<img>def</div>',
   '26-1 ltr right character');
 
 selection_test(
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_26_rtl.html b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_26_rtl.html
index 8f1732f..0495298 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_26_rtl.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_26_rtl.html
@@ -3,8 +3,6 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="rtl">|\u05D0\u05D1\u05D2\u05D3\u05D4\u05D5abc<img>def</div>',
   selection => selection.modify('move', 'right', 'character'),
@@ -44,9 +42,7 @@
 selection_test(
   '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2\u05D3\u05D4\u05D5|abc<img>def</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u05d0\u05d1\u05d2\u05d3\u05d4\u05d5a|bc<img>def</div>'
-      : '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2\u05D3\u05D4|\u05D5abc<img>def</div>',
+  '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2\u05D3\u05D4|\u05D5abc<img>def</div>',
   '26-6 rtl right character');
 
 selection_test(
@@ -82,16 +78,12 @@
 selection_test(
   '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2\u05D3\u05D4\u05D5abc<img>de|f</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u05d0\u05d1\u05d2\u05d3\u05d4\u05d5abc<img>def|</div>'
-      : '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2\u05D3\u05D4\u05D5|abc<img>def</div>',
+  '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2\u05D3\u05D4\u05D5|abc<img>def</div>',
   '26-12 rtl right character');
 
 selection_test(
   '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2\u05D3\u05D4\u05D5abc<img>def|</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u05d0\u05d1\u05d2\u05d3\u05d4|\u05d5abc<img>def</div>'
-      : '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2\u05D3\u05D4\u05D5a|bc<img>def</div>',
+  '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2\u05D3\u05D4\u05D5a|bc<img>def</div>',
   '26-13 rtl right character');
 </script>
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_27_ltr.html b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_27_ltr.html
index 6e21005..b0533f9 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_27_ltr.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_27_ltr.html
@@ -3,8 +3,6 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="ltr">|abc<input>\u05D0\u05D1\u05D2<img><img>\u05D3\u05D4\u05D5ghi</div>',
   selection => selection.modify('move', 'right', 'character'),
@@ -32,17 +30,13 @@
 selection_test(
   '<div contenteditable dir="ltr">abc<input>|\u05D0\u05D1\u05D2<img><img>\u05D3\u05D4\u05D5ghi</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">abc<input>\u05D0\u05D1\u05D2<img><img>\u05D3\u05D4\u05D5g|hi</div>'
-      : '<div contenteditable dir="ltr">abc<input>\u05D0\u05D1\u05D2<img><img>\u05D3\u05D4|\u05D5ghi</div>',
+  '<div contenteditable dir="ltr">abc<input>\u05D0\u05D1\u05D2<img><img>\u05D3\u05D4|\u05D5ghi</div>',
   '27-4 ltr right character');
 
 selection_test(
   '<div contenteditable dir="ltr">abc<input>\u05D0|\u05D1\u05D2<img><img>\u05D3\u05D4\u05D5ghi</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">abc<input>|\u05D0\u05D1\u05D2<img><img>\u05D3\u05D4\u05D5ghi</div>'
-      : '<div contenteditable dir="ltr">abc<input>\u05D0\u05D1\u05D2<img><img>\u05D3\u05D4\u05D5|ghi</div>',
+  '<div contenteditable dir="ltr">abc<input>\u05D0\u05D1\u05D2<img><img>\u05D3\u05D4\u05D5|ghi</div>',
   '27-5 ltr right character');
 
 selection_test(
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_27_rtl.html b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_27_rtl.html
index ecada0b..88baf52 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_27_rtl.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_27_rtl.html
@@ -3,14 +3,10 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="rtl">|abc<input>\u05D0\u05D1\u05D2<img><img>\u05D3\u05D4\u05D5ghi</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">a|bc<input>\u05D0\u05D1\u05D2<img><img>\u05D3\u05D4\u05D5ghi</div>'
-      : '<div contenteditable dir="rtl">|abc<input>\u05D0\u05D1\u05D2<img><img>\u05D3\u05D4\u05D5ghi</div>',
+  '<div contenteditable dir="rtl">|abc<input>\u05D0\u05D1\u05D2<img><img>\u05D3\u05D4\u05D5ghi</div>',
   '27-0 rtl right character');
 
 selection_test(
@@ -22,9 +18,7 @@
 selection_test(
   '<div contenteditable dir="rtl">ab|c<input>\u05D0\u05D1\u05D2<img><img>\u05D3\u05D4\u05D5ghi</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc|<input>\u05D0\u05D1\u05D2<img><img>\u05D3\u05D4\u05D5ghi</div>'
-      : '<div contenteditable dir="rtl">|abc<input>\u05D0\u05D1\u05D2<img><img>\u05D3\u05D4\u05D5ghi</div>',
+  '<div contenteditable dir="rtl">|abc<input>\u05D0\u05D1\u05D2<img><img>\u05D3\u05D4\u05D5ghi</div>',
   '27-2 rtl right character');
 
 selection_test(
@@ -84,9 +78,7 @@
 selection_test(
   '<div contenteditable dir="rtl">abc<input>\u05D0\u05D1\u05D2<img><img>\u05D3\u05D4\u05D5|ghi</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc<input>\u05D0\u05D1\u05D2<img><img>\u05D3\u05D4\u05D5g|hi</div>'
-      : '<div contenteditable dir="rtl">abc<input>\u05D0\u05D1\u05D2<img><img>\u05D3\u05D4|\u05D5ghi</div>',
+  '<div contenteditable dir="rtl">abc<input>\u05D0\u05D1\u05D2<img><img>\u05D3\u05D4|\u05D5ghi</div>',
   '27-12 rtl right character');
 
 selection_test(
@@ -98,16 +90,12 @@
 selection_test(
   '<div contenteditable dir="rtl">abc<input>\u05D0\u05D1\u05D2<img><img>\u05D3\u05D4\u05D5gh|i</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc<input>\u05D0\u05D1\u05D2<img><img>\u05D3\u05D4\u05D5ghi|</div>'
-      : '<div contenteditable dir="rtl">abc<input>\u05D0\u05D1\u05D2<img><img>\u05D3\u05D4\u05D5|ghi</div>',
+  '<div contenteditable dir="rtl">abc<input>\u05D0\u05D1\u05D2<img><img>\u05D3\u05D4\u05D5|ghi</div>',
   '27-14 rtl right character');
 
 selection_test(
   '<div contenteditable dir="rtl">abc<input>\u05D0\u05D1\u05D2<img><img>\u05D3\u05D4\u05D5ghi|</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc<input>\u05D0\u05D1\u05D2<img><img>\u05D3\u05D4|\u05D5ghi</div>'
-      : '<div contenteditable dir="rtl">abc<input>\u05D0\u05D1\u05D2<img><img>\u05D3\u05D4\u05D5g|hi</div>',
+  '<div contenteditable dir="rtl">abc<input>\u05D0\u05D1\u05D2<img><img>\u05D3\u05D4\u05D5g|hi</div>',
   '27-15 rtl right character');
 </script>
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_28_ltr.html b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_28_ltr.html
index 6c7d611..791ddf5 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_28_ltr.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_28_ltr.html
@@ -3,22 +3,16 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2<input>abc<img><img>def\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2<input>|abc<img><img>def\u05D3\u05D4\u05D5</div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1|\u05D2<input>abc<img><img>def\u05D3\u05D4\u05D5</div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1|\u05D2<input>abc<img><img>def\u05D3\u05D4\u05D5</div>',
   '28-0 ltr right character');
 
 selection_test(
   '<div contenteditable dir="ltr">\u05D0|\u05D1\u05D2<input>abc<img><img>def\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2<input>abc<img><img>def\u05D3\u05D4\u05D5</div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2|<input>abc<img><img>def\u05D3\u05D4\u05D5</div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2|<input>abc<img><img>def\u05D3\u05D4\u05D5</div>',
   '28-1 ltr right character');
 
 selection_test(
@@ -84,17 +78,13 @@
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2<input>abc<img><img>def|\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2<input>abc<img><img>def|\u05D3\u05D4\u05D5</div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2<input>abc<img><img>def\u05D3\u05D4|\u05D5</div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2<input>abc<img><img>def\u05D3\u05D4|\u05D5</div>',
   '28-12 ltr right character');
 
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2<input>abc<img><img>def\u05D3|\u05D4\u05D5</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2<input>abc<img><img>def|\u05D3\u05D4\u05D5</div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2<input>abc<img><img>def\u05D3\u05D4\u05D5|</div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2<input>abc<img><img>def\u05D3\u05D4\u05D5|</div>',
   '28-13 ltr right character');
 
 selection_test(
@@ -106,8 +96,6 @@
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2<input>abc<img><img>def\u05D3\u05D4\u05D5|</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2<input>abc<img><img>def\u05D3\u05D4|\u05D5</div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2<input>abc<img><img>def\u05D3\u05D4\u05D5|</div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2<input>abc<img><img>def\u05D3\u05D4\u05D5|</div>',
   '28-15 ltr right character');
 </script>
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_28_rtl.html b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_28_rtl.html
index ba04228..ced055f 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_28_rtl.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_28_rtl.html
@@ -3,8 +3,6 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="rtl">|\u05D0\u05D1\u05D2<input>abc<img><img>def\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'right', 'character'),
@@ -32,9 +30,7 @@
 selection_test(
   '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2<input>|abc<img><img>def\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2<input>a|bc<img><img>def\u05D3\u05D4\u05D5</div>'
-      : '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2|<input>abc<img><img>def\u05D3\u05D4\u05D5</div>',
+  '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2|<input>abc<img><img>def\u05D3\u05D4\u05D5</div>',
   '28-4 rtl right character');
 
 selection_test(
@@ -76,9 +72,7 @@
 selection_test(
   '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2<input>abc<img><img>de|f\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2<input>abc<img><img>def|\u05D3\u05D4\u05D5</div>'
-      : '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2<input>|abc<img><img>def\u05D3\u05D4\u05D5</div>',
+  '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2<input>|abc<img><img>def\u05D3\u05D4\u05D5</div>',
   '28-11 rtl right character');
 
 selection_test(
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_29_ltr.html b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_29_ltr.html
index 2733815c..21dbb64 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_29_ltr.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_29_ltr.html
@@ -3,8 +3,6 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="ltr">|abc\u05D0\u05D1\u05D2<span>\u05D3\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'right', 'character'),
@@ -26,17 +24,13 @@
 selection_test(
   '<div contenteditable dir="ltr">abc|\u05D0\u05D1\u05D2<span>\u05D3\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">abc|\u05d0\u05d1\u05d2<span>\u05d3\u05d4\u05d5</span></div>'
-      : '<div contenteditable dir="ltr">abc\u05D0\u05D1\u05D2<span>\u05D3\u05D4|\u05D5</span></div>',
+  '<div contenteditable dir="ltr">abc\u05D0\u05D1\u05D2<span>\u05D3\u05D4|\u05D5</span></div>',
   '29-3 ltr right character');
 
 selection_test(
   '<div contenteditable dir="ltr">abc\u05D0|\u05D1\u05D2<span>\u05D3\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">abc|\u05d0\u05d1\u05d2<span>\u05d3\u05d4\u05d5</span></div>'
-      : '<div contenteditable dir="ltr">abc\u05D0\u05D1\u05D2<span>\u05D3\u05D4\u05D5|</span></div>',
+  '<div contenteditable dir="ltr">abc\u05D0\u05D1\u05D2<span>\u05D3\u05D4\u05D5|</span></div>',
   '29-4 ltr right character');
 
 selection_test(
@@ -72,16 +66,12 @@
 selection_test(
   '<div contenteditable dir="ltr">abc\u05D0\u05D1\u05D2<span>\u05D3\u05D4\u05D5|</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">abc\u05d0\u05d1\u05d2<span>\u05d3\u05d4|\u05d5</span></div>'
-      : '<div contenteditable dir="ltr">abc\u05D0\u05D1\u05D2<span>\u05D3\u05D4\u05D5|</span></div>',
+  '<div contenteditable dir="ltr">abc\u05D0\u05D1\u05D2<span>\u05D3\u05D4\u05D5|</span></div>',
   '29-10 ltr right character');
 
 selection_test(
   '<div contenteditable dir="ltr">abc\u05D0\u05D1\u05D2<span>\u05D3\u05D4\u05D5</span>|</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">abc\u05d0\u05d1\u05d2<span>\u05d3\u05d4|\u05d5</span></div>'
-      : '<div contenteditable dir="ltr">abc\u05D0\u05D1\u05D2<span>\u05D3\u05D4\u05D5</span>|</div>',
+  '<div contenteditable dir="ltr">abc\u05D0\u05D1\u05D2<span>\u05D3\u05D4\u05D5</span>|</div>',
   '29-11 ltr right character');
 </script>
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_29_rtl.html b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_29_rtl.html
index 186577b..8b1eb81d 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_29_rtl.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_29_rtl.html
@@ -3,14 +3,10 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="rtl">|abc\u05D0\u05D1\u05D2<span>\u05D3\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">a|bc\u05d0\u05d1\u05d2<span>\u05d3\u05d4\u05d5</span></div>'
-      : '<div contenteditable dir="rtl">|abc\u05D0\u05D1\u05D2<span>\u05D3\u05D4\u05D5</span></div>',
+  '<div contenteditable dir="rtl">|abc\u05D0\u05D1\u05D2<span>\u05D3\u05D4\u05D5</span></div>',
   '29-0 rtl right character');
 
 selection_test(
@@ -22,9 +18,7 @@
 selection_test(
   '<div contenteditable dir="rtl">ab|c\u05D0\u05D1\u05D2<span>\u05D3\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc|\u05d0\u05d1\u05d2<span>\u05d3\u05d4\u05d5</span></div>'
-      : '<div contenteditable dir="rtl">|abc\u05D0\u05D1\u05D2<span>\u05D3\u05D4\u05D5</span></div>',
+  '<div contenteditable dir="rtl">|abc\u05D0\u05D1\u05D2<span>\u05D3\u05D4\u05D5</span></div>',
   '29-2 rtl right character');
 
 selection_test(
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_30_ltr.html b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_30_ltr.html
index 6b47898..431ec56 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_30_ltr.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_30_ltr.html
@@ -3,22 +3,16 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2abc<span>def</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1\u05d2a|bc<span>def</span></div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1|\u05D2abc<span>def</span></div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1|\u05D2abc<span>def</span></div>',
   '30-0 ltr right character');
 
 selection_test(
   '<div contenteditable dir="ltr">\u05D0|\u05D1\u05D2abc<span>def</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">|\u05d0\u05d1\u05d2abc<span>def</span></div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2|abc<span>def</span></div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2|abc<span>def</span></div>',
   '30-1 ltr right character');
 
 selection_test(
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_30_rtl.html b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_30_rtl.html
index ebb4828..0de7dbc 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_30_rtl.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_30_rtl.html
@@ -3,8 +3,6 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="rtl">|\u05D0\u05D1\u05D2abc<span>def</span></div>',
   selection => selection.modify('move', 'right', 'character'),
@@ -26,9 +24,7 @@
 selection_test(
   '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2|abc<span>def</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u05d0\u05d1\u05d2a|bc<span>def</span></div>'
-      : '<div contenteditable dir="rtl">\u05D0\u05D1|\u05D2abc<span>def</span></div>',
+  '<div contenteditable dir="rtl">\u05D0\u05D1|\u05D2abc<span>def</span></div>',
   '30-3 rtl right character');
 
 selection_test(
@@ -64,24 +60,18 @@
 selection_test(
   '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2abc<span>de|f</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u05d0\u05d1\u05d2abc<span>def|</span></div>'
-      : '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2|abc<span>def</span></div>',
+  '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2|abc<span>def</span></div>',
   '30-9 rtl right character');
 
 selection_test(
   '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2abc<span>def|</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u05d0\u05d1|\u05d2abc<span>def</span></div>'
-      : '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2a|bc<span>def</span></div>',
+  '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2a|bc<span>def</span></div>',
   '30-10 rtl right character');
 
 selection_test(
   '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2abc<span>def</span>|</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u05d0\u05d1|\u05d2abc<span>def</span></div>'
-      : '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2a|bc<span>def</span></div>',
+  '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2a|bc<span>def</span></div>',
   '30-11 rtl right character');
 </script>
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_31_ltr.html b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_31_ltr.html
index 15cbf6d8..46a7575 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_31_ltr.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_31_ltr.html
@@ -3,8 +3,6 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="ltr">|ab<span>c\u05D0\u05D1\u05D2def</span></div>',
   selection => selection.modify('move', 'right', 'character'),
@@ -32,17 +30,13 @@
 selection_test(
   '<div contenteditable dir="ltr">ab<span>c|\u05D0\u05D1\u05D2def</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">ab<span>c\u05d0\u05d1\u05d2d|ef</span></div>'
-      : '<div contenteditable dir="ltr">ab<span>c\u05D0\u05D1|\u05D2def</span></div>',
+  '<div contenteditable dir="ltr">ab<span>c\u05D0\u05D1|\u05D2def</span></div>',
   '31-4 ltr right character');
 
 selection_test(
   '<div contenteditable dir="ltr">ab<span>c\u05D0|\u05D1\u05D2def</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">ab<span>c|\u05d0\u05d1\u05d2def</span></div>'
-      : '<div contenteditable dir="ltr">ab<span>c\u05D0\u05D1\u05D2|def</span></div>',
+  '<div contenteditable dir="ltr">ab<span>c\u05D0\u05D1\u05D2|def</span></div>',
   '31-5 ltr right character');
 
 selection_test(
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_31_rtl.html b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_31_rtl.html
index 1316316..bd72796 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_31_rtl.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_31_rtl.html
@@ -3,14 +3,10 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="rtl">|ab<span>c\u05D0\u05D1\u05D2def</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">a|b<span>c\u05d0\u05d1\u05d2def</span></div>'
-      : '<div contenteditable dir="rtl">|ab<span>c\u05D0\u05D1\u05D2def</span></div>',
+  '<div contenteditable dir="rtl">|ab<span>c\u05D0\u05D1\u05D2def</span></div>',
   '31-0 rtl right character');
 
 selection_test(
@@ -22,17 +18,13 @@
 selection_test(
   '<div contenteditable dir="rtl">ab|<span>c\u05D0\u05D1\u05D2def</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">ab<span>c|\u05d0\u05d1\u05d2def</span></div>'
-      : '<div contenteditable dir="rtl">|ab<span>c\u05D0\u05D1\u05D2def</span></div>',
+  '<div contenteditable dir="rtl">|ab<span>c\u05D0\u05D1\u05D2def</span></div>',
   '31-2 rtl right character');
 
 selection_test(
   '<div contenteditable dir="rtl">ab<span>|c\u05D0\u05D1\u05D2def</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">ab<span>c|\u05d0\u05d1\u05d2def</span></div>'
-      : '<div contenteditable dir="rtl">|ab<span>c\u05D0\u05D1\u05D2def</span></div>',
+  '<div contenteditable dir="rtl">|ab<span>c\u05D0\u05D1\u05D2def</span></div>',
   '31-3 rtl right character');
 
 selection_test(
@@ -56,9 +48,7 @@
 selection_test(
   '<div contenteditable dir="rtl">ab<span>c\u05D0\u05D1\u05D2|def</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">ab<span>c\u05d0\u05d1\u05d2d|ef</span></div>'
-      : '<div contenteditable dir="rtl">ab<span>c\u05D0\u05D1|\u05D2def</span></div>',
+  '<div contenteditable dir="rtl">ab<span>c\u05D0\u05D1|\u05D2def</span></div>',
   '31-7 rtl right character');
 
 selection_test(
@@ -70,24 +60,18 @@
 selection_test(
   '<div contenteditable dir="rtl">ab<span>c\u05D0\u05D1\u05D2de|f</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">ab<span>c\u05d0\u05d1\u05d2def|</span></div>'
-      : '<div contenteditable dir="rtl">ab<span>c\u05D0\u05D1\u05D2|def</span></div>',
+  '<div contenteditable dir="rtl">ab<span>c\u05D0\u05D1\u05D2|def</span></div>',
   '31-9 rtl right character');
 
 selection_test(
   '<div contenteditable dir="rtl">ab<span>c\u05D0\u05D1\u05D2def|</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">ab<span>c\u05d0\u05d1|\u05d2def</span></div>'
-      : '<div contenteditable dir="rtl">ab<span>c\u05D0\u05D1\u05D2d|ef</span></div>',
+  '<div contenteditable dir="rtl">ab<span>c\u05D0\u05D1\u05D2d|ef</span></div>',
   '31-10 rtl right character');
 
 selection_test(
   '<div contenteditable dir="rtl">ab<span>c\u05D0\u05D1\u05D2def</span>|</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">ab<span>c\u05d0\u05d1|\u05d2def</span></div>'
-      : '<div contenteditable dir="rtl">ab<span>c\u05D0\u05D1\u05D2d|ef</span></div>',
+  '<div contenteditable dir="rtl">ab<span>c\u05D0\u05D1\u05D2d|ef</span></div>',
   '31-11 rtl right character');
 </script>
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_32_ltr.html b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_32_ltr.html
index f2133ff..08c56a6 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_32_ltr.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_32_ltr.html
@@ -3,22 +3,16 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="ltr">|\u05D0\u05D1<span>\u05D2abc\u05D3\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1<span>\u05d2a|bc\u05d3\u05d4\u05d5</span></div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1|<span>\u05D2abc\u05D3\u05D4\u05D5</span></div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1|<span>\u05D2abc\u05D3\u05D4\u05D5</span></div>',
   '32-0 ltr right character');
 
 selection_test(
   '<div contenteditable dir="ltr">\u05D0|\u05D1<span>\u05D2abc\u05D3\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">|\u05d0\u05d1<span>\u05d2abc\u05d3\u05d4\u05d5</span></div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1<span>\u05D2|abc\u05D3\u05D4\u05D5</span></div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1<span>\u05D2|abc\u05D3\u05D4\u05D5</span></div>',
   '32-1 ltr right character');
 
 selection_test(
@@ -54,17 +48,13 @@
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1<span>\u05D2abc|\u05D3\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1<span>\u05d2abc|\u05d3\u05d4\u05d5</span></div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1<span>\u05D2abc\u05D3\u05D4|\u05D5</span></div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1<span>\u05D2abc\u05D3\u05D4|\u05D5</span></div>',
   '32-7 ltr right character');
 
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1<span>\u05D2abc\u05D3|\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1<span>\u05d2abc|\u05d3\u05d4\u05d5</span></div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1<span>\u05D2abc\u05D3\u05D4\u05D5|</span></div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1<span>\u05D2abc\u05D3\u05D4\u05D5|</span></div>',
   '32-8 ltr right character');
 
 selection_test(
@@ -76,16 +66,12 @@
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1<span>\u05D2abc\u05D3\u05D4\u05D5|</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1<span>\u05d2abc\u05d3\u05d4|\u05d5</span></div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1<span>\u05D2abc\u05D3\u05D4\u05D5|</span></div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1<span>\u05D2abc\u05D3\u05D4\u05D5|</span></div>',
   '32-10 ltr right character');
 
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1<span>\u05D2abc\u05D3\u05D4\u05D5</span>|</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1<span>\u05d2abc\u05d3\u05d4|\u05d5</span></div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1<span>\u05D2abc\u05D3\u05D4\u05D5</span>|</div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1<span>\u05D2abc\u05D3\u05D4\u05D5</span>|</div>',
   '32-11 ltr right character');
 </script>
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_32_rtl.html b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_32_rtl.html
index 44ed480..37975dc1 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_32_rtl.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_32_rtl.html
@@ -3,8 +3,6 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="rtl">|\u05D0\u05D1<span>\u05D2abc\u05D3\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'right', 'character'),
@@ -32,9 +30,7 @@
 selection_test(
   '<div contenteditable dir="rtl">\u05D0\u05D1<span>\u05D2|abc\u05D3\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u05d0\u05d1<span>\u05d2a|bc\u05d3\u05d4\u05d5</span></div>'
-      : '<div contenteditable dir="rtl">\u05D0\u05D1|<span>\u05D2abc\u05D3\u05D4\u05D5</span></div>',
+  '<div contenteditable dir="rtl">\u05D0\u05D1|<span>\u05D2abc\u05D3\u05D4\u05D5</span></div>',
   '32-4 rtl right character');
 
 selection_test(
@@ -46,9 +42,7 @@
 selection_test(
   '<div contenteditable dir="rtl">\u05D0\u05D1<span>\u05D2ab|c\u05D3\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u05d0\u05d1<span>\u05d2abc|\u05d3\u05d4\u05d5</span></div>'
-      : '<div contenteditable dir="rtl">\u05D0\u05D1<span>\u05D2|abc\u05D3\u05D4\u05D5</span></div>',
+  '<div contenteditable dir="rtl">\u05D0\u05D1<span>\u05D2|abc\u05D3\u05D4\u05D5</span></div>',
   '32-6 rtl right character');
 
 selection_test(
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_33_ltr.html b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_33_ltr.html
index 157c390..7aae4f2 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_33_ltr.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_33_ltr.html
@@ -3,8 +3,6 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="ltr">|abc<span>\u05D0\u05D1\u05D2def</span></div>',
   selection => selection.modify('move', 'right', 'character'),
@@ -26,25 +24,19 @@
 selection_test(
   '<div contenteditable dir="ltr">abc|<span>\u05D0\u05D1\u05D2def</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">abc<span>\u05d0\u05d1\u05d2d|ef</span></div>'
-      : '<div contenteditable dir="ltr">abc<span>\u05D0\u05D1|\u05D2def</span></div>',
+  '<div contenteditable dir="ltr">abc<span>\u05D0\u05D1|\u05D2def</span></div>',
   '33-3 ltr right character');
 
 selection_test(
   '<div contenteditable dir="ltr">abc<span>|\u05D0\u05D1\u05D2def</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">abc<span>\u05d0\u05d1\u05d2d|ef</span></div>'
-      : '<div contenteditable dir="ltr">abc<span>\u05D0\u05D1|\u05D2def</span></div>',
+  '<div contenteditable dir="ltr">abc<span>\u05D0\u05D1|\u05D2def</span></div>',
   '33-4 ltr right character');
 
 selection_test(
   '<div contenteditable dir="ltr">abc<span>\u05D0|\u05D1\u05D2def</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">abc|<span>\u05d0\u05d1\u05d2def</span></div>'
-      : '<div contenteditable dir="ltr">abc<span>\u05D0\u05D1\u05D2|def</span></div>',
+  '<div contenteditable dir="ltr">abc<span>\u05D0\u05D1\u05D2|def</span></div>',
   '33-5 ltr right character');
 
 selection_test(
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_33_rtl.html b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_33_rtl.html
index 0e8d3bd..839ad23 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_33_rtl.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_33_rtl.html
@@ -3,14 +3,10 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="rtl">|abc<span>\u05D0\u05D1\u05D2def</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">a|bc<span>\u05d0\u05d1\u05d2def</span></div>'
-      : '<div contenteditable dir="rtl">|abc<span>\u05D0\u05D1\u05D2def</span></div>',
+  '<div contenteditable dir="rtl">|abc<span>\u05D0\u05D1\u05D2def</span></div>',
   '33-0 rtl right character');
 
 selection_test(
@@ -22,9 +18,7 @@
 selection_test(
   '<div contenteditable dir="rtl">ab|c<span>\u05D0\u05D1\u05D2def</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc|<span>\u05d0\u05d1\u05d2def</span></div>'
-      : '<div contenteditable dir="rtl">|abc<span>\u05D0\u05D1\u05D2def</span></div>',
+  '<div contenteditable dir="rtl">|abc<span>\u05D0\u05D1\u05D2def</span></div>',
   '33-2 rtl right character');
 
 selection_test(
@@ -54,9 +48,7 @@
 selection_test(
   '<div contenteditable dir="rtl">abc<span>\u05D0\u05D1\u05D2|def</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc<span>\u05d0\u05d1\u05d2d|ef</span></div>'
-      : '<div contenteditable dir="rtl">abc<span>\u05D0\u05D1|\u05D2def</span></div>',
+  '<div contenteditable dir="rtl">abc<span>\u05D0\u05D1|\u05D2def</span></div>',
   '33-7 rtl right character');
 
 selection_test(
@@ -68,24 +60,18 @@
 selection_test(
   '<div contenteditable dir="rtl">abc<span>\u05D0\u05D1\u05D2de|f</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc<span>\u05d0\u05d1\u05d2def|</span></div>'
-      : '<div contenteditable dir="rtl">abc<span>\u05D0\u05D1\u05D2|def</span></div>',
+  '<div contenteditable dir="rtl">abc<span>\u05D0\u05D1\u05D2|def</span></div>',
   '33-9 rtl right character');
 
 selection_test(
   '<div contenteditable dir="rtl">abc<span>\u05D0\u05D1\u05D2def|</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc<span>\u05d0\u05d1|\u05d2def</span></div>'
-      : '<div contenteditable dir="rtl">abc<span>\u05D0\u05D1\u05D2d|ef</span></div>',
+  '<div contenteditable dir="rtl">abc<span>\u05D0\u05D1\u05D2d|ef</span></div>',
   '33-10 rtl right character');
 
 selection_test(
   '<div contenteditable dir="rtl">abc<span>\u05D0\u05D1\u05D2def</span>|</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc<span>\u05d0\u05d1|\u05d2def</span></div>'
-      : '<div contenteditable dir="rtl">abc<span>\u05D0\u05D1\u05D2d|ef</span></div>',
+  '<div contenteditable dir="rtl">abc<span>\u05D0\u05D1\u05D2d|ef</span></div>',
   '33-11 rtl right character');
 </script>
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_34_ltr.html b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_34_ltr.html
index d71e013..f251a39 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_34_ltr.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_34_ltr.html
@@ -3,22 +3,16 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2<span>abc\u05D3\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1\u05d2<span>a|bc\u05d3\u05d4\u05d5</span></div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1|\u05D2<span>abc\u05D3\u05D4\u05D5</span></div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1|\u05D2<span>abc\u05D3\u05D4\u05D5</span></div>',
   '34-0 ltr right character');
 
 selection_test(
   '<div contenteditable dir="ltr">\u05D0|\u05D1\u05D2<span>abc\u05D3\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">|\u05d0\u05d1\u05d2<span>abc\u05d3\u05d4\u05d5</span></div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2|<span>abc\u05D3\u05D4\u05D5</span></div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2|<span>abc\u05D3\u05D4\u05D5</span></div>',
   '34-1 ltr right character');
 
 selection_test(
@@ -54,17 +48,13 @@
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2<span>abc|\u05D3\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1\u05d2<span>abc|\u05d3\u05d4\u05d5</span></div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2<span>abc\u05D3\u05D4|\u05D5</span></div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2<span>abc\u05D3\u05D4|\u05D5</span></div>',
   '34-7 ltr right character');
 
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2<span>abc\u05D3|\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1\u05d2<span>abc|\u05d3\u05d4\u05d5</span></div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2<span>abc\u05D3\u05D4\u05D5|</span></div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2<span>abc\u05D3\u05D4\u05D5|</span></div>',
   '34-8 ltr right character');
 
 selection_test(
@@ -76,16 +66,12 @@
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2<span>abc\u05D3\u05D4\u05D5|</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1\u05d2<span>abc\u05d3\u05d4|\u05d5</span></div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2<span>abc\u05D3\u05D4\u05D5|</span></div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2<span>abc\u05D3\u05D4\u05D5|</span></div>',
   '34-10 ltr right character');
 
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2<span>abc\u05D3\u05D4\u05D5</span>|</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1\u05d2<span>abc\u05d3\u05d4|\u05d5</span></div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2<span>abc\u05D3\u05D4\u05D5</span>|</div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2<span>abc\u05D3\u05D4\u05D5</span>|</div>',
   '34-11 ltr right character');
 </script>
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_34_rtl.html b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_34_rtl.html
index c70b477..6c19fbc 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_34_rtl.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_34_rtl.html
@@ -3,8 +3,6 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="rtl">|\u05D0\u05D1\u05D2<span>abc\u05D3\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'right', 'character'),
@@ -26,17 +24,13 @@
 selection_test(
   '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2|<span>abc\u05D3\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u05d0\u05d1\u05d2<span>a|bc\u05d3\u05d4\u05d5</span></div>'
-      : '<div contenteditable dir="rtl">\u05D0\u05D1|\u05D2<span>abc\u05D3\u05D4\u05D5</span></div>',
+  '<div contenteditable dir="rtl">\u05D0\u05D1|\u05D2<span>abc\u05D3\u05D4\u05D5</span></div>',
   '34-3 rtl right character');
 
 selection_test(
   '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2<span>|abc\u05D3\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u05d0\u05d1\u05d2<span>a|bc\u05d3\u05d4\u05d5</span></div>'
-      : '<div contenteditable dir="rtl">\u05D0\u05D1|\u05D2<span>abc\u05D3\u05D4\u05D5</span></div>',
+  '<div contenteditable dir="rtl">\u05D0\u05D1|\u05D2<span>abc\u05D3\u05D4\u05D5</span></div>',
   '34-4 rtl right character');
 
 selection_test(
@@ -48,9 +42,7 @@
 selection_test(
   '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2<span>ab|c\u05D3\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u05d0\u05d1\u05d2<span>abc|\u05d3\u05d4\u05d5</span></div>'
-      : '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2|<span>abc\u05D3\u05D4\u05D5</span></div>',
+  '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2|<span>abc\u05D3\u05D4\u05D5</span></div>',
   '34-6 rtl right character');
 
 selection_test(
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_35_ltr.html b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_35_ltr.html
index ae73a45..04f68ffc 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_35_ltr.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_35_ltr.html
@@ -3,8 +3,6 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="ltr">|abc\u05D0def</div>',
   selection => selection.modify('move', 'right', 'character'),
@@ -26,9 +24,7 @@
 selection_test(
   '<div contenteditable dir="ltr">abc|\u05D0def</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">abc\u05D0d|ef</div>'
-      : '<div contenteditable dir="ltr">abc\u05D0|def</div>',
+  '<div contenteditable dir="ltr">abc\u05D0|def</div>',
   '35-3 ltr right character');
 
 selection_test(
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_35_rtl.html b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_35_rtl.html
index dde1002..9cefcfd 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_35_rtl.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_35_rtl.html
@@ -3,14 +3,10 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="rtl">|abc\u05D0def</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">a|bc\u05D0def</div>'
-      : '<div contenteditable dir="rtl">|abc\u05D0def</div>',
+  '<div contenteditable dir="rtl">|abc\u05D0def</div>',
   '35-0 rtl right character');
 
 selection_test(
@@ -22,9 +18,7 @@
 selection_test(
   '<div contenteditable dir="rtl">ab|c\u05D0def</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc|\u05D0def</div>'
-      : '<div contenteditable dir="rtl">|abc\u05D0def</div>',
+  '<div contenteditable dir="rtl">|abc\u05D0def</div>',
   '35-2 rtl right character');
 
 selection_test(
@@ -36,9 +30,7 @@
 selection_test(
   '<div contenteditable dir="rtl">abc\u05D0|def</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc\u05D0d|ef</div>'
-      : '<div contenteditable dir="rtl">abc|\u05D0def</div>',
+  '<div contenteditable dir="rtl">abc|\u05D0def</div>',
   '35-4 rtl right character');
 
 selection_test(
@@ -50,16 +42,12 @@
 selection_test(
   '<div contenteditable dir="rtl">abc\u05D0de|f</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc\u05D0def|</div>'
-      : '<div contenteditable dir="rtl">abc\u05D0|def</div>',
+  '<div contenteditable dir="rtl">abc\u05D0|def</div>',
   '35-6 rtl right character');
 
 selection_test(
   '<div contenteditable dir="rtl">abc\u05D0def|</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc|\u05D0def</div>'
-      : '<div contenteditable dir="rtl">abc\u05D0d|ef</div>',
+  '<div contenteditable dir="rtl">abc\u05D0d|ef</div>',
   '35-7 rtl right character');
 </script>
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_36_ltr.html b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_36_ltr.html
index c50c1f4..824e5ab1 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_36_ltr.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_36_ltr.html
@@ -3,22 +3,16 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2a\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2a|\u05D3\u05D4\u05D5</div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1|\u05D2a\u05D3\u05D4\u05D5</div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1|\u05D2a\u05D3\u05D4\u05D5</div>',
   '36-0 ltr right character');
 
 selection_test(
   '<div contenteditable dir="ltr">\u05D0|\u05D1\u05D2a\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2a\u05D3\u05D4\u05D5</div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2|a\u05D3\u05D4\u05D5</div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2|a\u05D3\u05D4\u05D5</div>',
   '36-1 ltr right character');
 
 selection_test(
@@ -36,17 +30,13 @@
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2a|\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2a|\u05D3\u05D4\u05D5</div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2a\u05D3\u05D4|\u05D5</div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2a\u05D3\u05D4|\u05D5</div>',
   '36-4 ltr right character');
 
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2a\u05D3|\u05D4\u05D5</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2a|\u05D3\u05D4\u05D5</div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2a\u05D3\u05D4\u05D5|</div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2a\u05D3\u05D4\u05D5|</div>',
   '36-5 ltr right character');
 
 selection_test(
@@ -58,8 +48,6 @@
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2a\u05D3\u05D4\u05D5|</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2a\u05D3\u05D4|\u05D5</div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2a\u05D3\u05D4\u05D5|</div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2a\u05D3\u05D4\u05D5|</div>',
   '36-7 ltr right character');
 </script>
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_36_rtl.html b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_36_rtl.html
index 9d2b8f1..e76cca2 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_36_rtl.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_36_rtl.html
@@ -3,8 +3,6 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="rtl">|\u05D0\u05D1\u05D2a\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'right', 'character'),
@@ -26,17 +24,13 @@
 selection_test(
   '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2|a\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2a|\u05D3\u05D4\u05D5</div>'
-      : '<div contenteditable dir="rtl">\u05D0\u05D1|\u05D2a\u05D3\u05D4\u05D5</div>',
+  '<div contenteditable dir="rtl">\u05D0\u05D1|\u05D2a\u05D3\u05D4\u05D5</div>',
   '36-3 rtl right character');
 
 selection_test(
   '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2a|\u05D3\u05D4\u05D5</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2a|\u05D3\u05D4\u05D5</div>'
-      : '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2|a\u05D3\u05D4\u05D5</div>',
+  '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2|a\u05D3\u05D4\u05D5</div>',
   '36-4 rtl right character');
 
 selection_test(
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_37_ltr.html b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_37_ltr.html
index 5979377..b697598 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_37_ltr.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_37_ltr.html
@@ -3,8 +3,6 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="ltr">|abc\u05D0\u05D1\u05D2<span>def</span></div>',
   selection => selection.modify('move', 'right', 'character'),
@@ -26,17 +24,13 @@
 selection_test(
   '<div contenteditable dir="ltr">abc|\u05D0\u05D1\u05D2<span>def</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">abc\u05d0\u05d1\u05d2<span>d|ef</span></div>'
-      : '<div contenteditable dir="ltr">abc\u05D0\u05D1|\u05D2<span>def</span></div>',
+  '<div contenteditable dir="ltr">abc\u05D0\u05D1|\u05D2<span>def</span></div>',
   '37-3 ltr right character');
 
 selection_test(
   '<div contenteditable dir="ltr">abc\u05D0|\u05D1\u05D2<span>def</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">abc|\u05d0\u05d1\u05d2<span>def</span></div>'
-      : '<div contenteditable dir="ltr">abc\u05D0\u05D1\u05D2|<span>def</span></div>',
+  '<div contenteditable dir="ltr">abc\u05D0\u05D1\u05D2|<span>def</span></div>',
   '37-4 ltr right character');
 
 selection_test(
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_37_rtl.html b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_37_rtl.html
index 49cd57e..7e15184f 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_37_rtl.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_37_rtl.html
@@ -3,14 +3,10 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="rtl">|abc\u05D0\u05D1\u05D2<span>def</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">a|bc\u05D0\u05D1\u05D2<span>def</span></div>'
-      : '<div contenteditable dir="rtl">|abc\u05D0\u05D1\u05D2<span>def</span></div>',
+  '<div contenteditable dir="rtl">|abc\u05D0\u05D1\u05D2<span>def</span></div>',
   '37-0 rtl right character');
 
 selection_test(
@@ -22,9 +18,7 @@
 selection_test(
   '<div contenteditable dir="rtl">ab|c\u05D0\u05D1\u05D2<span>def</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc|\u05D0\u05D1\u05D2<span>def</span></div>'
-      : '<div contenteditable dir="rtl">|abc\u05D0\u05D1\u05D2<span>def</span></div>',
+  '<div contenteditable dir="rtl">|abc\u05D0\u05D1\u05D2<span>def</span></div>',
   '37-2 rtl right character');
 
 selection_test(
@@ -48,17 +42,13 @@
 selection_test(
   '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2|<span>def</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2<span>d|ef</span></div>'
-      : '<div contenteditable dir="rtl">abc\u05D0\u05D1|\u05D2<span>def</span></div>',
+  '<div contenteditable dir="rtl">abc\u05D0\u05D1|\u05D2<span>def</span></div>',
   '37-6 rtl right character');
 
 selection_test(
   '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2<span>|def</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2<span>d|ef</span></div>'
-      : '<div contenteditable dir="rtl">abc\u05D0\u05D1|\u05D2<span>def</span></div>',
+  '<div contenteditable dir="rtl">abc\u05D0\u05D1|\u05D2<span>def</span></div>',
   '37-7 rtl right character');
 
 selection_test(
@@ -70,24 +60,18 @@
 selection_test(
   '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2<span>de|f</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2<span>def|</span></div>'
-      : '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2|<span>def</span></div>',
+  '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2|<span>def</span></div>',
   '37-9 rtl right character');
 
 selection_test(
   '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2<span>def|</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc\u05D0\u05D1|\u05D2<span>def</span></div>'
-      : '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2<span>d|ef</span></div>',
+  '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2<span>d|ef</span></div>',
   '37-10 rtl right character');
 
 selection_test(
   '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2<span>def</span>|</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc\u05D0\u05D1|\u05D2<span>def</span></div>'
-      : '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2<span>d|ef</span></div>',
+  '<div contenteditable dir="rtl">abc\u05D0\u05D1\u05D2<span>d|ef</span></div>',
   '37-11 rtl right character');
 </script>
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_38_ltr.html b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_38_ltr.html
index 902a38f..4b26c7806 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_38_ltr.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_38_ltr.html
@@ -3,22 +3,16 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2abc<span>\u05D3\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1\u05d2a|bc<span>\u05d3\u05d4\u05d5</span></div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1|\u05D2abc<span>\u05D3\u05D4\u05D5</span></div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1|\u05D2abc<span>\u05D3\u05D4\u05D5</span></div>',
   '38-0 ltr right character');
 
 selection_test(
   '<div contenteditable dir="ltr">\u05D0|\u05D1\u05D2abc<span>\u05D3\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">|\u05d0\u05d1\u05d2abc<span>\u05d3\u05d4\u05d5</span></div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2|abc<span>\u05D3\u05D4\u05D5</span></div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2|abc<span>\u05D3\u05D4\u05D5</span></div>',
   '38-1 ltr right character');
 
 selection_test(
@@ -48,25 +42,19 @@
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2abc|<span>\u05D3\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1\u05d2abc|<span>\u05d3\u05d4\u05d5</span></div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2abc<span>\u05D3\u05D4|\u05D5</span></div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2abc<span>\u05D3\u05D4|\u05D5</span></div>',
   '38-6 ltr right character');
 
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2abc<span>|\u05D3\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1\u05d2abc<span>|\u05d3\u05d4\u05d5</span></div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2abc<span>\u05D3\u05D4|\u05D5</span></div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2abc<span>\u05D3\u05D4|\u05D5</span></div>',
   '38-7 ltr right character');
 
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2abc<span>\u05D3|\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1\u05d2abc|<span>\u05d3\u05d4\u05d5</span></div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2abc<span>\u05D3\u05D4\u05D5|</span></div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2abc<span>\u05D3\u05D4\u05D5|</span></div>',
   '38-8 ltr right character');
 
 selection_test(
@@ -78,16 +66,12 @@
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2abc<span>\u05D3\u05D4\u05D5|</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1\u05d2abc<span>\u05d3\u05d4|\u05d5</span></div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2abc<span>\u05D3\u05D4\u05D5|</span></div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2abc<span>\u05D3\u05D4\u05D5|</span></div>',
   '38-10 ltr right character');
 
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2abc<span>\u05D3\u05D4\u05D5</span>|</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1\u05d2abc<span>\u05d3\u05d4|\u05d5</span></div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2abc<span>\u05D3\u05D4\u05D5</span>|</div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2abc<span>\u05D3\u05D4\u05D5</span>|</div>',
   '38-11 ltr right character');
 </script>
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_38_rtl.html b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_38_rtl.html
index 48a0d29a..1589445e 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_38_rtl.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_38_rtl.html
@@ -3,8 +3,6 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="rtl">|\u05D0\u05D1\u05D2abc<span>\u05D3\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'right', 'character'),
@@ -26,9 +24,7 @@
 selection_test(
   '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2|abc<span>\u05D3\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2a|bc<span>\u05D3\u05D4\u05D5</span></div>'
-      : '<div contenteditable dir="rtl">\u05D0\u05D1|\u05D2abc<span>\u05D3\u05D4\u05D5</span></div>',
+  '<div contenteditable dir="rtl">\u05D0\u05D1|\u05D2abc<span>\u05D3\u05D4\u05D5</span></div>',
   '38-3 rtl right character');
 
 selection_test(
@@ -40,9 +36,7 @@
 selection_test(
   '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2ab|c<span>\u05D3\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2abc|<span>\u05D3\u05D4\u05D5</span></div>'
-      : '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2|abc<span>\u05D3\u05D4\u05D5</span></div>',
+  '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2|abc<span>\u05D3\u05D4\u05D5</span></div>',
   '38-5 rtl right character');
 
 selection_test(
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_39_ltr.html b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_39_ltr.html
index face355f..c4d86a7 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_39_ltr.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_39_ltr.html
@@ -3,8 +3,6 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="ltr">|abc\u05D0<span>\u05D1\u05D2def</span></div>',
   selection => selection.modify('move', 'right', 'character'),
@@ -26,25 +24,19 @@
 selection_test(
   '<div contenteditable dir="ltr">abc|\u05D0<span>\u05D1\u05D2def</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">abc\u05d0<span>\u05d1\u05d2d|ef</span></div>'
-      : '<div contenteditable dir="ltr">abc\u05D0<span>\u05D1|\u05D2def</span></div>',
+  '<div contenteditable dir="ltr">abc\u05D0<span>\u05D1|\u05D2def</span></div>',
   '39-3 ltr right character');
 
 selection_test(
   '<div contenteditable dir="ltr">abc\u05D0|<span>\u05D1\u05D2def</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">abc|\u05d0<span>\u05d1\u05d2def</span></div>'
-      : '<div contenteditable dir="ltr">abc\u05D0<span>\u05D1\u05D2|def</span></div>',
+  '<div contenteditable dir="ltr">abc\u05D0<span>\u05D1\u05D2|def</span></div>',
   '39-4 ltr right character');
 
 selection_test(
   '<div contenteditable dir="ltr">abc\u05D0<span>|\u05D1\u05D2def</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">abc|\u05d0<span>\u05d1\u05d2def</span></div>'
-      : '<div contenteditable dir="ltr">abc\u05D0<span>\u05D1\u05D2|def</span></div>',
+  '<div contenteditable dir="ltr">abc\u05D0<span>\u05D1\u05D2|def</span></div>',
   '39-5 ltr right character');
 
 selection_test(
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_39_rtl.html b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_39_rtl.html
index 0170d4f..ea82c85 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_39_rtl.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_39_rtl.html
@@ -3,14 +3,10 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="rtl">|abc\u05D0<span>\u05D1\u05D2def</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">a|bc\u05d0<span>\u05d1\u05d2def</span></div>'
-      : '<div contenteditable dir="rtl">|abc\u05D0<span>\u05D1\u05D2def</span></div>',
+  '<div contenteditable dir="rtl">|abc\u05D0<span>\u05D1\u05D2def</span></div>',
   '39-0 rtl right character');
 
 selection_test(
@@ -22,9 +18,7 @@
 selection_test(
   '<div contenteditable dir="rtl">ab|c\u05D0<span>\u05D1\u05D2def</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc|\u05d0<span>\u05d1\u05d2def</span></div>'
-      : '<div contenteditable dir="rtl">|abc\u05D0<span>\u05D1\u05D2def</span></div>',
+  '<div contenteditable dir="rtl">|abc\u05D0<span>\u05D1\u05D2def</span></div>',
   '39-2 rtl right character');
 
 selection_test(
@@ -54,9 +48,7 @@
 selection_test(
   '<div contenteditable dir="rtl">abc\u05D0<span>\u05D1\u05D2|def</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc\u05d0<span>\u05d1\u05d2d|ef</span></div>'
-      : '<div contenteditable dir="rtl">abc\u05D0<span>\u05D1|\u05D2def</span></div>',
+  '<div contenteditable dir="rtl">abc\u05D0<span>\u05D1|\u05D2def</span></div>',
   '39-7 rtl right character');
 
 selection_test(
@@ -68,24 +60,18 @@
 selection_test(
   '<div contenteditable dir="rtl">abc\u05D0<span>\u05D1\u05D2de|f</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc\u05d0<span>\u05d1\u05d2def|</span></div>'
-      : '<div contenteditable dir="rtl">abc\u05D0<span>\u05D1\u05D2|def</span></div>',
+  '<div contenteditable dir="rtl">abc\u05D0<span>\u05D1\u05D2|def</span></div>',
   '39-9 rtl right character');
 
 selection_test(
   '<div contenteditable dir="rtl">abc\u05D0<span>\u05D1\u05D2def|</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc\u05d0<span>\u05d1|\u05d2def</span></div>'
-      : '<div contenteditable dir="rtl">abc\u05D0<span>\u05D1\u05D2d|ef</span></div>',
+  '<div contenteditable dir="rtl">abc\u05D0<span>\u05D1\u05D2d|ef</span></div>',
   '39-10 rtl right character');
 
 selection_test(
   '<div contenteditable dir="rtl">abc\u05D0<span>\u05D1\u05D2def</span>|</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">abc\u05d0<span>\u05d1|\u05d2def</span></div>'
-      : '<div contenteditable dir="rtl">abc\u05D0<span>\u05D1\u05D2d|ef</span></div>',
+  '<div contenteditable dir="rtl">abc\u05D0<span>\u05D1\u05D2d|ef</span></div>',
   '39-11 rtl right character');
 </script>
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_40_ltr.html b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_40_ltr.html
index 5dcd3968..dc60dc9 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_40_ltr.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_40_ltr.html
@@ -3,22 +3,16 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="ltr">|\u05D0\u05D1\u05D2a<span>bc\u05D3\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1\u05d2a|<span>bc\u05d3\u05d4\u05d5</span></div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1|\u05D2a<span>bc\u05D3\u05D4\u05D5</span></div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1|\u05D2a<span>bc\u05D3\u05D4\u05D5</span></div>',
   '40-0 ltr right character');
 
 selection_test(
   '<div contenteditable dir="ltr">\u05D0|\u05D1\u05D2a<span>bc\u05D3\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">|\u05d0\u05d1\u05d2a<span>bc\u05d3\u05d4\u05d5</span></div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2|a<span>bc\u05D3\u05D4\u05D5</span></div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2|a<span>bc\u05D3\u05D4\u05D5</span></div>',
   '40-1 ltr right character');
 
 selection_test(
@@ -54,17 +48,13 @@
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2a<span>bc|\u05D3\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1\u05d2a<span>bc|\u05d3\u05d4\u05d5</span></div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2a<span>bc\u05D3\u05D4|\u05D5</span></div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2a<span>bc\u05D3\u05D4|\u05D5</span></div>',
   '40-7 ltr right character');
 
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2a<span>bc\u05D3|\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1\u05d2a<span>bc|\u05d3\u05d4\u05d5</span></div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2a<span>bc\u05D3\u05D4\u05D5|</span></div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2a<span>bc\u05D3\u05D4\u05D5|</span></div>',
   '40-8 ltr right character');
 
 selection_test(
@@ -76,16 +66,12 @@
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2a<span>bc\u05D3\u05D4\u05D5|</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1\u05d2a<span>bc\u05d3\u05d4|\u05d5</span></div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2a<span>bc\u05D3\u05D4\u05D5|</span></div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2a<span>bc\u05D3\u05D4\u05D5|</span></div>',
   '40-10 ltr right character');
 
 selection_test(
   '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2a<span>bc\u05D3\u05D4\u05D5</span>|</div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr">\u05d0\u05d1\u05d2a<span>bc\u05d3\u05d4|\u05d5</span></div>'
-      : '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2a<span>bc\u05D3\u05D4\u05D5</span>|</div>',
+  '<div contenteditable dir="ltr">\u05D0\u05D1\u05D2a<span>bc\u05D3\u05D4\u05D5</span>|</div>',
   '40-11 ltr right character');
 </script>
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_40_rtl.html b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_40_rtl.html
index 639edfb..deca0f5 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_40_rtl.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_40_rtl.html
@@ -3,8 +3,6 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="rtl">|\u05D0\u05D1\u05D2a<span>bc\u05D3\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'right', 'character'),
@@ -26,9 +24,7 @@
 selection_test(
   '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2|a<span>bc\u05D3\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u05d0\u05d1\u05d2a|<span>bc\u05d3\u05d4\u05d5</span></div>'
-      : '<div contenteditable dir="rtl">\u05D0\u05D1|\u05D2a<span>bc\u05D3\u05D4\u05D5</span></div>',
+  '<div contenteditable dir="rtl">\u05D0\u05D1|\u05D2a<span>bc\u05D3\u05D4\u05D5</span></div>',
   '40-3 rtl right character');
 
 selection_test(
@@ -46,9 +42,7 @@
 selection_test(
   '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2a<span>b|c\u05D3\u05D4\u05D5</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl">\u05d0\u05d1\u05d2a<span>bc|\u05d3\u05d4\u05d5</span></div>'
-      : '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2|a<span>bc\u05D3\u05D4\u05D5</span></div>',
+  '<div contenteditable dir="rtl">\u05D0\u05D1\u05D2|a<span>bc\u05D3\u05D4\u05D5</span></div>',
   '40-6 rtl right character');
 
 selection_test(
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_43_ltr.html b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_43_ltr.html
index 46d056a..156f1a6 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_43_ltr.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_43_ltr.html
@@ -3,22 +3,16 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="ltr">|<span dir="rtl">abc\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0def</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr"><span dir="rtl">a|bc\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0def</span></div>'
-      : '<div contenteditable dir="ltr"><span dir="rtl">abc\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0d|ef</span></div>',
+  '<div contenteditable dir="ltr"><span dir="rtl">abc\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0d|ef</span></div>',
   '43-0 ltr right character');
 
 selection_test(
   '<div contenteditable dir="ltr"><span dir="rtl">|abc\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0def</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr"><span dir="rtl">a|bc\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0def</span></div>'
-      : '<div contenteditable dir="ltr"><span dir="rtl">abc\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0d|ef</span></div>',
+  '<div contenteditable dir="ltr"><span dir="rtl">abc\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0d|ef</span></div>',
   '43-1 ltr right character');
 
 selection_test(
@@ -30,25 +24,19 @@
 selection_test(
   '<div contenteditable dir="ltr"><span dir="rtl">ab|c\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0def</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr"><span dir="rtl">abc|\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0def</span></div>'
-      : '<div contenteditable dir="ltr"><span dir="rtl">abc\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0def|</span></div>',
+  '<div contenteditable dir="ltr"><span dir="rtl">abc\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0def|</span></div>',
   '43-3 ltr right character');
 
 selection_test(
   '<div contenteditable dir="ltr"><span dir="rtl">abc|\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0def</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr"><span dir="rtl">a|bc\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0def</span></div>'
-      : '<div contenteditable dir="ltr"><span dir="rtl">abc|\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0def</span></div>',
+  '<div contenteditable dir="ltr"><span dir="rtl">abc|\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0def</span></div>',
   '43-4 ltr right character');
 
 selection_test(
   '<div contenteditable dir="ltr"><span dir="rtl">abc\u05E7|\u05E7\u05E7123\u05E0\u05E0\u05E0def</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr"><span dir="rtl">abc|\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0def</span></div>'
-      : '<div contenteditable dir="ltr"><span dir="rtl">a|bc\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0def</span></div>',
+  '<div contenteditable dir="ltr"><span dir="rtl">a|bc\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0def</span></div>',
   '43-5 ltr right character');
 
 selection_test(
@@ -78,17 +66,13 @@
 selection_test(
   '<div contenteditable dir="ltr"><span dir="rtl">abc\u05E7\u05E7\u05E7123|\u05E0\u05E0\u05E0def</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr"><span dir="rtl">abc\u05E7\u05E7\u05E71|23\u05E0\u05E0\u05E0def</span></div>'
-      : '<div contenteditable dir="ltr"><span dir="rtl">abc\u05E7\u05E7|\u05E7123\u05E0\u05E0\u05E0def</span></div>',
+  '<div contenteditable dir="ltr"><span dir="rtl">abc\u05E7\u05E7|\u05E7123\u05E0\u05E0\u05E0def</span></div>',
   '43-10 ltr right character');
 
 selection_test(
   '<div contenteditable dir="ltr"><span dir="rtl">abc\u05E7\u05E7\u05E7123\u05E0|\u05E0\u05E0def</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr"><span dir="rtl">abc\u05E7\u05E7\u05E7123|\u05E0\u05E0\u05E0def</span></div>'
-      : '<div contenteditable dir="ltr"><span dir="rtl">abc\u05E7\u05E7\u05E7|123\u05E0\u05E0\u05E0def</span></div>',
+  '<div contenteditable dir="ltr"><span dir="rtl">abc\u05E7\u05E7\u05E7|123\u05E0\u05E0\u05E0def</span></div>',
   '43-11 ltr right character');
 
 selection_test(
@@ -112,9 +96,7 @@
 selection_test(
   '<div contenteditable dir="ltr"><span dir="rtl">abc\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0de|f</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="ltr"><span dir="rtl">abc\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0def|</span></div>'
-      : '<div contenteditable dir="ltr"><span dir="rtl">abc\u05E7\u05E7\u05E7123\u05E0\u05E0|\u05E0def</span></div>',
+  '<div contenteditable dir="ltr"><span dir="rtl">abc\u05E7\u05E7\u05E7123\u05E0\u05E0|\u05E0def</span></div>',
   '43-15 ltr right character');
 
 selection_test(
diff --git a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_43_rtl.html b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_43_rtl.html
index a811317..e7dace2 100644
--- a/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_43_rtl.html
+++ b/third_party/blink/web_tests/editing/selection/modify_move/move_right_character_43_rtl.html
@@ -3,22 +3,16 @@
 <script src="../../../resources/testharnessreport.js"></script>
 <script src="../../assert_selection.js"></script>
 <script>
-const usesBidiAffinity = window.internals && internals.runtimeFlags.bidiCaretAffinityEnabled;
-
 selection_test(
   '<div contenteditable dir="rtl">|<span dir="rtl">abc\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0def</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl"><span dir="rtl">a|bc\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0def</span></div>'
-      : '<div contenteditable dir="rtl">|<span dir="rtl">abc\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0def</span></div>',
+  '<div contenteditable dir="rtl">|<span dir="rtl">abc\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0def</span></div>',
   '43-0 rtl right character');
 
 selection_test(
   '<div contenteditable dir="rtl"><span dir="rtl">|abc\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0def</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl"><span dir="rtl">a|bc\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0def</span></div>'
-      : '<div contenteditable dir="rtl"><span dir="rtl">|abc\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0def</span></div>',
+  '<div contenteditable dir="rtl"><span dir="rtl">|abc\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0def</span></div>',
   '43-1 rtl right character');
 
 selection_test(
@@ -30,9 +24,7 @@
 selection_test(
   '<div contenteditable dir="rtl"><span dir="rtl">ab|c\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0def</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl"><span dir="rtl">abc|\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0def</span></div>'
-      : '<div contenteditable dir="rtl"><span dir="rtl">|abc\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0def</span></div>',
+  '<div contenteditable dir="rtl"><span dir="rtl">|abc\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0def</span></div>',
   '43-3 rtl right character');
 
 selection_test(
@@ -56,9 +48,7 @@
 selection_test(
   '<div contenteditable dir="rtl"><span dir="rtl">abc\u05E7\u05E7\u05E7|123\u05E0\u05E0\u05E0def</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl"><span dir="rtl">abc\u05E7\u05E7\u05E71|23\u05E0\u05E0\u05E0def</span></div>'
-      : '<div contenteditable dir="rtl"><span dir="rtl">abc\u05E7\u05E7|\u05E7123\u05E0\u05E0\u05E0def</span></div>',
+  '<div contenteditable dir="rtl"><span dir="rtl">abc\u05E7\u05E7|\u05E7123\u05E0\u05E0\u05E0def</span></div>',
   '43-7 rtl right character');
 
 selection_test(
@@ -70,9 +60,7 @@
 selection_test(
   '<div contenteditable dir="rtl"><span dir="rtl">abc\u05E7\u05E7\u05E712|3\u05E0\u05E0\u05E0def</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl"><span dir="rtl">abc\u05E7\u05E7\u05E7123|\u05E0\u05E0\u05E0def</span></div>'
-      : '<div contenteditable dir="rtl"><span dir="rtl">abc\u05E7\u05E7\u05E7|123\u05E0\u05E0\u05E0def</span></div>',
+  '<div contenteditable dir="rtl"><span dir="rtl">abc\u05E7\u05E7\u05E7|123\u05E0\u05E0\u05E0def</span></div>',
   '43-9 rtl right character');
 
 selection_test(
@@ -96,9 +84,7 @@
 selection_test(
   '<div contenteditable dir="rtl"><span dir="rtl">abc\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0|def</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl"><span dir="rtl">abc\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0d|ef</span></div>'
-      : '<div contenteditable dir="rtl"><span dir="rtl">abc\u05E7\u05E7\u05E7123\u05E0\u05E0|\u05E0def</span></div>',
+  '<div contenteditable dir="rtl"><span dir="rtl">abc\u05E7\u05E7\u05E7123\u05E0\u05E0|\u05E0def</span></div>',
   '43-13 rtl right character');
 
 selection_test(
@@ -110,9 +96,7 @@
 selection_test(
   '<div contenteditable dir="rtl"><span dir="rtl">abc\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0de|f</span></div>',
   selection => selection.modify('move', 'right', 'character'),
-  usesBidiAffinity
-      ? '<div contenteditable dir="rtl"><span dir="rtl">abc\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0def|</span></div>'
-      : '<div contenteditable dir="rtl"><span dir="rtl">abc\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0|def</span></div>',
+  '<div contenteditable dir="rtl"><span dir="rtl">abc\u05E7\u05E7\u05E7123\u05E0\u05E0\u05E0|def</span></div>',
   '43-15 rtl right character');
 
 selection_test(