content/test/accessibility_browser_test_utils.cc - Issue 1552683002: Enable DumpAccessibilityTree tests to use cross-process iframes.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/test/accessibility_browser_test_utils.cc

Issue 1552683002: Enable DumpAccessibilityTree tests to use cross-process iframes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebaseline last win tests Created 4 years, 11 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

« content/browser/accessibility/dump_accessibility_browsertest_base.cc ('K') | « content/browser/accessibility/dump_accessibility_tree_browsertest.cc ('k') | content/test/data/accessibility/aria/aria-dropeffect.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/test/accessibility_browser_test_utils.cc

diff --git a/content/test/accessibility_browser_test_utils.cc b/content/test/accessibility_browser_test_utils.cc

index 6b050a013b4df206db0a706e0c29c4fca606a449..badea6353ccc16d3079325c3186601f53f427f47 100644

--- a/content/test/accessibility_browser_test_utils.cc

+++ b/content/test/accessibility_browser_test_utils.cc

@@ -83,7 +83,12 @@ void AccessibilityNotificationWaiter::WaitForNotification() {

}

const ui::AXTree& AccessibilityNotificationWaiter::GetAXTree() const {

- return *frame_host_->GetAXTreeForTesting();

+ CR_DEFINE_STATIC_LOCAL(ui::AXTree, empty_tree, ());

+ const ui::AXTree* tree = frame_host_->GetAXTreeForTesting();

+ if (tree)

+ return *tree;

+ else

sky 2016/01/05 23:23:49 nit: no else after a return (see style guide).

dmazzoni 2016/01/07 19:19:08 Done.

+ return empty_tree;

}

void AccessibilityNotificationWaiter::OnAccessibilityEvent(