Fix accessible touch exploration inside of iframes.

content/test/accessibility_browser_test_utils.cc

 // Copyright 2013 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/test/accessibility_browser_test_utils.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/view_message_enums.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/test/test_utils.h"
 #include "content/shell/browser/shell.h"
 #include "ui/accessibility/ax_node.h"
 
 namespace content {
 
 AccessibilityNotificationWaiter::AccessibilityNotificationWaiter(Shell* shell)
     : event_to_wait_for_(ui::AX_EVENT_NONE),
       loop_runner_(new MessageLoopRunner()),
       event_target_id_(0),
+      event_render_frame_host_(nullptr),
       weak_factory_(this) {
   WebContents* web_contents = shell->web_contents();
   frame_host_ = static_cast<RenderFrameHostImpl*>(
       web_contents->GetMainFrame());
   frame_host_->SetAccessibilityCallbackForTesting(
       base::Bind(&AccessibilityNotificationWaiter::OnAccessibilityEvent,
                  weak_factory_.GetWeakPtr()));
 }
 
 AccessibilityNotificationWaiter::AccessibilityNotificationWaiter(
@@ skipping 47 matching lines @@
 
 const ui::AXTree& AccessibilityNotificationWaiter::GetAXTree() const {
   CR_DEFINE_STATIC_LOCAL(ui::AXTree, empty_tree, ());
   const ui::AXTree* tree = frame_host_->GetAXTreeForTesting();
   if (tree)
     return *tree;
   return empty_tree;
 }
 
 void AccessibilityNotificationWaiter::OnAccessibilityEvent(
-    ui::AXEvent event_type, int event_target_id) {
+    RenderFrameHostImpl* rfhi, ui::AXEvent event_type, int event_target_id) {

[nasko, 2016/03/30 21:01:41]

style: Each parameter should be on a new line. git cl format can help quite a
bit.

[dmazzoni, 2016/03/31 16:15:55]

Ran git cl format.

    if (!IsAboutBlank() && (event_to_wait_for_ == ui::AX_EVENT_NONE ||
-                          event_to_wait_for_ == event_type)) {
+                           event_to_wait_for_ == event_type)) {
     event_target_id_ = event_target_id;
+    event_render_frame_host_ = rfhi;
     loop_runner_->Quit();
   }
 }
 
 bool AccessibilityNotificationWaiter::IsAboutBlank() {
   // Skip any accessibility notifications related to "about:blank",
   // to avoid a possible race condition between the test beginning
   // listening for accessibility events and "about:blank" loading.
   return GetAXTree().data().url == url::kAboutBlankURL;
 }
 
 }  // namespace content