Revert of Cross-process iframe accessibility. (patchset #19 id:360001 of https://codereview.chromium.org/268543008/)

Reason for revert:
Broke Mac tests:

http://build.chromium.org/p/chromium.mac/builders/Mac10.7%20Tests%20%281%29/builds/26131

http://build.chromium.org/p/chromium.mac/builders/Mac%2010.6%20Tests%20%28dbg%29%281%29/builds/52684

http://build.chromium.org/p/chromium.mac/builders/Mac%2010.7%20Tests%20%28dbg%29%281%29/builds/26975

http://build.chromium.org/p/chromium.mac/builders/Mac%2010.7%20Tests%20%28dbg%29%281%29/builds/26976

and so on.

Original issue's description:
> Cross-process iframe accessibility.
>
> This change completes the plumbing to join cross-process iframes into a single composed accessibility tree on platforms that implement native accessibility APIs (Windows, Mac, Android).
>
> Further work will be needed to update some accessibility API implementations to be multi-frame-aware.
>
> BUG=368298
>
> Committed: https://crrev.com/387942c041da17ea6337bc0a81e96619e67e4ac4
> Cr-Commit-Position: refs/heads/master@{#294118}

TBR=creis@chromium.org,dtseng@chromium.org,aboxhall@chromium.org,nick@chromium.org,nasko@chromium.org,dmazzoni@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=368298

Review URL: https://codereview.chromium.org/558943002

Cr-Commit-Position: refs/heads/master@{#294135}

1 files changed, 6 insertions, 17 deletions

diff --git a/content/test/accessibility_browser_test_utils.cc b/content/test/accessibility_browser_test_utils.cc
index ef43896..ae514ae 100644
--- a/content/test/accessibility_browser_test_utils.cc
+++ b/content/test/accessibility_browser_test_utils.cc
@@ -21,11 +21,12 @@
 namespace content {
 
 AccessibilityNotificationWaiter::AccessibilityNotificationWaiter(Shell* shell)
-    : event_to_wait_for_(ui::AX_EVENT_NONE),
+    : shell_(shell),
+      event_to_wait_for_(ui::AX_EVENT_NONE),
       loop_runner_(new MessageLoopRunner()),
       weak_factory_(this),
       event_target_id_(0) {
-  WebContents* web_contents = shell->web_contents();
+  WebContents* web_contents = shell_->web_contents();
   frame_host_ = static_cast<RenderFrameHostImpl*>(
       web_contents->GetMainFrame());
   frame_host_->SetAccessibilityCallbackForTesting(
@@ -37,12 +38,13 @@ AccessibilityNotificationWaiter::AccessibilityNotificationWaiter(
     Shell* shell,
     AccessibilityMode accessibility_mode,
     ui::AXEvent event_type)
-    : event_to_wait_for_(event_type),
+    : shell_(shell),
+      event_to_wait_for_(event_type),
       loop_runner_(new MessageLoopRunner()),
       weak_factory_(this),
       event_target_id_(0) {
   WebContentsImpl* web_contents = static_cast<WebContentsImpl*>(
-      shell->web_contents());
+      shell_->web_contents());
   frame_host_ = static_cast<RenderFrameHostImpl*>(
       web_contents->GetMainFrame());
   frame_host_->SetAccessibilityCallbackForTesting(
@@ -51,19 +53,6 @@ AccessibilityNotificationWaiter::AccessibilityNotificationWaiter(
   web_contents->AddAccessibilityMode(accessibility_mode);
 }
 
-AccessibilityNotificationWaiter::AccessibilityNotificationWaiter(
-    RenderFrameHostImpl* frame_host,
-    ui::AXEvent event_type)
-    : frame_host_(frame_host),
-      event_to_wait_for_(event_type),
-      loop_runner_(new MessageLoopRunner()),
-      weak_factory_(this),
-      event_target_id_(0) {
-  frame_host_->SetAccessibilityCallbackForTesting(
-      base::Bind(&AccessibilityNotificationWaiter::OnAccessibilityEvent,
-                 weak_factory_.GetWeakPtr()));
-}
-
 AccessibilityNotificationWaiter::~AccessibilityNotificationWaiter() {
 }