Enable WebViewAccessiblityTest for OOPIF webview.

content/browser/web_contents/web_contents_impl.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_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
 
 #include <stdint.h>
 
 #include <functional>
@@ skipping 474 matching lines @@
   device::WakeLockServiceContext* GetWakeLockServiceContext() override;
   void EnterFullscreenMode(const GURL& origin) override;
   void ExitFullscreenMode(bool will_cause_resize) override;
   bool ShouldRouteMessageEvent(
       RenderFrameHost* target_rfh,
       SiteInstance* source_site_instance) const override;
   void EnsureOpenerProxiesExist(RenderFrameHost* source_rfh) override;
   std::unique_ptr<WebUIImpl> CreateWebUIForRenderFrameHost(
       const GURL& url) override;
   void SetFocusedFrame(FrameTreeNode* node, SiteInstance* source) override;
+  RenderFrameHost* GetFocusedFrameIncludingInnerWebContents() override;
   void OnFocusedElementChangedInFrame(
       RenderFrameHostImpl* frame,
       const gfx::Rect& bounds_in_root_view) override;
   void CreateNewWindow(
       SiteInstance* source_site_instance,
       int32_t render_view_route_id,
       int32_t main_frame_route_id,
       int32_t main_frame_widget_route_id,
       const mojom::CreateNewWindowParams& params,
       SessionStorageNamespace* session_storage_namespace) override;
@@ skipping 342 matching lines @@
   // still remain disjoint.
   // The parent is referred to as "outer WebContents" and the descendents are
   // referred to as "inner WebContents".
   // For each inner WebContents, the outer WebContents will have a
   // corresponding FrameTreeNode.
   struct WebContentsTreeNode {
    public:
     WebContentsTreeNode();
     ~WebContentsTreeNode();
 
-    typedef std::set<WebContentsTreeNode*> ChildrenSet;
+    typedef std::map<int, WebContentsImpl*> ChildrenMap;
 
-    void ConnectToOuterWebContents(WebContentsImpl* outer_web_contents,
+    void ConnectToOuterWebContents(WebContentsImpl* web_contents,
+                                   WebContentsImpl* outer_web_contents,
                                    RenderFrameHostImpl* outer_contents_frame);
 
     WebContentsImpl* outer_web_contents() { return outer_web_contents_; }
     int outer_contents_frame_tree_node_id() const {
       return outer_contents_frame_tree_node_id_;
     }
 
     WebContentsImpl* focused_web_contents() { return focused_web_contents_; }
     void SetFocusedWebContents(WebContentsImpl* web_contents);
 
+    // Returns the WebContents at a tree node in the frame tree or nullptr if
+    // there is none.
+    WebContentsImpl* FindInnerWebContentsAtNode(FrameTreeNode* node);
+
    private:
     // The outer WebContents.
     WebContentsImpl* outer_web_contents_;
     // The ID of the FrameTreeNode in outer WebContents that is hosting us.
     int outer_contents_frame_tree_node_id_;
-    // List of inner WebContents that we host.
-    ChildrenSet inner_web_contents_tree_nodes_;
+    // List of inner WebContents that we host. Is is indexed by FrameTreeNode

[alexmos, 2017/03/03 20:07:57]

nit: s/Is is/It is/

[avallee, 2017/06/21 02:25:35]

reverted.

+    // id.
+    ChildrenMap inner_web_contents_tree_nodes_;
     // Only the root node should have this set. This indicates the WebContents
     // whose frame tree has the focused frame. The WebContents tree could be
     // arbitrarily deep.
     WebContentsImpl* focused_web_contents_;
   };
 
   // See WebContents::Create for a description of these parameters.
   WebContentsImpl(BrowserContext* browser_context);
 
   // Add and remove observers for page navigation notifications. The order in
@@ skipping 177 matching lines @@
   // WebContentsImpl. This will activate this content's main frame RenderWidget
   // and indirectly all its subframe widgets.  GetFocusedRenderWidgetHost will
   // search this WebContentsImpl for a focused RenderWidgetHost. The previously
   // focused WebContentsImpl, if any, will have its RenderWidgetHosts
   // deactivated.
   void SetAsFocusedWebContentsIfNecessary();
 
   // Returns the root of the WebContents tree.
   WebContentsImpl* GetOutermostWebContents();
 
+  // Walks up to the outermost WebContents and focuses the frame tree node where

[alexmos, 2017/03/03 20:07:57]

nit: s/frame tree node/FrameTreeNode/.  Also, clarify that it will do this for
each outer contents in the chain, rather than just the outermost one.  E.g.,
"Walks up the outer WebContents chain and focuses the FrameTreeNode where each
inner WebContents is attached."

[avallee, 2017/06/21 02:25:35]

Done.

+  // the current WebContents is attached.
+  void FocusOuterAttachmentFrameChain();
+
   // Navigation helpers --------------------------------------------------------
   //
   // These functions are helpers for Navigate() and DidNavigate().
 
   // Handles post-navigation tasks in DidNavigate AFTER the entry has been
   // committed to the navigation controller. Note that the navigation entry is
   // not provided since it may be invalid/changed after being committed. The
   // current navigation entry is in the NavigationController at this point.
 
   // Helper for CreateNewWidget/CreateNewFullscreenWidget.
@@ skipping 445 matching lines @@
   // Adds/removes a callback called on creation of each new WebContents.
   static void AddCreatedCallbackForTesting(const CreatedCallback& callback);
   static void RemoveCreatedCallbackForTesting(const CreatedCallback& callback);
 
   DISALLOW_COPY_AND_ASSIGN(FriendZone);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_