Index: trunk/src/content/renderer/accessibility/renderer_accessibility_browsertest.cc |
=================================================================== |
--- trunk/src/content/renderer/accessibility/renderer_accessibility_browsertest.cc (revision 284469) |
+++ trunk/src/content/renderer/accessibility/renderer_accessibility_browsertest.cc (working copy) |
@@ -8,7 +8,6 @@ |
#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" |
@@ -24,8 +23,8 @@ |
class TestRendererAccessibilityComplete : public RendererAccessibilityComplete { |
public: |
- explicit TestRendererAccessibilityComplete(RenderFrameImpl* render_frame) |
- : RendererAccessibilityComplete(render_frame) { |
+ explicit TestRendererAccessibilityComplete(RenderViewImpl* render_view) |
+ : RendererAccessibilityComplete(render_view) { |
} |
void SendPendingAccessibilityEvents() { |
@@ -51,7 +50,7 @@ |
} |
void SetMode(AccessibilityMode mode) { |
- frame()->OnSetAccessibilityMode(mode); |
+ view()->OnSetAccessibilityMode(mode); |
} |
void GetLastAccEvent( |
@@ -241,7 +240,7 @@ |
// Creating a RendererAccessibilityComplete should sent the tree |
// to the browser. |
scoped_ptr<TestRendererAccessibilityComplete> accessibility( |
- new TestRendererAccessibilityComplete(frame())); |
+ new TestRendererAccessibilityComplete(view())); |
accessibility->SendPendingAccessibilityEvents(); |
EXPECT_EQ(4, CountAccessibilityNodesSentToBrowser()); |
@@ -311,7 +310,7 @@ |
// Creating a RendererAccessibilityComplete should send the tree |
// to the browser. |
scoped_ptr<TestRendererAccessibilityComplete> accessibility( |
- new TestRendererAccessibilityComplete(frame())); |
+ new TestRendererAccessibilityComplete(view())); |
accessibility->SendPendingAccessibilityEvents(); |
EXPECT_EQ(5, CountAccessibilityNodesSentToBrowser()); |
@@ -365,7 +364,7 @@ |
LoadHTML(html.c_str()); |
scoped_ptr<TestRendererAccessibilityComplete> accessibility( |
- new TestRendererAccessibilityComplete(frame())); |
+ new TestRendererAccessibilityComplete(view())); |
accessibility->SendPendingAccessibilityEvents(); |
EXPECT_EQ(4, CountAccessibilityNodesSentToBrowser()); |
@@ -417,7 +416,7 @@ |
LoadHTML(html.c_str()); |
scoped_ptr<TestRendererAccessibilityComplete> accessibility( |
- new TestRendererAccessibilityComplete(frame())); |
+ new TestRendererAccessibilityComplete(view())); |
accessibility->SendPendingAccessibilityEvents(); |
EXPECT_EQ(3, CountAccessibilityNodesSentToBrowser()); |
@@ -461,7 +460,7 @@ |
LoadHTML(html.c_str()); |
scoped_ptr<TestRendererAccessibilityComplete> accessibility( |
- new TestRendererAccessibilityComplete(frame())); |
+ new TestRendererAccessibilityComplete(view())); |
accessibility->SendPendingAccessibilityEvents(); |
EXPECT_EQ(7, CountAccessibilityNodesSentToBrowser()); |
@@ -529,7 +528,7 @@ |
LoadHTML(html.c_str()); |
scoped_ptr<TestRendererAccessibilityComplete> accessibility( |
- new TestRendererAccessibilityComplete(frame())); |
+ new TestRendererAccessibilityComplete(view())); |
accessibility->SendPendingAccessibilityEvents(); |
EXPECT_EQ(3, CountAccessibilityNodesSentToBrowser()); |