Move VisibleUnitsTest.endOfWord to VisibleUnitsWordTest

This patch moves |VisibleUnitsTest.endOfword| to |VisibleUnitsWordTest| to
improve grouping of test cases for ease of maintenance.

Note: The patch[1] moves |VisibleUnitsWordTest.startOfWord| to
|VisibleUnitsWordTest|.


[1] http://crrev.com/c/923606  Move VisibleUnitsTest.startOfWord to
VisibleUnitsWordTest

Change-Id: Id7929d2aefb766fb40701a5be7a2ca70614659f9
Reviewed-on: https://chromium-review.googlesource.com/923604Reviewed-by: Yoichi Osato <yoichio@chromium.org>
Commit-Queue: Yoshifumi Inoue <yosin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#537246}

third_party/WebKit/Source/core/editing/VisibleUnitsTest.cpp

@@ -518,71 +518,6 @@ TEST_F(VisibleUnitsTest, endOfSentence) {
                 .DeepEquivalent());
 }
 
-TEST_F(VisibleUnitsTest, endOfWord) {
-  const char* body_content =
-      "<a id=host><b id=one>1</b> <b id=two>22</b></a><i id=three>333</i>";
-  const char* shadow_content =
-      "<p><u id=four>44444</u><content select=#two></content><span id=space> "
-      "</span><content select=#one></content><u id=five>55555</u></p>";
-  SetBodyContent(body_content);
-  ShadowRoot* shadow_root = SetShadowContent(shadow_content, "host");
-
-  Node* one = GetDocument().getElementById("one")->firstChild();
-  Node* two = GetDocument().getElementById("two")->firstChild();
-  Node* three = GetDocument().getElementById("three")->firstChild();
-  Node* four = shadow_root->getElementById("four")->firstChild();
-  Node* five = shadow_root->getElementById("five")->firstChild();
-
-  EXPECT_EQ(
-      Position(three, 3),
-      EndOfWord(CreateVisiblePositionInDOMTree(*one, 0)).DeepEquivalent());
-  EXPECT_EQ(
-      PositionInFlatTree(five, 5),
-      EndOfWord(CreateVisiblePositionInFlatTree(*one, 0)).DeepEquivalent());
-
-  EXPECT_EQ(
-      Position(three, 3),
-      EndOfWord(CreateVisiblePositionInDOMTree(*one, 1)).DeepEquivalent());
-  EXPECT_EQ(
-      PositionInFlatTree(five, 5),
-      EndOfWord(CreateVisiblePositionInFlatTree(*one, 1)).DeepEquivalent());
-
-  EXPECT_EQ(
-      Position(three, 3),
-      EndOfWord(CreateVisiblePositionInDOMTree(*two, 0)).DeepEquivalent());
-  EXPECT_EQ(
-      PositionInFlatTree(two, 2),
-      EndOfWord(CreateVisiblePositionInFlatTree(*two, 0)).DeepEquivalent());
-
-  EXPECT_EQ(
-      Position(three, 3),
-      EndOfWord(CreateVisiblePositionInDOMTree(*two, 1)).DeepEquivalent());
-  EXPECT_EQ(
-      PositionInFlatTree(two, 2),
-      EndOfWord(CreateVisiblePositionInFlatTree(*two, 1)).DeepEquivalent());
-
-  EXPECT_EQ(
-      Position(three, 3),
-      EndOfWord(CreateVisiblePositionInDOMTree(*three, 1)).DeepEquivalent());
-  EXPECT_EQ(
-      PositionInFlatTree(three, 3),
-      EndOfWord(CreateVisiblePositionInFlatTree(*three, 1)).DeepEquivalent());
-
-  EXPECT_EQ(
-      Position(four, 5),
-      EndOfWord(CreateVisiblePositionInDOMTree(*four, 1)).DeepEquivalent());
-  EXPECT_EQ(
-      PositionInFlatTree(two, 2),
-      EndOfWord(CreateVisiblePositionInFlatTree(*four, 1)).DeepEquivalent());
-
-  EXPECT_EQ(
-      Position(five, 5),
-      EndOfWord(CreateVisiblePositionInDOMTree(*five, 1)).DeepEquivalent());
-  EXPECT_EQ(
-      PositionInFlatTree(five, 5),
-      EndOfWord(CreateVisiblePositionInFlatTree(*five, 1)).DeepEquivalent());
-}
-
 TEST_F(VisibleUnitsTest, isEndOfEditableOrNonEditableContent) {
   const char* body_content =
       "<a id=host><b id=one contenteditable>1</b><b id=two>22</b></a>";

third_party/WebKit/Source/core/editing/VisibleUnitsWordTest.cpp

@@ -10,6 +10,24 @@
 
 namespace blink {
 
+namespace {
+
+VisiblePosition CreateVisiblePositionInDOMTree(
+    Node& anchor,
+    int offset,
+    TextAffinity affinity = TextAffinity::kDownstream) {
+  return CreateVisiblePosition(Position(&anchor, offset), affinity);
+}
+
+VisiblePositionInFlatTree CreateVisiblePositionInFlatTree(
+    Node& anchor,
+    int offset,
+    TextAffinity affinity = TextAffinity::kDownstream) {
+  return CreateVisiblePosition(PositionInFlatTree(&anchor, offset), affinity);
+}
+
+}  // namespace
+
 class VisibleUnitsWordTest : public EditingTestBase {
  protected:
   std::string DoStartOfWord(
@@ -206,6 +224,71 @@ TEST_F(VisibleUnitsWordTest, EndOfWordPreviousWordIfOnBoundaryBasic) {
                         EWordSide::kPreviousWordIfOnBoundary));
 }
 
+TEST_F(VisibleUnitsWordTest, EndOfWordShadowDOM) {
+  const char* body_content =
+      "<a id=host><b id=one>1</b> <b id=two>22</b></a><i id=three>333</i>";
+  const char* shadow_content =
+      "<p><u id=four>44444</u><content select=#two></content><span id=space> "
+      "</span><content select=#one></content><u id=five>55555</u></p>";
+  SetBodyContent(body_content);
+  ShadowRoot* shadow_root = SetShadowContent(shadow_content, "host");
+
+  Node* one = GetDocument().getElementById("one")->firstChild();
+  Node* two = GetDocument().getElementById("two")->firstChild();
+  Node* three = GetDocument().getElementById("three")->firstChild();
+  Node* four = shadow_root->getElementById("four")->firstChild();
+  Node* five = shadow_root->getElementById("five")->firstChild();
+
+  EXPECT_EQ(
+      Position(three, 3),
+      EndOfWord(CreateVisiblePositionInDOMTree(*one, 0)).DeepEquivalent());
+  EXPECT_EQ(
+      PositionInFlatTree(five, 5),
+      EndOfWord(CreateVisiblePositionInFlatTree(*one, 0)).DeepEquivalent());
+
+  EXPECT_EQ(
+      Position(three, 3),
+      EndOfWord(CreateVisiblePositionInDOMTree(*one, 1)).DeepEquivalent());
+  EXPECT_EQ(
+      PositionInFlatTree(five, 5),
+      EndOfWord(CreateVisiblePositionInFlatTree(*one, 1)).DeepEquivalent());
+
+  EXPECT_EQ(
+      Position(three, 3),
+      EndOfWord(CreateVisiblePositionInDOMTree(*two, 0)).DeepEquivalent());
+  EXPECT_EQ(
+      PositionInFlatTree(two, 2),
+      EndOfWord(CreateVisiblePositionInFlatTree(*two, 0)).DeepEquivalent());
+
+  EXPECT_EQ(
+      Position(three, 3),
+      EndOfWord(CreateVisiblePositionInDOMTree(*two, 1)).DeepEquivalent());
+  EXPECT_EQ(
+      PositionInFlatTree(two, 2),
+      EndOfWord(CreateVisiblePositionInFlatTree(*two, 1)).DeepEquivalent());
+
+  EXPECT_EQ(
+      Position(three, 3),
+      EndOfWord(CreateVisiblePositionInDOMTree(*three, 1)).DeepEquivalent());
+  EXPECT_EQ(
+      PositionInFlatTree(three, 3),
+      EndOfWord(CreateVisiblePositionInFlatTree(*three, 1)).DeepEquivalent());
+
+  EXPECT_EQ(
+      Position(four, 5),
+      EndOfWord(CreateVisiblePositionInDOMTree(*four, 1)).DeepEquivalent());
+  EXPECT_EQ(
+      PositionInFlatTree(two, 2),
+      EndOfWord(CreateVisiblePositionInFlatTree(*four, 1)).DeepEquivalent());
+
+  EXPECT_EQ(
+      Position(five, 5),
+      EndOfWord(CreateVisiblePositionInDOMTree(*five, 1)).DeepEquivalent());
+  EXPECT_EQ(
+      PositionInFlatTree(five, 5),
+      EndOfWord(CreateVisiblePositionInFlatTree(*five, 1)).DeepEquivalent());
+}
+
 TEST_F(VisibleUnitsWordTest, EndOfWordTextSecurity) {
   // Note: |EndOfWord()| considers security characters as a sequence "x".
   InsertStyleElement("s {-webkit-text-security:disc;}");