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 e8ba40f4b11a036f11c0527587049dfb952ec248..80e67ab5dac5a4e0ff08228dcec120de85388f01 100644 |
--- a/content/test/accessibility_browser_test_utils.cc |
+++ b/content/test/accessibility_browser_test_utils.cc |
@@ -8,8 +8,9 @@ |
#include "base/logging.h" |
#include "base/strings/string_util.h" |
#include "base/strings/utf_string_conversions.h" |
-#include "content/browser/renderer_host/render_view_host_impl.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" |
@@ -25,9 +26,9 @@ AccessibilityNotificationWaiter::AccessibilityNotificationWaiter(Shell* shell) |
loop_runner_(new MessageLoopRunner()), |
weak_factory_(this) { |
WebContents* web_contents = shell_->web_contents(); |
- view_host_ = static_cast<RenderViewHostImpl*>( |
- web_contents->GetRenderViewHost()); |
- view_host_->SetAccessibilityCallbackForTesting( |
+ frame_host_ = static_cast<RenderFrameHostImpl*>( |
+ web_contents->GetMainFrame()); |
+ frame_host_->SetAccessibilityCallbackForTesting( |
base::Bind(&AccessibilityNotificationWaiter::OnAccessibilityEvent, |
weak_factory_.GetWeakPtr())); |
} |
@@ -40,13 +41,14 @@ AccessibilityNotificationWaiter::AccessibilityNotificationWaiter( |
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()); |
- view_host_->SetAccessibilityCallbackForTesting( |
+ WebContentsImpl* web_contents = static_cast<WebContentsImpl*>( |
+ shell_->web_contents()); |
+ frame_host_ = static_cast<RenderFrameHostImpl*>( |
+ web_contents->GetMainFrame()); |
+ frame_host_->SetAccessibilityCallbackForTesting( |
base::Bind(&AccessibilityNotificationWaiter::OnAccessibilityEvent, |
weak_factory_.GetWeakPtr())); |
- view_host_->AddAccessibilityMode(accessibility_mode); |
+ web_contents->AddAccessibilityMode(accessibility_mode); |
} |
AccessibilityNotificationWaiter::~AccessibilityNotificationWaiter() { |
@@ -57,7 +59,7 @@ void AccessibilityNotificationWaiter::WaitForNotification() { |
} |
const ui::AXTree& AccessibilityNotificationWaiter::GetAXTree() const { |
- return view_host_->ax_tree_for_testing(); |
+ return *frame_host_->GetAXTreeForTesting(); |
} |
void AccessibilityNotificationWaiter::OnAccessibilityEvent( |