Plumb the correct owner document through DocumentInit::m_owner.

content/shell/renderer/layout_test/blink_test_runner.cc

 // Copyright (c) 2012 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 "content/shell/renderer/layout_test/blink_test_runner.h"
 
 #include <stddef.h>
 #include <algorithm>
 #include <clocale>
 #include <cmath>
@@ skipping 824 matching lines @@
   render_view()->GetWebView()->setFocusedFrame(frame);
 }
 
 void BlinkTestRunner::DidFailProvisionalLoad(WebLocalFrame* frame,
                                              const WebURLError& error) {
   focus_on_next_commit_ = false;
 }
 
 // Public methods - -----------------------------------------------------------
 
-void BlinkTestRunner::Reset() {
+void BlinkTestRunner::Reset(bool for_new_test) {
   // The proxy_ is always non-NULL, it is set right after construction.
   proxy_->set_widget(render_view()->GetWebView());
   proxy_->Reset();
   prefs_.Reset();
   routing_ids_.clear();
   session_histories_.clear();
   current_entry_indexes_.clear();
 
   render_view()->ClearEditCommands();
-  if (render_view()->GetWebView()->mainFrame()->isWebLocalFrame())
-    render_view()->GetWebView()->mainFrame()->setName(WebString());
-  render_view()->GetWebView()->mainFrame()->clearOpener();
+  if (for_new_test) {
+    if (render_view()->GetWebView()->mainFrame()->isWebLocalFrame())
+      render_view()->GetWebView()->mainFrame()->setName(WebString());
+    render_view()->GetWebView()->mainFrame()->clearOpener();
+  }
 
   // Resetting the internals object also overrides the WebPreferences, so we
   // have to sync them to WebKit again.
   if (render_view()->GetWebView()->mainFrame()->isWebLocalFrame()) {
     WebTestingSupport::resetInternalsObject(
         render_view()->GetWebView()->mainFrame()->toWebLocalFrame());
     render_view()->SetWebkitPreferences(render_view()->GetWebkitPreferences());
   }
 }
 
@@ skipping 127 matching lines @@
     const std::vector<std::vector<PageState>>& session_histories,
     const std::vector<unsigned>& current_entry_indexes) {
   routing_ids_ = routing_ids;
   session_histories_ = session_histories;
   current_entry_indexes_ = current_entry_indexes;
   CaptureDump();
 }
 
 void BlinkTestRunner::OnReset() {
   LayoutTestRenderProcessObserver::GetInstance()->test_interfaces()->ResetAll();
-  Reset();
+  Reset(true /* for_new_test */);
   // Navigating to about:blank will make sure that no new loads are initiated
   // by the renderer.
   render_view()->GetWebView()->mainFrame()->loadRequest(
       WebURLRequest(GURL(url::kAboutBlankURL)));
   Send(new ShellViewHostMsg_ResetDone(routing_id()));
 }
 
 void BlinkTestRunner::OnNotifyDone() {
   render_view()->GetWebView()->mainFrame()->executeScript(
       WebScriptSource(WebString::fromUTF8("testRunner.notifyDone();")));
@@ skipping 16 matching lines @@
   get_bluetooth_events_callbacks_.pop_front();
   callback.Run(events);
 }
 
 void BlinkTestRunner::ReportLeakDetectionResult(
     const LeakDetectionResult& report) {
   Send(new ShellViewHostMsg_LeakDetectionDone(routing_id(), report));
 }
 
 }  // namespace content