Fix frameset accessibility

BUG=414157

Review-Url: https://codereview.chromium.org/2158703002
Cr-Commit-Position: refs/heads/master@{#406111}

content/renderer/accessibility/blink_ax_tree_source.cc

@@ -525,14 +525,12 @@ void BlinkAXTreeSource::SerializeNode(blink::WebAXObject src,
           browser_plugin->browser_plugin_instance_id());
     }
 
-    // Iframe.
-    if (is_iframe) {
-      WebFrame* frame = WebFrame::fromFrameOwnerElement(element);
-      if (frame) {
-        dst->AddContentIntAttribute(
-            AX_CONTENT_ATTR_CHILD_ROUTING_ID,
-            GetRoutingIdForFrameOrProxy(frame));
-      }
+    // Frames and iframes.
+    WebFrame* frame = WebFrame::fromFrameOwnerElement(element);
+    if (frame) {
+      dst->AddContentIntAttribute(
+          AX_CONTENT_ATTR_CHILD_ROUTING_ID,
+          GetRoutingIdForFrameOrProxy(frame));
     }
   }
 

content/test/data/accessibility/html/frameset-expected-blink.txt

+rootWebArea
+++unknown
+++++rootWebArea
+++++++paragraph
+++++++++staticText name='My favorite browser is'
+++++++++++inlineTextBox name='My favorite browser is'
+++++++++staticText name='ABC'
+++++++++++inlineTextBox name='ABC'
+++++++++staticText name='Chrome'
+++++++++++inlineTextBox name='Chrome'
+++++++++staticText name='!'
+++++++++++inlineTextBox name='!'
+++unknown
+++++rootWebArea
+++++++paragraph
+++++++++staticText name='This test is to check '
+++++++++++inlineTextBox name='This test is to check '
+++++++++mark
+++++++++++staticText name='mark tag'
+++++++++++++inlineTextBox name='mark tag'
+++++++++staticText name='.'
+++++++++++inlineTextBox name='.'

content/test/data/accessibility/html/frameset-expected-mac.txt

-#<skip -- Flaky failure crbug.com/414157>
 AXWebArea
 ++AXUnknown
 ++++AXWebArea
@@ -11,5 +10,6 @@ AXWebArea
 ++++AXWebArea
 ++++++AXGroup
 ++++++++AXStaticText AXValue='This test is to check '
-++++++++AXStaticText AXValue='mark tag'
+++++++++AXGroup
+++++++++++AXStaticText AXValue='mark tag'
 ++++++++AXStaticText AXValue='.'

content/test/data/accessibility/html/frameset-expected-win.txt

-#<skip -- Flaky failure crbug.com/414157>
 ROLE_SYSTEM_DOCUMENT READONLY FOCUSABLE
 ++ROLE_SYSTEM_CLIENT FOCUSABLE
-++++IA2_ROLE_SCROLL_PANE
-++++++ROLE_SYSTEM_DOCUMENT READONLY FOCUSABLE
-++++++++IA2_ROLE_PARAGRAPH
-++++++++++ROLE_SYSTEM_STATICTEXT name='My favorite browser is '
-++++++++++ROLE_SYSTEM_STATICTEXT name='ABC'
-++++++++++ROLE_SYSTEM_STATICTEXT name='Chrome'
-++++++++++ROLE_SYSTEM_STATICTEXT name='!'
+++++ROLE_SYSTEM_DOCUMENT READONLY FOCUSABLE
+++++++IA2_ROLE_PARAGRAPH
+++++++++ROLE_SYSTEM_STATICTEXT name='My favorite browser is'
+++++++++ROLE_SYSTEM_STATICTEXT name='ABC'
+++++++++ROLE_SYSTEM_STATICTEXT name='Chrome'
+++++++++ROLE_SYSTEM_STATICTEXT name='!'
 ++ROLE_SYSTEM_CLIENT FOCUSABLE
-++++IA2_ROLE_SCROLL_PANE
-++++++ROLE_SYSTEM_DOCUMENT READONLY FOCUSABLE
-++++++++IA2_ROLE_PARAGRAPH
-++++++++++ROLE_SYSTEM_STATICTEXT name='This test is to check '
+++++ROLE_SYSTEM_DOCUMENT READONLY FOCUSABLE
+++++++IA2_ROLE_PARAGRAPH
+++++++++ROLE_SYSTEM_STATICTEXT name='This test is to check '
+++++++++IA2_ROLE_TEXT_FRAME
 ++++++++++ROLE_SYSTEM_STATICTEXT name='mark tag'
-++++++++++ROLE_SYSTEM_STATICTEXT name='.'
+++++++++ROLE_SYSTEM_STATICTEXT name='.'