Refactor CreateOpenerProxies to support updates to frame openers.

content/browser/frame_host/render_frame_host_manager.h

 // Copyright 2013 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_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_
 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_
 
 #include <list>
 #include <map>
 
@@ skipping 464 matching lines @@
 
   // Returns a copy of the map of proxy hosts. The keys are SiteInstance IDs,
   // the values are RenderFrameProxyHosts.
   std::map<int, RenderFrameProxyHost*> GetAllProxyHostsForTesting();
 
  private:
   friend class NavigatorTestWithBrowserSideNavigation;
   friend class RenderFrameHostManagerTest;
   friend class TestWebContents;
 
+  FRIEND_TEST_ALL_PREFIXES(RenderFrameHostManagerTest,
+                           TraverseComplexOpenerChain);

[Charlie Reis, 2015/08/05 23:59:09]

Maybe we can expose CollectOpenerFrameTrees via RenderFrameHostManagerTest
instead, since that's already a friend class?

[alexmos, 2015/08/06 17:05:39]

Done.

+
   // Stores information regarding a SiteInstance targeted at a specific URL to
   // allow for comparisons without having to actually create new instances. It
   // can point to an existing one or store the details needed to create a new
   // one.
   struct CONTENT_EXPORT SiteInstanceDescriptor {
     explicit SiteInstanceDescriptor(content::SiteInstance* site_instance)
         : existing_site_instance(site_instance),
           new_is_related_to_current(false) {}
 
     SiteInstanceDescriptor(BrowserContext* browser_context,
@@ skipping 116 matching lines @@
   void CreateProxiesForNewRenderFrameHost(SiteInstance* old_instance,
                                           SiteInstance* new_instance,
                                           int* create_render_frame_flags);
 
   // Create swapped out RenderViews and RenderFrameProxies in the given
   // SiteInstance for all frames on the opener chain of this frame.  Same as
   // CreateOpenerProxies, but starts from this frame's opener, calling
   // CreateOpenerProxies on it if it exists and returning otherwise.
   void CreateOpenerProxiesIfNeeded(SiteInstance* instance);
 
+  // Traverse the opener chain and populate |opener_frame_trees| with
+  // all FrameTrees accessible by following frame openers of nodes in the
+  // current node's FrameTree. |opener_frame_trees| is ordered so that openers
+  // of smaller-indexed entries point to larger-indexed entries (i.e., this
+  // node's FrameTree is at index 0, its opener's FrameTree is at index 1,
+  // etc). If the traversal encounters a node with an opener pointing to a
+  // FrameTree that has already been traversed (such as when there's a cycle),
+  // the node is added to |nodes_with_back_links|.
+  void CollectOpenerFrameTrees(
+      std::vector<FrameTree*>* opener_frame_trees,
+      base::hash_set<FrameTreeNode*>* nodes_with_back_links);
+
+  // Create swapped out RenderViews and RenderFrameProxies in the given
+  // SiteInstance for the current node's FrameTree.  Used as a helper function
+  // in CreateOpenerProxies for creating proxies in each FrameTree on the
+  // opener chain.
+  void CreateOpenerProxiesForFrameTree(SiteInstance* instance);
+
   // Creates a RenderFrameHost and corresponding RenderViewHost if necessary.
   scoped_ptr<RenderFrameHostImpl> CreateRenderFrameHost(SiteInstance* instance,
                                                         int view_routing_id,
                                                         int frame_routing_id,
                                                         int flags);
 
   // PlzNavigate
   // Creates and initializes a speculative RenderFrameHost and/or WebUI for an
   // ongoing navigation. They might be destroyed and re-created later if the
   // navigation is redirected to a different SiteInstance.
@@ skipping 162 matching lines @@
   bool should_reuse_web_ui_;
 
   base::WeakPtrFactory<RenderFrameHostManager> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderFrameHostManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_