Cross-process iframe accessibility.

content/test/accessibility_browser_test_utils.cc

Index: content/test/accessibility_browser_test_utils.cc
diff --git a/content/test/accessibility_browser_test_utils.cc b/content/test/accessibility_browser_test_utils.cc
index 8cb74ec7b793899c38e14cdfc0a637dbb02750fd..08a9e41301e4a193a467280e030296cb26d8b0cc 100644
--- a/content/test/accessibility_browser_test_utils.cc
+++ b/content/test/accessibility_browser_test_utils.cc
@@ -19,30 +19,22 @@
 
 namespace content {
 
-AccessibilityNotificationWaiter::AccessibilityNotificationWaiter(Shell* shell)
-    : shell_(shell),
-      event_to_wait_for_(ui::AX_EVENT_NONE),
-      loop_runner_(new MessageLoopRunner()),
-      weak_factory_(this) {
-  WebContents* web_contents = shell_->web_contents();
-  view_host_ = static_cast<RenderViewHostImpl*>(
-      web_contents->GetRenderViewHost());
-  view_host_->SetAccessibilityCallbackForTesting(
-      base::Bind(&AccessibilityNotificationWaiter::OnAccessibilityEvent,
-                 weak_factory_.GetWeakPtr()));
-}
-
 AccessibilityNotificationWaiter::AccessibilityNotificationWaiter(
     Shell* shell,
     AccessibilityMode accessibility_mode,
-    ui::AXEvent event_type)
+    ui::AXEvent event_type,
+    RenderViewHostImpl* render_view_host_impl)
     : shell_(shell),
       event_to_wait_for_(event_type),
       loop_runner_(new MessageLoopRunner()),
       weak_factory_(this) {
-  WebContents* web_contents = shell_->web_contents();
-  view_host_ = static_cast<RenderViewHostImpl*>(
-      web_contents->GetRenderViewHost());
+  if (render_view_host_impl) {
+    view_host_ = render_view_host_impl;
+  } else {
+    WebContents* web_contents = shell_->web_contents();
+    view_host_ = static_cast<RenderViewHostImpl*>(
+        web_contents->GetRenderViewHost());
+  }
   view_host_->SetAccessibilityCallbackForTesting(
       base::Bind(&AccessibilityNotificationWaiter::OnAccessibilityEvent,
                  weak_factory_.GetWeakPtr()));