Track frame openers in FrameTreeNodes instead of WebContents

content/test/test_web_contents.h

 // 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.
 
 #ifndef CONTENT_TEST_TEST_WEB_CONTENTS_H_
 #define CONTENT_TEST_TEST_WEB_CONTENTS_H_
 
 #include <string>
 
 #include "content/browser/web_contents/web_contents_impl.h"
@@ skipping 59 matching lines @@
   // Returns a clone of this TestWebContents. The returned object is also a
   // TestWebContents. The caller owns the returned object.
   WebContents* Clone() override;
 
   // Allow mocking of the RenderViewHostDelegateView.
   RenderViewHostDelegateView* GetDelegateView() override;
   void set_delegate_view(RenderViewHostDelegateView* view) {
     delegate_view_override_ = view;
   }
 
-  // Allows us to simulate this tab having an opener.
+  // Allows us to simulate this tab's main frame having an opener that points
+  // to the main frame of the |opener|.
   void SetOpener(TestWebContents* opener);

[alexmos, 2015/06/01 17:44:55]

Several unit tests rely on this, so I left this in rather than changing all call
sites to
"contents()->GetFrameTree->root()->set_opener(opener->GetFrameTree()->root())".

[Charlie Reis, 2015/06/03 20:01:37]

Acknowledged.

 
   // Allows us to simulate that a contents was created via CreateNewWindow.
   void AddPendingContents(TestWebContents* contents);
 
   // Establish expected arguments for |SetHistoryOffsetAndLength()|. When
   // |SetHistoryOffsetAndLength()| is called, the arguments are compared
   // with the expected arguments specified here.
   void ExpectSetHistoryOffsetAndLength(int history_offset,
                                        int history_length);
 
@@ skipping 38 matching lines @@
   // Expectations for arguments of |SetHistoryOffsetAndLength()|.
   bool expect_set_history_offset_and_length_;
   int expect_set_history_offset_and_length_history_offset_;
   int expect_set_history_offset_and_length_history_length_;
   std::string save_frame_headers_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_TEST_TEST_WEB_CONTENTS_H_