Re-enable FocusBeforeNavigation test.

content/browser/web_contents/web_contents_impl.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/browser/web_contents/web_contents_impl.h"
 
 #include <stddef.h>
 
 #include <cmath>
 #include <utility>
@@ skipping 1433 matching lines @@
   // Render{View,Frame}Host must be initialized and the RenderWidgetHostView
   // created. This is needed because the usual initialization happens during
   // the first navigation, but when attaching a new window we don't navigate
   // before attaching. If the browser side is already initialized, the calls
   // below will just early return.
   render_manager->InitRenderView(GetRenderViewHost(), nullptr);
   GetMainFrame()->Init();
   if (!render_manager->GetRenderWidgetHostView())
     CreateRenderWidgetHostViewForRenderManager(GetRenderViewHost());
 
+  auto* outer_web_contents_impl =
+      static_cast<WebContentsImpl*>(outer_web_contents);
+  auto* outer_contents_frame_impl =
+      static_cast<RenderFrameHostImpl*>(outer_contents_frame);
   // Create a link to our outer WebContents.
   node_.reset(new WebContentsTreeNode());
-  node_->ConnectToOuterWebContents(
-      this, static_cast<WebContentsImpl*>(outer_web_contents),
-      static_cast<RenderFrameHostImpl*>(outer_contents_frame));
+  node_->ConnectToOuterWebContents(this, outer_web_contents_impl,
+                                   outer_contents_frame_impl);
 
   DCHECK(outer_contents_frame);
 
   // Create a proxy in top-level RenderFrameHostManager, pointing to the
   // SiteInstance of the outer WebContents. The proxy will be used to send
   // postMessage to the inner WebContents.
   render_manager->CreateOuterDelegateProxy(
-      outer_contents_frame->GetSiteInstance(),
-      static_cast<RenderFrameHostImpl*>(outer_contents_frame));
+      outer_contents_frame->GetSiteInstance(), outer_contents_frame_impl);
 
   render_manager->SetRWHViewForInnerContents(
       render_manager->GetRenderWidgetHostView());
 
   static_cast<RenderWidgetHostViewChildFrame*>(
       render_manager->GetRenderWidgetHostView())
       ->RegisterFrameSinkId();
 
+  if (outer_web_contents_impl->frame_tree_.GetFocusedFrame() ==
+      outer_contents_frame_impl->frame_tree_node()) {
+    SetFocusedFrame(frame_tree_.root(), nullptr);

[alexmos, 2017/03/04 01:12:16]

I'm curious if this makes the code that returns the main frame if there's no
focused frame in GetFocusedFrameIncludingInnerWebContents (that I asked about in
https://codereview.chromium.org/2674353003/diff/60001/content/browser/web_con...)
unnecessary?   This should guarantee that you focus the main frame on attach,
though I'm not sure about the other case you mentioned where the focused frame
can become null.

[avallee, 2017/03/15 02:55:20]

This will end up calling focus on the widget which will cause the renderer side
to focus the main frame when there is no focused frame.

+  }
+
   // Set up the the guest's AX tree to point back at the embedder's AX tree.
   auto* parent_frame = outer_contents_frame->GetParent();
   GetMainFrame()->set_browser_plugin_embedder_ax_tree_id(
       parent_frame->GetAXTreeID());
   GetMainFrame()->UpdateAXTreeData();
 
   // At this point, we should destroy the TextInputManager which will notify all
   // the RWHV in this WebContents. The RWHV in this WebContents should use the
   // TextInputManager owned by the outer WebContents.
   // TODO(ekaramad): Is it possible to have TextInputState before attaching to
@@ skipping 4009 matching lines @@
     RenderViewHost* render_view_host = RenderViewHost::From(render_widget_host);
     if (!render_view_host)
       continue;
     render_view_host_set.insert(render_view_host);
   }
   for (RenderViewHost* render_view_host : render_view_host_set)
     render_view_host->OnWebkitPreferencesChanged();
 }
 
 }  // namespace content