OLD | NEW |
1 // Copyright (c) 2014 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 <stddef.h> | 5 #include <stddef.h> |
6 | 6 |
7 #include "base/macros.h" | 7 #include "base/macros.h" |
8 #include "build/build_config.h" | 8 #include "build/build_config.h" |
9 #include "content/browser/frame_host/render_frame_host_impl.h" | 9 #include "content/browser/frame_host/render_frame_host_impl.h" |
10 #include "content/browser/web_contents/web_contents_impl.h" | 10 #include "content/browser/web_contents/web_contents_impl.h" |
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
115 const ui::AXNode* root = tree->root(); | 115 const ui::AXNode* root = tree->root(); |
116 | 116 |
117 // Use this for debugging if the test fails. | 117 // Use this for debugging if the test fails. |
118 VLOG(1) << tree->ToString(); | 118 VLOG(1) << tree->ToString(); |
119 | 119 |
120 EXPECT_EQ(ui::AX_ROLE_ROOT_WEB_AREA, root->data().role); | 120 EXPECT_EQ(ui::AX_ROLE_ROOT_WEB_AREA, root->data().role); |
121 ASSERT_EQ(2, root->child_count()); | 121 ASSERT_EQ(2, root->child_count()); |
122 | 122 |
123 const ui::AXNode* live_region = root->ChildAtIndex(0); | 123 const ui::AXNode* live_region = root->ChildAtIndex(0); |
124 ASSERT_EQ(1, live_region->child_count()); | 124 ASSERT_EQ(1, live_region->child_count()); |
125 EXPECT_EQ(ui::AX_ROLE_DIV, live_region->data().role); | 125 EXPECT_EQ(ui::AX_ROLE_GENERIC_CONTAINER, live_region->data().role); |
126 | 126 |
127 const ui::AXNode* para = live_region->ChildAtIndex(0); | 127 const ui::AXNode* para = live_region->ChildAtIndex(0); |
128 EXPECT_EQ(ui::AX_ROLE_PARAGRAPH, para->data().role); | 128 EXPECT_EQ(ui::AX_ROLE_PARAGRAPH, para->data().role); |
129 | 129 |
130 const ui::AXNode* button = root->ChildAtIndex(1); | 130 const ui::AXNode* button = root->ChildAtIndex(1); |
131 EXPECT_EQ(ui::AX_ROLE_BUTTON, button->data().role); | 131 EXPECT_EQ(ui::AX_ROLE_BUTTON, button->data().role); |
132 } | 132 } |
133 | 133 |
134 #if defined(OS_ANDROID) | 134 #if defined(OS_ANDROID) |
135 // http://crbug.com/542704 | 135 // http://crbug.com/542704 |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
190 // Wait for the renderer to be killed. | 190 // Wait for the renderer to be killed. |
191 if (frame->IsRenderFrameLive()) { | 191 if (frame->IsRenderFrameLive()) { |
192 RenderProcessHostWatcher render_process_watcher( | 192 RenderProcessHostWatcher render_process_watcher( |
193 frame->GetProcess(), RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT); | 193 frame->GetProcess(), RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT); |
194 render_process_watcher.Wait(); | 194 render_process_watcher.Wait(); |
195 } | 195 } |
196 ASSERT_FALSE(frame->IsRenderFrameLive()); | 196 ASSERT_FALSE(frame->IsRenderFrameLive()); |
197 } | 197 } |
198 | 198 |
199 } // namespace content | 199 } // namespace content |
OLD | NEW |