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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: content/browser/accessibility/accessibility_mode_browsertest.cc

Issue 407493002: Revert of Migrate accessibility from RenderView to RenderFrame. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/browser/accessibility/#browser_accessibility_manager.cc# ('k') | content/browser/accessibility/accessibility_mode_helper.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/renderer_host/render_view_host_impl.h" 5 #include "content/browser/renderer_host/render_view_host_impl.h"
6 #include "content/browser/renderer_host/render_widget_host_impl.h" 6 #include "content/browser/renderer_host/render_widget_host_impl.h"
7 #include "content/browser/renderer_host/render_widget_host_view_base.h" 7 #include "content/browser/renderer_host/render_widget_host_view_base.h"
8 #include "content/browser/web_contents/web_contents_impl.h"
9 #include "content/public/browser/render_view_host.h" 8 #include "content/public/browser/render_view_host.h"
10 #include "content/public/browser/render_widget_host.h" 9 #include "content/public/browser/render_widget_host.h"
11 #include "content/public/browser/render_widget_host_view.h" 10 #include "content/public/browser/render_widget_host_view.h"
12 #include "content/public/browser/web_contents.h" 11 #include "content/public/browser/web_contents.h"
13 #include "content/public/common/url_constants.h" 12 #include "content/public/common/url_constants.h"
14 #include "content/public/test/content_browser_test.h" 13 #include "content/public/test/content_browser_test.h"
15 #include "content/public/test/content_browser_test_utils.h" 14 #include "content/public/test/content_browser_test_utils.h"
16 #include "content/shell/browser/shell.h" 15 #include "content/shell/browser/shell.h"
17 #include "content/test/accessibility_browser_test_utils.h" 16 #include "content/test/accessibility_browser_test_utils.h"
18 #include "testing/gtest/include/gtest/gtest.h" 17 #include "testing/gtest/include/gtest/gtest.h"
19 18
20 namespace content { 19 namespace content {
21 20
22 const char kMinimalPageDataURL[] = 21 const char kMinimalPageDataURL[] =
23 "data:text/html,<html><head></head><body>Hello, world</body></html>"; 22 "data:text/html,<html><head></head><body>Hello, world</body></html>";
24 23
25 class AccessibilityModeTest : public ContentBrowserTest { 24 class AccessibilityModeTest : public ContentBrowserTest {
26 protected: 25 protected:
27 WebContentsImpl* web_contents() { 26 WebContents* web_contents() {
28 return static_cast<WebContentsImpl*>(shell()->web_contents()); 27 return shell()->web_contents();
28 }
29
30 RenderWidgetHostImpl* rwhi() {
31 RenderWidgetHost* rwh =
32 web_contents()->GetRenderWidgetHostView()->GetRenderWidgetHost();
33 return RenderWidgetHostImpl::From(rwh);
34 }
35
36 RenderWidgetHostViewBase* host_view() {
37 return static_cast<RenderWidgetHostViewBase*>(
38 shell()->web_contents()->GetRenderWidgetHostView());
29 } 39 }
30 40
31 void ExpectBrowserAccessibilityManager(bool expect_bam, 41 void ExpectBrowserAccessibilityManager(bool expect_bam,
32 std::string message = "") { 42 std::string message = "") {
33 if (expect_bam) { 43 if (expect_bam) {
34 EXPECT_NE( 44 EXPECT_NE((BrowserAccessibilityManager*)NULL,
35 (BrowserAccessibilityManager*)NULL, 45 host_view()->GetBrowserAccessibilityManager()) << message;
36 web_contents()->GetRootBrowserAccessibilityManager()) << message;
37 } else { 46 } else {
38 EXPECT_EQ( 47 EXPECT_EQ((BrowserAccessibilityManager*)NULL,
39 (BrowserAccessibilityManager*)NULL, 48 host_view()->GetBrowserAccessibilityManager()) << message;
40 web_contents()->GetRootBrowserAccessibilityManager()) << message;
41 } 49 }
42 } 50 }
43 }; 51 };
44 52
45 IN_PROC_BROWSER_TEST_F(AccessibilityModeTest, AccessibilityModeOff) { 53 IN_PROC_BROWSER_TEST_F(AccessibilityModeTest, AccessibilityModeOff) {
46 NavigateToURL(shell(), GURL(kMinimalPageDataURL)); 54 NavigateToURL(shell(), GURL(kMinimalPageDataURL));
47 55
48 EXPECT_EQ(AccessibilityModeOff, web_contents()->GetAccessibilityMode()); 56 EXPECT_EQ(AccessibilityModeOff, rwhi()->accessibility_mode());
49 ExpectBrowserAccessibilityManager(false); 57 ExpectBrowserAccessibilityManager(false);
50 } 58 }
51 59
52 IN_PROC_BROWSER_TEST_F(AccessibilityModeTest, AccessibilityModeComplete) { 60 IN_PROC_BROWSER_TEST_F(AccessibilityModeTest, AccessibilityModeComplete) {
53 NavigateToURL(shell(), GURL(kMinimalPageDataURL)); 61 NavigateToURL(shell(), GURL(kMinimalPageDataURL));
54 ASSERT_EQ(AccessibilityModeOff, web_contents()->GetAccessibilityMode()); 62 ASSERT_EQ(AccessibilityModeOff, rwhi()->accessibility_mode());
55 63
56 AccessibilityNotificationWaiter waiter(shell()); 64 AccessibilityNotificationWaiter waiter(shell());
57 web_contents()->AddAccessibilityMode(AccessibilityModeComplete); 65 rwhi()->AddAccessibilityMode(AccessibilityModeComplete);
58 EXPECT_EQ(AccessibilityModeComplete, web_contents()->GetAccessibilityMode()); 66 EXPECT_EQ(AccessibilityModeComplete, rwhi()->accessibility_mode());
59 waiter.WaitForNotification(); 67 waiter.WaitForNotification();
60 ExpectBrowserAccessibilityManager(true); 68 ExpectBrowserAccessibilityManager(true);
61 } 69 }
62 70
63 IN_PROC_BROWSER_TEST_F(AccessibilityModeTest, AccessibilityModeTreeOnly) { 71 IN_PROC_BROWSER_TEST_F(AccessibilityModeTest, AccessibilityModeTreeOnly) {
64 NavigateToURL(shell(), GURL(kMinimalPageDataURL)); 72 NavigateToURL(shell(), GURL(kMinimalPageDataURL));
65 ASSERT_EQ(AccessibilityModeOff, web_contents()->GetAccessibilityMode()); 73 ASSERT_EQ(AccessibilityModeOff, rwhi()->accessibility_mode());
66 74
67 AccessibilityNotificationWaiter waiter(shell()); 75 AccessibilityNotificationWaiter waiter(shell());
68 web_contents()->AddAccessibilityMode(AccessibilityModeTreeOnly); 76 rwhi()->AddAccessibilityMode(AccessibilityModeTreeOnly);
69 EXPECT_EQ(AccessibilityModeTreeOnly, web_contents()->GetAccessibilityMode()); 77 EXPECT_EQ(AccessibilityModeTreeOnly, rwhi()->accessibility_mode());
70 waiter.WaitForNotification(); 78 waiter.WaitForNotification();
71 // No BrowserAccessibilityManager expected for AccessibilityModeTreeOnly 79 // No BrowserAccessibilityManager expected for AccessibilityModeTreeOnly
72 ExpectBrowserAccessibilityManager(false); 80 ExpectBrowserAccessibilityManager(false);
73 } 81 }
74 82
75 IN_PROC_BROWSER_TEST_F(AccessibilityModeTest, AddingModes) { 83 IN_PROC_BROWSER_TEST_F(AccessibilityModeTest, AddingModes) {
76 NavigateToURL(shell(), GURL(kMinimalPageDataURL)); 84 NavigateToURL(shell(), GURL(kMinimalPageDataURL));
77 85
78 AccessibilityNotificationWaiter waiter(shell()); 86 AccessibilityNotificationWaiter waiter(shell());
79 web_contents()->AddAccessibilityMode(AccessibilityModeTreeOnly); 87 rwhi()->AddAccessibilityMode(AccessibilityModeTreeOnly);
80 EXPECT_EQ(AccessibilityModeTreeOnly, web_contents()->GetAccessibilityMode()); 88 EXPECT_EQ(AccessibilityModeTreeOnly, rwhi()->accessibility_mode());
81 waiter.WaitForNotification(); 89 waiter.WaitForNotification();
82 ExpectBrowserAccessibilityManager(false, 90 ExpectBrowserAccessibilityManager(false,
83 "Should be no BrowserAccessibilityManager " 91 "Should be no BrowserAccessibilityManager "
84 "for AccessibilityModeTreeOnly"); 92 "for AccessibilityModeTreeOnly");
85 93
86 AccessibilityNotificationWaiter waiter2(shell()); 94 AccessibilityNotificationWaiter waiter2(shell());
87 web_contents()->AddAccessibilityMode(AccessibilityModeComplete); 95 rwhi()->AddAccessibilityMode(AccessibilityModeComplete);
88 EXPECT_EQ(AccessibilityModeComplete, web_contents()->GetAccessibilityMode()); 96 EXPECT_EQ(AccessibilityModeComplete, rwhi()->accessibility_mode());
89 waiter2.WaitForNotification(); 97 waiter2.WaitForNotification();
90 ExpectBrowserAccessibilityManager(true, 98 ExpectBrowserAccessibilityManager(true,
91 "Should be a BrowserAccessibilityManager " 99 "Should be a BrowserAccessibilityManager "
92 "for AccessibilityModeComplete"); 100 "for AccessibilityModeComplete");
93 } 101 }
94 102
95 } // namespace content 103 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/accessibility/#browser_accessibility_manager.cc# ('k') | content/browser/accessibility/accessibility_mode_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698