Fix keyboard focus for OOPIF-<webview>.

content/browser/frame_host/frame_tree.cc

Index: content/browser/frame_host/frame_tree.cc
diff --git a/content/browser/frame_host/frame_tree.cc b/content/browser/frame_host/frame_tree.cc
index a85c7fa3a5adca9163e41f361c7fa367aa728fd9..50b2661109fbf5883a79fe77b2e9868002d678a6 100644
--- a/content/browser/frame_host/frame_tree.cc
+++ b/content/browser/frame_host/frame_tree.cc
@@ -252,6 +252,19 @@ void FrameTree::SetFocusedFrame(FrameTreeNode* node, SiteInstance* source) {
   if (node == GetFocusedFrame())
     return;
 
+  if (!node) {
+    // TODO(avallee): https://crbug.com/614463 Notify proxies here once
+    // <webview> supports oopifs inside itself.
+    if (GetFocusedFrame())
+      GetFocusedFrame()->current_frame_host()->ClearFocusedFrame();
+    focused_frame_tree_node_id_ = FrameTreeNode::kFrameTreeNodeInvalidId;
+
+    // TODO(avallee): https://crbug.com/610795 This line is not sufficient to
+    // make the test pass. There seems to be no focus change events generated.
+    root()->current_frame_host()->UpdateAXTreeData();
+    return;
+  }
+
   std::set<SiteInstance*> frame_tree_site_instances =
       CollectSiteInstances(this);