Rename CreateShadowRootInernal() to CreateV0ShadowRootForTesting()

Now V0 UA shadow root are already gone and to avoid accidental
misuses for creating UA shadow root via CreateShadowRootInternal(),
rename it to CreateV0ShadowRootForTesting() and move the
original CreateShadowRootInternal() to private.

Bug: 787717
Change-Id: Idb3eae11f928d371fe102f766e54e6519f37d5db
Reviewed-on: https://chromium-review.googlesource.com/1057047
Commit-Queue: Takayoshi Kochi <kochi@chromium.org>
Reviewed-by: Hayato Ito <hayato@chromium.org>
Cr-Commit-Position: refs/heads/master@{#558516}

third_party/blink/renderer/core/dom/element.h

@@ -496,7 +496,10 @@ class CORE_EXPORT Element : public ContainerNode {
   ShadowRoot* attachShadow(const ScriptState*,
                            const ShadowRootInit&,
                            ExceptionState&);
-  ShadowRoot& CreateShadowRootInternal();
+
+  ShadowRoot& CreateV0ShadowRootForTesting() {
+    return CreateShadowRootInternal();
+  }
   ShadowRoot& CreateUserAgentShadowRoot();
   ShadowRoot& AttachShadowRootInternal(ShadowRootType,
                                        bool delegates_focus = false);
@@ -946,6 +949,7 @@ class CORE_EXPORT Element : public ContainerNode {
       delete;  // This will catch anyone doing an unnecessary check.
 
   bool CanAttachShadowRoot() const;
+  ShadowRoot& CreateShadowRootInternal();
 
   void StyleAttributeChanged(const AtomicString& new_style_string,
                              AttributeModificationReason);

third_party/blink/renderer/core/dom/flat_tree_traversal_test.cc

@@ -52,7 +52,7 @@ void FlatTreeTraversalTest::SetupSampleHTML(const char* main_html,
   Element* body = GetDocument().body();
   body->SetInnerHTMLFromString(String::FromUTF8(main_html));
   Element* shadow_host = ToElement(NodeTraversal::ChildAt(*body, index));
-  ShadowRoot& shadow_root = shadow_host->CreateShadowRootInternal();
+  ShadowRoot& shadow_root = shadow_host->CreateV0ShadowRootForTesting();
   shadow_root.SetInnerHTMLFromString(String::FromUTF8(shadow_html));
   body->UpdateDistributionForFlatTreeTraversal();
 }
@@ -64,7 +64,7 @@ void FlatTreeTraversalTest::SetupDocumentTree(const char* main_html) {
 
 void FlatTreeTraversalTest::AttachV0ShadowRoot(Element& shadow_host,
                                                const char* shadow_inner_html) {
-  ShadowRoot& shadow_root = shadow_host.CreateShadowRootInternal();
+  ShadowRoot& shadow_root = shadow_host.CreateV0ShadowRootForTesting();
   shadow_root.SetInnerHTMLFromString(String::FromUTF8(shadow_inner_html));
   GetDocument().body()->UpdateDistributionForFlatTreeTraversal();
 }

third_party/blink/renderer/core/dom/ng/flat_tree_traversal_ng_test.cc

@@ -55,7 +55,7 @@ void FlatTreeTraversalNgTest::SetupSampleHTML(const char* main_html,
   Element* body = GetDocument().body();
   body->SetInnerHTMLFromString(String::FromUTF8(main_html));
   Element* shadow_host = ToElement(NodeTraversal::ChildAt(*body, index));
-  ShadowRoot& shadow_root = shadow_host->CreateShadowRootInternal();
+  ShadowRoot& shadow_root = shadow_host->CreateV0ShadowRootForTesting();
   shadow_root.SetInnerHTMLFromString(String::FromUTF8(shadow_html));
   body->UpdateDistributionForFlatTreeTraversal();
 }
@@ -68,7 +68,7 @@ void FlatTreeTraversalNgTest::SetupDocumentTree(const char* main_html) {
 void FlatTreeTraversalNgTest::AttachV0ShadowRoot(
     Element& shadow_host,
     const char* shadow_inner_html) {
-  ShadowRoot& shadow_root = shadow_host.CreateShadowRootInternal();
+  ShadowRoot& shadow_root = shadow_host.CreateV0ShadowRootForTesting();
   shadow_root.SetInnerHTMLFromString(String::FromUTF8(shadow_inner_html));
   GetDocument().body()->UpdateDistributionForFlatTreeTraversal();
 }

third_party/blink/renderer/core/dom/shadow_dom_v0_test.cc

@@ -43,7 +43,7 @@ TEST_F(ShadowDOMVTest, FeatureSetId) {
   auto* host = GetDocument().CreateRawElement(HTMLNames::divTag);
   auto* content = GetDocument().CreateRawElement(HTMLNames::contentTag);
   content->setAttribute("select", "#foo");
-  host->CreateShadowRootInternal().AppendChild(content);
+  host->CreateV0ShadowRootForTesting().AppendChild(content);
   EXPECT_TRUE(HasSelectorForIdInShadow(host, "foo"));
   EXPECT_FALSE(HasSelectorForIdInShadow(host, "bar"));
   EXPECT_FALSE(HasSelectorForIdInShadow(host, "host"));
@@ -60,7 +60,7 @@ TEST_F(ShadowDOMVTest, FeatureSetClassName) {
   auto* host = GetDocument().CreateRawElement(HTMLNames::divTag);
   auto* content = GetDocument().CreateRawElement(HTMLNames::contentTag);
   content->setAttribute("select", ".foo");
-  host->CreateShadowRootInternal().AppendChild(content);
+  host->CreateV0ShadowRootForTesting().AppendChild(content);
   EXPECT_TRUE(HasSelectorForClassInShadow(host, "foo"));
   EXPECT_FALSE(HasSelectorForClassInShadow(host, "bar"));
   EXPECT_FALSE(HasSelectorForClassInShadow(host, "host"));
@@ -77,7 +77,7 @@ TEST_F(ShadowDOMVTest, FeatureSetAttributeName) {
   auto* host = GetDocument().CreateRawElement(HTMLNames::divTag);
   auto* content = GetDocument().CreateRawElement(HTMLNames::contentTag);
   content->setAttribute("select", "div[foo]");
-  host->CreateShadowRootInternal().AppendChild(content);
+  host->CreateV0ShadowRootForTesting().AppendChild(content);
   EXPECT_TRUE(HasSelectorForAttributeInShadow(host, "foo"));
   EXPECT_FALSE(HasSelectorForAttributeInShadow(host, "bar"));
   EXPECT_FALSE(HasSelectorForAttributeInShadow(host, "host"));
@@ -94,7 +94,7 @@ TEST_F(ShadowDOMVTest, FeatureSetMultipleSelectors) {
   auto* host = GetDocument().CreateRawElement(HTMLNames::divTag);
   auto* content = GetDocument().CreateRawElement(HTMLNames::contentTag);
   content->setAttribute("select", "#foo,.bar,div[baz]");
-  host->CreateShadowRootInternal().AppendChild(content);
+  host->CreateV0ShadowRootForTesting().AppendChild(content);
   EXPECT_TRUE(HasSelectorForIdInShadow(host, "foo"));
   EXPECT_FALSE(HasSelectorForIdInShadow(host, "bar"));
   EXPECT_FALSE(HasSelectorForIdInShadow(host, "baz"));
@@ -109,7 +109,7 @@ TEST_F(ShadowDOMVTest, FeatureSetMultipleSelectors) {
 TEST_F(ShadowDOMVTest, FeatureSetSubtree) {
   LoadURL("about:blank");
   auto* host = GetDocument().CreateRawElement(HTMLNames::divTag);
-  host->CreateShadowRootInternal().SetInnerHTMLFromString(R"HTML(
+  host->CreateV0ShadowRootForTesting().SetInnerHTMLFromString(R"HTML(
     <div>
       <div></div>
       <content select='*'></content>
@@ -127,10 +127,10 @@ TEST_F(ShadowDOMVTest, FeatureSetSubtree) {
 TEST_F(ShadowDOMVTest, FeatureSetMultipleShadowRoots) {
   LoadURL("about:blank");
   auto* host = GetDocument().CreateRawElement(HTMLNames::divTag);
-  auto& host_shadow = host->CreateShadowRootInternal();
+  auto& host_shadow = host->CreateV0ShadowRootForTesting();
   host_shadow.SetInnerHTMLFromString("<content select='#foo'></content>");
   auto* child = GetDocument().CreateRawElement(HTMLNames::divTag);
-  auto& child_root = child->CreateShadowRootInternal();
+  auto& child_root = child->CreateV0ShadowRootForTesting();
   auto* child_content = GetDocument().CreateRawElement(HTMLNames::contentTag);
   child_content->setAttribute("select", "#bar");
   child_root.AppendChild(child_content);

third_party/blink/renderer/core/dom/tree_scope_adopter_test.cc

@@ -51,7 +51,7 @@ TEST(TreeScopeAdopterTest, AdoptV1ShadowRootToV0Document) {
   html1->AppendChild(div1);
   EXPECT_EQ(doc1->GetShadowCascadeOrder(),
             ShadowCascadeOrder::kShadowCascadeNone);
-  div1->CreateShadowRootInternal();
+  div1->CreateV0ShadowRootForTesting();
   EXPECT_EQ(doc1->GetShadowCascadeOrder(),
             ShadowCascadeOrder::kShadowCascadeV0);
   EXPECT_TRUE(doc1->MayContainV0Shadow());
@@ -96,7 +96,7 @@ TEST(TreeScopeAdopterTest, AdoptV0ShadowRootToV1Document) {
   doc2->AppendChild(html2);
   Element* div2 = doc1->CreateRawElement(HTMLNames::divTag);
   html2->AppendChild(div2);
-  div2->CreateShadowRootInternal();
+  div2->CreateV0ShadowRootForTesting();
 
   EXPECT_EQ(div1->ownerDocument(), doc1);
   EXPECT_EQ(div2->ownerDocument(), doc2);
@@ -123,7 +123,7 @@ TEST(TreeScopeAdopterTest, AdoptV0InV1ToNewDocument) {
       host1->AttachShadowRootInternal(ShadowRootType::kOpen);
   Element* host2 = old_doc->CreateRawElement(HTMLNames::divTag);
   shadow_root_v1.AppendChild(host2);
-  host2->CreateShadowRootInternal();
+  host2->CreateV0ShadowRootForTesting();
 
   // old_doc
   // └── html

third_party/blink/renderer/core/dom/tree_scope_test.cc

@@ -17,7 +17,7 @@ TEST(TreeScopeTest, CommonAncestorOfSameTrees) {
 
   Element* html = document->CreateRawElement(HTMLNames::htmlTag);
   document->AppendChild(html);
-  ShadowRoot& shadow_root = html->CreateShadowRootInternal();
+  ShadowRoot& shadow_root = html->CreateV0ShadowRootForTesting();
   EXPECT_EQ(shadow_root, shadow_root.CommonAncestorTreeScope(shadow_root));
 }
 
@@ -29,7 +29,7 @@ TEST(TreeScopeTest, CommonAncestorOfInclusiveTrees) {
   Document* document = Document::CreateForTest();
   Element* html = document->CreateRawElement(HTMLNames::htmlTag);
   document->AppendChild(html);
-  ShadowRoot& shadow_root = html->CreateShadowRootInternal();
+  ShadowRoot& shadow_root = html->CreateV0ShadowRootForTesting();
 
   EXPECT_EQ(document, document->CommonAncestorTreeScope(shadow_root));
   EXPECT_EQ(document, shadow_root.CommonAncestorTreeScope(*document));
@@ -48,8 +48,8 @@ TEST(TreeScopeTest, CommonAncestorOfSiblingTrees) {
   Element* body = document->CreateRawElement(HTMLNames::bodyTag);
   html->AppendChild(body);
 
-  ShadowRoot& shadow_root_a = head->CreateShadowRootInternal();
-  ShadowRoot& shadow_root_b = body->CreateShadowRootInternal();
+  ShadowRoot& shadow_root_a = head->CreateV0ShadowRootForTesting();
+  ShadowRoot& shadow_root_b = body->CreateV0ShadowRootForTesting();
 
   EXPECT_EQ(document, shadow_root_a.CommonAncestorTreeScope(shadow_root_b));
   EXPECT_EQ(document, shadow_root_b.CommonAncestorTreeScope(shadow_root_a));
@@ -70,12 +70,12 @@ TEST(TreeScopeTest, CommonAncestorOfTreesAtDifferentDepths) {
   Element* body = document->CreateRawElement(HTMLNames::bodyTag);
   html->AppendChild(body);
 
-  ShadowRoot& shadow_root_y = head->CreateShadowRootInternal();
-  ShadowRoot& shadow_root_b = body->CreateShadowRootInternal();
+  ShadowRoot& shadow_root_y = head->CreateV0ShadowRootForTesting();
+  ShadowRoot& shadow_root_b = body->CreateV0ShadowRootForTesting();
 
   Element* div_in_y = document->CreateRawElement(HTMLNames::divTag);
   shadow_root_y.AppendChild(div_in_y);
-  ShadowRoot& shadow_root_a = div_in_y->CreateShadowRootInternal();
+  ShadowRoot& shadow_root_a = div_in_y->CreateV0ShadowRootForTesting();
 
   EXPECT_EQ(document, shadow_root_a.CommonAncestorTreeScope(shadow_root_b));
   EXPECT_EQ(document, shadow_root_b.CommonAncestorTreeScope(shadow_root_a));

third_party/blink/renderer/core/editing/finder/text_finder_test.cc

@@ -203,7 +203,8 @@ TEST_F(TextFinderTest, FindTextNotFound) {
 
 TEST_F(TextFinderTest, FindTextInShadowDOM) {
   GetDocument().body()->SetInnerHTMLFromString("<b>FOO</b><i>foo</i>");
-  ShadowRoot& shadow_root = GetDocument().body()->CreateShadowRootInternal();
+  ShadowRoot& shadow_root =
+      GetDocument().body()->CreateV0ShadowRootForTesting();
   shadow_root.SetInnerHTMLFromString(
       "<content select=\"i\"></content><u>Foo</u><content></content>");
   Node* text_in_b_element = GetDocument().body()->firstChild()->firstChild();
@@ -363,7 +364,8 @@ TEST_F(TextFinderTest, ScopeTextMatchesRepeated) {
 
 TEST_F(TextFinderTest, ScopeTextMatchesWithShadowDOM) {
   GetDocument().body()->SetInnerHTMLFromString("<b>FOO</b><i>foo</i>");
-  ShadowRoot& shadow_root = GetDocument().body()->CreateShadowRootInternal();
+  ShadowRoot& shadow_root =
+      GetDocument().body()->CreateV0ShadowRootForTesting();
   shadow_root.SetInnerHTMLFromString(
       "<content select=\"i\"></content><u>Foo</u><content></content>");
   Node* text_in_b_element = GetDocument().body()->firstChild()->firstChild();

third_party/blink/renderer/core/editing/testing/editing_test_base.cc

@@ -96,7 +96,7 @@ ShadowRoot* EditingTestBase::CreateShadowRootForElementWithIDAndSetInnerHTML(
     const char* shadow_root_content) {
   ShadowRoot& shadow_root =
       scope.getElementById(AtomicString::FromUTF8(host_element_id))
-          ->CreateShadowRootInternal();
+          ->CreateV0ShadowRootForTesting();
   shadow_root.SetInnerHTMLFromString(String::FromUTF8(shadow_root_content),
                                      ASSERT_NO_EXCEPTION);
   scope.GetDocument().View()->UpdateAllLifecyclePhases();

third_party/blink/renderer/core/exported/web_element_test.cc

@@ -121,8 +121,9 @@ TEST_F(WebElementTest, HasNonEmptyLayoutSize) {
   EXPECT_TRUE(TestElement().HasNonEmptyLayoutSize());
 
   InsertHTML(kEmptyBlock);
-  ShadowRoot& root =
-      GetDocument().getElementById("testElement")->CreateShadowRootInternal();
+  ShadowRoot& root = GetDocument()
+                         .getElementById("testElement")
+                         ->CreateV0ShadowRootForTesting();
   root.SetInnerHTMLFromString("<div>Hello World</div>");
   EXPECT_TRUE(TestElement().HasNonEmptyLayoutSize());
 

third_party/blink/renderer/core/exported/web_frame_serializer_sanitization_test.cc

@@ -163,7 +163,7 @@ class WebFrameSerializerSanitizationTest : public testing::Test {
     ShadowRoot* shadow_root;
     if (shadow_type == ShadowRootType::V0) {
       DCHECK(!delegates_focus);
-      shadow_root = &host_element->CreateShadowRootInternal();
+      shadow_root = &host_element->CreateV0ShadowRootForTesting();
     } else {
       shadow_root =
           &host_element->AttachShadowRootInternal(shadow_type, delegates_focus);