Fix keyboard focus for OOPIF-<webview>.

content/browser/frame_host/render_frame_host_impl.cc

Index: content/browser/frame_host/render_frame_host_impl.cc
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index 9e15211fecddc2047ecbfd92bbe3600eccaa0524..9e1b8e590e75a21fe6e5db08ebd44edc63361ac5 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -859,7 +859,7 @@ void RenderFrameHostImpl::OnDetach() {
 }
 
 void RenderFrameHostImpl::OnFrameFocused() {
-  frame_tree_->SetFocusedFrame(frame_tree_node_, GetSiteInstance());
+  delegate_->SetFocusedFrame(frame_tree_node_, GetSiteInstance());
 }
 
 void RenderFrameHostImpl::OnOpenURL(const FrameHostMsg_OpenURL_Params& params) {
@@ -2146,6 +2146,10 @@ void RenderFrameHostImpl::SetFocusedFrame() {
   Send(new FrameMsg_SetFocusedFrame(routing_id_));
 }
 
+void RenderFrameHostImpl::UnsetFocusedFrame() {

[alexmos, 2016/05/12 20:28:40]

nit: naming this (and related bits) ClearFocusedFrame seems more consistent with
existing focus code I've seen.

[avallee, 2016/05/16 20:26:43]

Done.

+  Send(new FrameMsg_UnsetFocusedFrame(routing_id_));
+}
+
 void RenderFrameHostImpl::ExtendSelectionAndDelete(size_t before,
                                                    size_t after) {
   Send(new InputMsg_ExtendSelectionAndDelete(routing_id_, before, after));
@@ -2744,6 +2748,8 @@ void RenderFrameHostImpl::AXContentTreeDataToAXTreeData(
     return;
 
   // For the root frame tree node, also store the AXTreeID of the focused frame.
+  // TODO(avallee): https://crbug.com/610795 This is probably where we need to
+  // fix the bug to enable the test.

[alexmos, 2016/05/12 20:28:39]

nit: explicitly mention that this code is problematic for <webview>, so someone
reading the code doesn't need to look up the bug to find out what the comment is
about.

[avallee, 2016/05/16 20:26:43]

Done.

   FrameTreeNode* focused_frame_tree_node = frame_tree_->GetFocusedFrame();
   if (!focused_frame_tree_node)
     return;