Plumb the correct owner document through DocumentInit::m_owner.

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

 /*
  * Copyright (C) 2011 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 84 matching lines @@
     DEFINE_STATIC_LOCAL(TestWebFrameClient, client, ());
     return &client;
 }
 
 TestWebViewClient* defaultWebViewClient()
 {
     DEFINE_STATIC_LOCAL(TestWebViewClient,  client, ());
     return &client;
 }
 
+// |uniqueName| is normally calculated in a somewhat complicated way by the
+// FrameTree class, but for test purposes the approximation below should be
+// close enough.
+String nameToUniqueName(const String& name)
+{
+    static int uniqueNameCounter = 0;
+    StringBuilder uniqueName;
+    uniqueName.append(name);
+    uniqueName.append(" ");
+    uniqueName.appendNumber(uniqueNameCounter++);
+    return uniqueName.toString();
+}
+
 } // namespace
 
 void loadFrame(WebFrame* frame, const std::string& url)
 {
     WebURLRequest urlRequest;
     urlRequest.initialize();
     urlRequest.setURL(URLTestHelpers::toKURL(url));
     frame->loadRequest(urlRequest);
     pumpPendingRequests(frame);
 }
@@ skipping 25 matching lines @@
 void pumpPendingRequestsDoNotUse(WebFrame* frame)
 {
     pumpPendingRequests(frame);
 }
 
 WebLocalFrame* createLocalChild(WebRemoteFrame* parent, const WebString& name, WebFrameClient* client, WebFrame* previousSibling, const WebFrameOwnerProperties& properties)
 {
     if (!client)
         client = defaultWebFrameClient();
 
-    // |uniqueName| is normally calculated in a somewhat complicated way by the
-    // FrameTree class, but for test purposes the approximation below should be
-    // close enough.
-    static int uniqueNameCounter = 0;
-    StringBuilder uniqueName;
-    uniqueName.append(name);
-    uniqueName.appendNumber(uniqueNameCounter++);
+    return parent->createLocalChild(WebTreeScopeType::Document, name, nameToUniqueName(name), WebSandboxFlags::None, client, previousSibling, properties, nullptr);
+}
 
-    return parent->createLocalChild(WebTreeScopeType::Document, name, uniqueName.toString(), WebSandboxFlags::None, client, previousSibling, properties);
+WebRemoteFrame* createRemoteChild(WebRemoteFrame* parent, WebRemoteFrameClient* client, const WebString& name)
+{
+    return parent->createRemoteChild(WebTreeScopeType::Document, name, nameToUniqueName(name), WebSandboxFlags::None, client, nullptr);
 }
 
 WebViewHelper::WebViewHelper(SettingOverrider* settingOverrider)
     : m_webView(nullptr)
     , m_webViewWidget(nullptr)
     , m_settingOverrider(settingOverrider)
 {
 }
 
 WebViewHelper::~WebViewHelper()
 {
     reset();
 }
 
-WebViewImpl* WebViewHelper::initialize(bool enableJavascript, TestWebFrameClient* webFrameClient, TestWebViewClient* webViewClient, void (*updateSettingsFunc)(WebSettings*))
+WebViewImpl* WebViewHelper::initializeWithOpener(WebFrame* opener, bool enableJavascript, TestWebFrameClient* webFrameClient, TestWebViewClient* webViewClient, void (*updateSettingsFunc)(WebSettings*))
 {
     reset();
 
     if (!webFrameClient)
         webFrameClient = defaultWebFrameClient();
     if (!webViewClient)
         webViewClient = defaultWebViewClient();
     m_webView = WebViewImpl::create(webViewClient);
     m_webView->settings()->setJavaScriptEnabled(enableJavascript);
     m_webView->settings()->setPluginsEnabled(true);
     // Enable (mocked) network loads of image URLs, as this simplifies
     // the completion of resource loads upon test shutdown & helps avoid
     // dormant loads trigger Resource leaks for image loads.
     //
     // Consequently, all external image resources must be mocked.
     m_webView->settings()->setLoadsImagesAutomatically(true);
     if (updateSettingsFunc)
         updateSettingsFunc(m_webView->settings());
     else
         m_webView->settings()->setDeviceSupportsMouse(false);
     if (m_settingOverrider)
         m_settingOverrider->overrideSettings(m_webView->settings());
     m_webView->setDeviceScaleFactor(webViewClient->screenInfo().deviceScaleFactor);
     m_webView->setDefaultPageScaleLimits(1, 4);
-    WebLocalFrame* frame = WebLocalFrameImpl::create(WebTreeScopeType::Document, webFrameClient);
+    WebLocalFrame* frame = WebLocalFrameImpl::create(WebTreeScopeType::Document, webFrameClient, opener);
     m_webView->setMainFrame(frame);
     // TODO(dcheng): The main frame widget currently has a special case.
     // Eliminate this once WebView is no longer a WebWidget.
     m_webViewWidget = blink::WebFrameWidget::create(webViewClient, m_webView, frame);
 
     m_testWebViewClient = webViewClient;
 
     return m_webView;
 }
 
+WebViewImpl* WebViewHelper::initialize(bool enableJavascript, TestWebFrameClient* webFrameClient, TestWebViewClient* webViewClient, void (*updateSettingsFunc)(WebSettings*))
+{
+    return initializeWithOpener(nullptr, enableJavascript, webFrameClient, webViewClient, updateSettingsFunc);
+}
+
 WebViewImpl* WebViewHelper::initializeAndLoad(const std::string& url, bool enableJavascript, TestWebFrameClient* webFrameClient, TestWebViewClient* webViewClient, void (*updateSettingsFunc)(WebSettings*))
 {
     initialize(enableJavascript, webFrameClient, webViewClient, updateSettingsFunc);
 
     loadFrame(webView()->mainFrame(), url);
 
     return webViewImpl();
 }
 
 void WebViewHelper::reset()
@@ skipping 56 matching lines @@
         // and asynchronous parsing make use of off main thread HTML parser.
         testing::runPendingTasks();
         if (!isLoading())
             break;
 
         testing::yieldCurrentThread();
     }
 }
 
 TestWebRemoteFrameClient::TestWebRemoteFrameClient()
-    : m_frame(WebRemoteFrameImpl::create(WebTreeScopeType::Document, this))
+    : m_frame(WebRemoteFrameImpl::create(WebTreeScopeType::Document, this, nullptr))
 {
 }
 
 void TestWebRemoteFrameClient::frameDetached(DetachType type)
 {
     if (type == DetachType::Remove && m_frame->parent())
         m_frame->parent()->removeChild(m_frame);
     m_frame->close();
 }
 
 void TestWebViewClient::initializeLayerTreeView()
 {
     m_layerTreeView = adoptPtr(Platform::current()->unitTestSupport()->createLayerTreeViewForTesting());
     ASSERT(m_layerTreeView);
 }
 
 } // namespace FrameTestHelpers
 } // namespace blink