Track frame openers in FrameTreeNodes instead of WebContents

content/test/test_web_contents.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/test/test_web_contents.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "content/browser/browser_url_handler_impl.h"
@@ skipping 10 matching lines @@
 #include "content/public/browser/notification_types.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/page_state.h"
 #include "content/public/test/mock_render_process_host.h"
 #include "content/test/test_render_view_host.h"
 #include "ui/base/page_transition_types.h"
 
 namespace content {
 
 TestWebContents::TestWebContents(BrowserContext* browser_context)
-    : WebContentsImpl(browser_context, NULL),
+    : WebContentsImpl(browser_context),
       delegate_view_override_(NULL),
       expect_set_history_offset_and_length_(false),
       expect_set_history_offset_and_length_history_length_(0) {
 }
 
 TestWebContents* TestWebContents::Create(BrowserContext* browser_context,
                                          SiteInstance* instance) {
   TestWebContents* test_web_contents = new TestWebContents(browser_context);
   test_web_contents->Init(WebContents::CreateParams(browser_context, instance));
   return test_web_contents;
@@ skipping 170 matching lines @@
   GetMainFrame()->SendBeforeUnloadACK(true);
 }
 
 RenderViewHostDelegateView* TestWebContents::GetDelegateView() {
   if (delegate_view_override_)
     return delegate_view_override_;
   return WebContentsImpl::GetDelegateView();
 }
 
 void TestWebContents::SetOpener(TestWebContents* opener) {
-  // This is normally only set in the WebContents constructor, which also
-  // registers an observer for when the opener gets closed.
-  opener_ = opener;
-  AddDestructionObserver(opener_);
+  frame_tree_.root()->SetOpener(opener->GetFrameTree()->root());
 }
 
 void TestWebContents::AddPendingContents(TestWebContents* contents) {
   // This is normally only done in WebContentsImpl::CreateNewWindow.
   pending_contents_[contents->GetRenderViewHost()->GetRoutingID()] = contents;
   AddDestructionObserver(contents);
 }
 
 void TestWebContents::ExpectSetHistoryOffsetAndLength(int history_offset,
                                                       int history_length) {
@@ skipping 56 matching lines @@
 void TestWebContents::ShowCreatedFullscreenWidget(int route_id) {
 }
 
 void TestWebContents::SaveFrameWithHeaders(const GURL& url,
                                            const Referrer& referrer,
                                            const std::string& headers) {
   save_frame_headers_ = headers;
 }
 
 }  // namespace content