| Index: content/renderer/accessibility/renderer_accessibility_browsertest.cc
|
| diff --git a/content/renderer/accessibility/renderer_accessibility_browsertest.cc b/content/renderer/accessibility/renderer_accessibility_browsertest.cc
|
| index 9aa4b28e6833045c253680e2cca6765feea85c74..27a25cd4489b9da55b332824e1f8d2d134f1860c 100644
|
| --- a/content/renderer/accessibility/renderer_accessibility_browsertest.cc
|
| +++ b/content/renderer/accessibility/renderer_accessibility_browsertest.cc
|
| @@ -7,6 +7,7 @@
|
| #include "content/common/view_message_enums.h"
|
| #include "content/public/test/render_view_test.h"
|
| #include "content/renderer/accessibility/renderer_accessibility_complete.h"
|
| +#include "content/renderer/render_frame_impl.h"
|
| #include "content/renderer/render_view_impl.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| #include "third_party/WebKit/public/platform/WebSize.h"
|
| @@ -22,8 +23,8 @@ namespace content {
|
|
|
| class TestRendererAccessibilityComplete : public RendererAccessibilityComplete {
|
| public:
|
| - explicit TestRendererAccessibilityComplete(RenderViewImpl* render_view)
|
| - : RendererAccessibilityComplete(render_view) {
|
| + explicit TestRendererAccessibilityComplete(RenderFrameImpl* render_frame)
|
| + : RendererAccessibilityComplete(render_frame) {
|
| }
|
|
|
| void SendPendingAccessibilityEvents() {
|
| @@ -49,7 +50,7 @@ class RendererAccessibilityTest : public RenderViewTest {
|
| }
|
|
|
| void SetMode(AccessibilityMode mode) {
|
| - view()->OnSetAccessibilityMode(mode);
|
| + frame()->OnSetAccessibilityMode(mode);
|
| }
|
|
|
| void GetLastAccEvent(
|
| @@ -239,7 +240,7 @@ TEST_F(RendererAccessibilityTest, SendFullAccessibilityTreeOnReload) {
|
| // Creating a RendererAccessibilityComplete should sent the tree
|
| // to the browser.
|
| scoped_ptr<TestRendererAccessibilityComplete> accessibility(
|
| - new TestRendererAccessibilityComplete(view()));
|
| + new TestRendererAccessibilityComplete(frame()));
|
| accessibility->SendPendingAccessibilityEvents();
|
| EXPECT_EQ(4, CountAccessibilityNodesSentToBrowser());
|
|
|
| @@ -309,7 +310,7 @@ TEST_F(RendererAccessibilityTest,
|
| // Creating a RendererAccessibilityComplete should send the tree
|
| // to the browser.
|
| scoped_ptr<TestRendererAccessibilityComplete> accessibility(
|
| - new TestRendererAccessibilityComplete(view()));
|
| + new TestRendererAccessibilityComplete(frame()));
|
| accessibility->SendPendingAccessibilityEvents();
|
| EXPECT_EQ(5, CountAccessibilityNodesSentToBrowser());
|
|
|
| @@ -362,7 +363,7 @@ TEST_F(RendererAccessibilityTest, HideAccessibilityObject) {
|
| LoadHTML(html.c_str());
|
|
|
| scoped_ptr<TestRendererAccessibilityComplete> accessibility(
|
| - new TestRendererAccessibilityComplete(view()));
|
| + new TestRendererAccessibilityComplete(frame()));
|
| accessibility->SendPendingAccessibilityEvents();
|
| EXPECT_EQ(4, CountAccessibilityNodesSentToBrowser());
|
|
|
| @@ -414,7 +415,7 @@ TEST_F(RendererAccessibilityTest, ShowAccessibilityObject) {
|
| LoadHTML(html.c_str());
|
|
|
| scoped_ptr<TestRendererAccessibilityComplete> accessibility(
|
| - new TestRendererAccessibilityComplete(view()));
|
| + new TestRendererAccessibilityComplete(frame()));
|
| accessibility->SendPendingAccessibilityEvents();
|
| EXPECT_EQ(3, CountAccessibilityNodesSentToBrowser());
|
|
|
| @@ -458,7 +459,7 @@ TEST_F(RendererAccessibilityTest, DetachAccessibilityObject) {
|
| LoadHTML(html.c_str());
|
|
|
| scoped_ptr<TestRendererAccessibilityComplete> accessibility(
|
| - new TestRendererAccessibilityComplete(view()));
|
| + new TestRendererAccessibilityComplete(frame()));
|
| accessibility->SendPendingAccessibilityEvents();
|
| EXPECT_EQ(7, CountAccessibilityNodesSentToBrowser());
|
|
|
| @@ -526,7 +527,7 @@ TEST_F(RendererAccessibilityTest, EventOnObjectNotInTree) {
|
| LoadHTML(html.c_str());
|
|
|
| scoped_ptr<TestRendererAccessibilityComplete> accessibility(
|
| - new TestRendererAccessibilityComplete(view()));
|
| + new TestRendererAccessibilityComplete(frame()));
|
| accessibility->SendPendingAccessibilityEvents();
|
| EXPECT_EQ(3, CountAccessibilityNodesSentToBrowser());
|
|
|
|
|