Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(488)

Unified Diff: content/renderer/accessibility/renderer_accessibility_browsertest.cc

Issue 273423004: Migrate accessibility from RenderView to RenderFrame. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 2ea3b393dd0f1b0f86a385c046c2480502646fbc..6bb5c7936da38abd101fb1d1edf16313d49780e8 100644
--- a/content/renderer/accessibility/renderer_accessibility_browsertest.cc
+++ b/content/renderer/accessibility/renderer_accessibility_browsertest.cc
@@ -8,6 +8,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"
@@ -23,8 +24,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() {
@@ -50,7 +51,7 @@ class RendererAccessibilityTest : public RenderViewTest {
}
void SetMode(AccessibilityMode mode) {
- view()->OnSetAccessibilityMode(mode);
+ frame()->OnSetAccessibilityMode(mode);
}
void GetLastAccEvent(
@@ -240,7 +241,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());
@@ -310,7 +311,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());
@@ -364,7 +365,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());
@@ -416,7 +417,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());
@@ -460,7 +461,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());
@@ -528,7 +529,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());

Powered by Google App Engine
This is Rietveld 408576698