Move unique name generation and tracking into //content.

third_party/WebKit/Source/web/tests/WebFrameTest.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 7027 matching lines @@
         m_willSendRequestCallCount(0),
         m_childFrameCreationCount(0) {}
 
   void setChildWebFrameClient(TestCachePolicyWebFrameClient* client) {
     m_childClient = client;
   }
   WebCachePolicy getCachePolicy() const { return m_policy; }
   int willSendRequestCallCount() const { return m_willSendRequestCallCount; }
   int childFrameCreationCount() const { return m_childFrameCreationCount; }
 
-  virtual WebLocalFrame* createChildFrame(
+  WebLocalFrame* createChildFrame(
       WebLocalFrame* parent,
       WebTreeScopeType scope,
       const WebString&,
       const WebString&,
       WebSandboxFlags,
-      const WebFrameOwnerProperties& frameOwnerProperties) {
+      const WebFrameOwnerProperties& frameOwnerProperties) override {
     DCHECK(m_childClient);
     m_childFrameCreationCount++;
     WebLocalFrame* frame =
         WebLocalFrame::create(scope, m_childClient, nullptr, nullptr);
     parent->appendChild(frame);
     return frame;
   }
 
   virtual void didStartLoading(bool toDifferentDocument) {
     if (m_parentClient) {
@@ skipping 385 matching lines @@
   EXPECT_EQ(WTF::String(url.data()), item->urlString());
 }
 
 class FailCreateChildFrame : public FrameTestHelpers::TestWebFrameClient {
  public:
   FailCreateChildFrame() : m_callCount(0) {}
 
   WebLocalFrame* createChildFrame(
       WebLocalFrame* parent,
       WebTreeScopeType scope,
-      const WebString& frameName,
-      const WebString& frameUniqueName,
+      const WebString& name,
+      const WebString& fallbackName,
       WebSandboxFlags sandboxFlags,
       const WebFrameOwnerProperties& frameOwnerProperties) override {
     ++m_callCount;
     return nullptr;
   }
 
   int callCount() const { return m_callCount; }
 
  private:
   int m_callCount;
@@ skipping 1566 matching lines @@
   localFrame->setCommittedFirstRealLoad();
   FrameTestHelpers::loadFrame(localFrame, m_baseURL + "subframe-hello.html");
   EXPECT_EQ(WebStandardCommit, client.historyCommitType());
 
   // Manually reset to break WebViewHelper's dependency on the stack allocated
   // TestWebFrameClient.
   reset();
   remoteFrame->close();
 }
 
-// The uniqueName should be preserved when swapping to a RemoteFrame and back,
-// whether the frame has a name or not.
-TEST_F(WebFrameSwapTest, UniqueNameAfterRemoteToLocalSwap) {

[dcheng, 2017/03/01 23:57:26]

Working on a browser test for this, since we can't really easily test this in a
renderer unit test anymore, since both RenderFrameProxy and RenderFrameImpl are
involved.

[Charlie Reis, 2017/03/02 23:59:17]

Yes, I think a browser test for this is worthwhile.

[dcheng, 2017/03/03 10:22:07]

I'm going to put this in a separate CL (that will be landed first).

-  // Start with a named frame.
-  WebFrame* targetFrame = mainFrame()->firstChild();
-  ASSERT_TRUE(targetFrame);
-  WebString uniqueName = targetFrame->uniqueName();
-  EXPECT_EQ("frame1", uniqueName.utf8());
-
-  // Swap to a RemoteFrame.
-  FrameTestHelpers::TestWebRemoteFrameClient remoteFrameClient;
-  WebRemoteFrameImpl* remoteFrame = WebRemoteFrameImpl::create(
-      WebTreeScopeType::Document, &remoteFrameClient);
-  targetFrame->swap(remoteFrame);
-  ASSERT_TRUE(mainFrame()->firstChild());
-  ASSERT_EQ(mainFrame()->firstChild(), remoteFrame);
-  EXPECT_EQ(uniqueName.utf8(),
-            WebString(remoteFrame->frame()->tree().uniqueName()).utf8());
-
-  // Swap back to a LocalFrame.
-  RemoteToLocalSwapWebFrameClient client(remoteFrame);
-  WebLocalFrame* localFrame = WebLocalFrame::createProvisional(
-      &client, nullptr, nullptr, remoteFrame, WebSandboxFlags::None);
-  FrameTestHelpers::loadFrame(localFrame, m_baseURL + "subframe-hello.html");
-  EXPECT_EQ(uniqueName.utf8(), localFrame->uniqueName().utf8());
-  EXPECT_EQ(uniqueName.utf8(), WebString(toWebLocalFrameImpl(localFrame)
-                                             ->frame()
-                                             ->loader()
-                                             .currentItem()
-                                             ->target())
-                                   .utf8());
-
-  // Repeat with no name on the frame.
-  // (note that uniqueName is immutable after first real commit).
-  localFrame->setName("");
-  WebString uniqueName2 = localFrame->uniqueName();
-  EXPECT_EQ("frame1", uniqueName2.utf8());
-
-  FrameTestHelpers::TestWebRemoteFrameClient remoteFrameClient2;
-  WebRemoteFrameImpl* remoteFrame2 = WebRemoteFrameImpl::create(
-      WebTreeScopeType::Document, &remoteFrameClient2);
-  localFrame->swap(remoteFrame2);
-  ASSERT_TRUE(mainFrame()->firstChild());
-  ASSERT_EQ(mainFrame()->firstChild(), remoteFrame2);
-  EXPECT_EQ(uniqueName2.utf8(),
-            WebString(remoteFrame2->frame()->tree().uniqueName()).utf8());
-
-  RemoteToLocalSwapWebFrameClient client2(remoteFrame2);
-  WebLocalFrame* localFrame2 = WebLocalFrame::createProvisional(
-      &client2, nullptr, nullptr, remoteFrame2, WebSandboxFlags::None);
-  FrameTestHelpers::loadFrame(localFrame2, m_baseURL + "subframe-hello.html");
-  EXPECT_EQ(uniqueName2.utf8(), localFrame2->uniqueName().utf8());
-  EXPECT_EQ(uniqueName2.utf8(), WebString(toWebLocalFrameImpl(localFrame2)
-                                              ->frame()
-                                              ->loader()
-                                              .currentItem()
-                                              ->target())
-                                    .utf8());
-
-  // Manually reset to break WebViewHelper's dependency on the stack allocated
-  // TestWebFrameClient.
-  reset();
-  remoteFrame->close();
-  remoteFrame2->close();
-}
-
 class RemoteNavigationClient
     : public FrameTestHelpers::TestWebRemoteFrameClient {
  public:
   void navigate(const WebURLRequest& request,
                 bool shouldReplaceCurrentEntry) override {
     m_lastRequest = request;
   }
 
   const WebURLRequest& lastRequest() const { return m_lastRequest; }
 
@@ skipping 2120 matching lines @@
   scrollableArea->mouseEnteredScrollbar(*scrollableArea->verticalScrollbar());
   testing::runDelayedTasks(kMockOverlayFadeOutDelayMs);
   EXPECT_FALSE(scrollableArea->scrollbarsHidden());
   scrollableArea->mouseExitedScrollbar(*scrollableArea->verticalScrollbar());
   testing::runDelayedTasks(kMockOverlayFadeOutDelayMs);
   EXPECT_TRUE(scrollableArea->scrollbarsHidden());
 
   mockOverlayTheme.setOverlayScrollbarFadeOutDelay(0.0);
 }
 
-TEST_F(WebFrameTest, UniqueNames) {
-  registerMockedHttpURLLoad("frameset-repeated-name.html");
-  registerMockedHttpURLLoad("frameset-dest.html");
-  FrameTestHelpers::WebViewHelper webViewHelper;
-  webViewHelper.initializeAndLoad(m_baseURL + "frameset-repeated-name.html");
-  Frame* mainFrame = webViewHelper.webView()->mainFrameImpl()->frame();
-  HashSet<AtomicString> names;
-  for (Frame* frame = mainFrame->tree().firstChild(); frame;
-       frame = frame->tree().traverseNext()) {
-    EXPECT_TRUE(names.insert(frame->tree().uniqueName()).isNewEntry);
-  }
-  EXPECT_EQ(10u, names.size());
-}
-
 TEST_F(WebFrameTest, NoLoadingCompletionCallbacksInDetach) {
   class LoadingObserverFrameClient
       : public FrameTestHelpers::TestWebFrameClient {
    public:
     void frameDetached(WebLocalFrame*, DetachType) override {
       m_didCallFrameDetached = true;
     }
 
     void didStopLoading() override {
       // TODO(dcheng): Investigate not calling this as well during frame detach.
@@ skipping 38 matching lines @@
     bool m_didCallDidStopLoading = false;
     bool m_didCallDidFinishDocumentLoad = false;
     bool m_didCallDidHandleOnloadEvents = false;
   };
 
   class MainFrameClient : public FrameTestHelpers::TestWebFrameClient {
    public:
     WebLocalFrame* createChildFrame(WebLocalFrame* parent,
                                     WebTreeScopeType scope,
                                     const WebString& name,
-                                    const WebString& uniqueName,
+                                    const WebString& fallbackName,
                                     WebSandboxFlags sandboxFlags,
                                     const WebFrameOwnerProperties&) override {
       WebLocalFrame* frame =
           WebLocalFrame::create(scope, &m_childClient, nullptr, nullptr);
       parent->appendChild(frame);
       return frame;
     }
 
     LoadingObserverFrameClient& childClient() { return m_childClient; }
 
@@ skipping 25 matching lines @@
   FrameTestHelpers::WebViewHelper openerHelper;
   openerHelper.initialize(false, nullptr, &openerWebViewClient);
   FrameTestHelpers::WebViewHelper helper;
   helper.initializeWithOpener(openerHelper.webView()->mainFrame());
 
   openerHelper.reset();
   EXPECT_EQ(nullptr, helper.webView()->mainFrameImpl()->opener());
 }
 
 }  // namespace blink