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

Unified Diff: content/browser/accessibility/site_per_process_accessibility_browsertest.cc

Issue 558943002: Revert of Cross-process iframe accessibility. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 3 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/browser/accessibility/site_per_process_accessibility_browsertest.cc
diff --git a/content/browser/accessibility/site_per_process_accessibility_browsertest.cc b/content/browser/accessibility/site_per_process_accessibility_browsertest.cc
deleted file mode 100644
index 2e6533ebb5f37ac2278aae36b249b3b63b87dd34..0000000000000000000000000000000000000000
--- a/content/browser/accessibility/site_per_process_accessibility_browsertest.cc
+++ /dev/null
@@ -1,144 +0,0 @@
-// Copyright (c) 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "base/command_line.h"
-#include "base/strings/stringprintf.h"
-#include "content/browser/accessibility/browser_accessibility.h"
-#include "content/browser/accessibility/browser_accessibility_manager.h"
-#include "content/browser/accessibility/browser_accessibility_state_impl.h"
-#include "content/browser/frame_host/cross_process_frame_connector.h"
-#include "content/browser/frame_host/frame_tree.h"
-#include "content/browser/frame_host/render_frame_proxy_host.h"
-#include "content/browser/frame_host/render_widget_host_view_child_frame.h"
-#include "content/browser/renderer_host/render_view_host_impl.h"
-#include "content/browser/site_per_process_browsertest.h"
-#include "content/browser/web_contents/web_contents_impl.h"
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_service.h"
-#include "content/public/browser/notification_types.h"
-#include "content/public/browser/web_contents_observer.h"
-#include "content/public/common/content_switches.h"
-#include "content/public/test/browser_test_utils.h"
-#include "content/public/test/content_browser_test.h"
-#include "content/public/test/content_browser_test_utils.h"
-#include "content/public/test/test_utils.h"
-#include "content/shell/browser/shell.h"
-#include "content/test/accessibility_browser_test_utils.h"
-#include "content/test/content_browser_test_utils_internal.h"
-#include "net/dns/mock_host_resolver.h"
-#include "url/gurl.h"
-
-namespace content {
-
-class SitePerProcessAccessibilityBrowserTest
- : public SitePerProcessBrowserTest {
- public:
- SitePerProcessAccessibilityBrowserTest() {}
-};
-
-#if defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-#define MAYBE_CrossSiteIframeAccessibility CrossSiteIframeAccessibility
-#else
-#define MAYBE_CrossSiteIframeAccessibility DISABLED_CrossSiteIframeAccessibility
-#endif
-
-IN_PROC_BROWSER_TEST_F(SitePerProcessAccessibilityBrowserTest,
- MAYBE_CrossSiteIframeAccessibility) {
- // Enable full accessibility for all current and future WebContents.
- BrowserAccessibilityState::GetInstance()->EnableAccessibility();
-
- AccessibilityNotificationWaiter main_frame_accessibility_waiter(
- shell(), AccessibilityModeComplete,
- ui::AX_EVENT_LOAD_COMPLETE);
-
- host_resolver()->AddRule("*", "127.0.0.1");
- ASSERT_TRUE(test_server()->Start());
- GURL main_url(test_server()->GetURL("files/site_per_process_main.html"));
- NavigateToURL(shell(), main_url);
-
- // It is safe to obtain the root frame tree node here, as it doesn't change.
- FrameTreeNode* root =
- static_cast<WebContentsImpl*>(shell()->web_contents())->
- GetFrameTree()->root();
-
- // Load same-site page into iframe.
- FrameTreeNode* child = root->child_at(0);
- GURL http_url(test_server()->GetURL("files/title1.html"));
- NavigateFrameToURL(child, http_url);
-
- // These must stay in scope with replace_host.
- GURL::Replacements replace_host;
- std::string foo_com("foo.com");
-
- // Load cross-site page into iframe.
- GURL cross_site_url(test_server()->GetURL("files/title2.html"));
- replace_host.SetHostStr(foo_com);
- cross_site_url = cross_site_url.ReplaceComponents(replace_host);
- NavigateFrameToURL(root->child_at(0), cross_site_url);
-
- // Ensure that we have created a new process for the subframe.
- ASSERT_EQ(1U, root->child_count());
- SiteInstance* site_instance = child->current_frame_host()->GetSiteInstance();
- EXPECT_NE(shell()->web_contents()->GetSiteInstance(), site_instance);
-
- // Wait until the accessibility tree from both the main frame and
- // cross-process iframe load.
- RenderFrameHostImpl* child_frame = static_cast<RenderFrameHostImpl*>(
- child->current_frame_host());
- AccessibilityNotificationWaiter child_frame_accessibility_waiter(
- child_frame, ui::AX_EVENT_NONE);
- main_frame_accessibility_waiter.WaitForNotification();
- child_frame_accessibility_waiter.WaitForNotification();
-
- RenderFrameHostImpl* main_frame = static_cast<RenderFrameHostImpl*>(
- shell()->web_contents()->GetMainFrame());
- BrowserAccessibilityManager* main_frame_manager =
- main_frame->browser_accessibility_manager();
- VLOG(1) << "Main frame accessibility tree:\n"
- << main_frame_manager->SnapshotAXTreeForTesting().ToString();
-
- BrowserAccessibilityManager* child_frame_manager =
- child_frame->browser_accessibility_manager();
- VLOG(1) << "Child frame accessibility tree:\n"
- << child_frame_manager->SnapshotAXTreeForTesting().ToString();
-
- // Assert that we can walk from the main frame down into the child frame
- // directly, getting correct roles and data along the way.
- BrowserAccessibility* ax_root = main_frame_manager->GetRoot();
- ASSERT_EQ(ui::AX_ROLE_ROOT_WEB_AREA, ax_root->GetRole());
- ASSERT_EQ(1U, ax_root->PlatformChildCount());
-
- BrowserAccessibility* ax_group = ax_root->PlatformGetChild(0);
- ASSERT_EQ(ui::AX_ROLE_GROUP, ax_group->GetRole());
- ASSERT_EQ(1U, ax_group->PlatformChildCount());
-
- BrowserAccessibility* ax_iframe = ax_group->PlatformGetChild(0);
- ASSERT_EQ(ui::AX_ROLE_IFRAME, ax_iframe->GetRole());
- ASSERT_EQ(1U, ax_iframe->PlatformChildCount());
-
- BrowserAccessibility* ax_scroll_area = ax_iframe->PlatformGetChild(0);
- ASSERT_EQ(ui::AX_ROLE_SCROLL_AREA, ax_scroll_area->GetRole());
- ASSERT_EQ(1U, ax_scroll_area->PlatformChildCount());
-
- BrowserAccessibility* ax_child_frame_root =
- ax_scroll_area->PlatformGetChild(0);
- ASSERT_EQ(ui::AX_ROLE_ROOT_WEB_AREA, ax_child_frame_root->GetRole());
- ASSERT_EQ(1U, ax_child_frame_root->PlatformChildCount());
- ASSERT_EQ("Title Of Awesomeness", ax_child_frame_root->name());
-
- BrowserAccessibility* ax_child_frame_group =
- ax_child_frame_root->PlatformGetChild(0);
- ASSERT_EQ(ui::AX_ROLE_GROUP, ax_child_frame_group->GetRole());
- ASSERT_EQ(1U, ax_child_frame_group->PlatformChildCount());
-
- BrowserAccessibility* ax_child_frame_static_text =
- ax_child_frame_group->PlatformGetChild(0);
- ASSERT_EQ(ui::AX_ROLE_STATIC_TEXT, ax_child_frame_static_text->GetRole());
- ASSERT_EQ(0U, ax_child_frame_static_text->PlatformChildCount());
-
- // Last, check that the parent of the child frame root is correct.
- ASSERT_EQ(ax_child_frame_root->GetParent(), ax_scroll_area);
-}
-
-} // namespace content
« no previous file with comments | « content/browser/accessibility/browser_accessibility_manager_unittest.cc ('k') | content/browser/frame_host/frame_tree.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698