Revert of Cross-process iframe accessibility.

content/test/accessibility_browser_test_utils.cc

 // Copyright 2013 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 "content/test/accessibility_browser_test_utils.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/view_message_enums.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/test/test_utils.h"
 #include "content/shell/browser/shell.h"
 #include "ui/accessibility/ax_node.h"
 
 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(
       base::Bind(&AccessibilityNotificationWaiter::OnAccessibilityEvent,
                  weak_factory_.GetWeakPtr()));
 }
 
 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(
       base::Bind(&AccessibilityNotificationWaiter::OnAccessibilityEvent,
                  weak_factory_.GetWeakPtr()));
   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() {
 }
 
 void AccessibilityNotificationWaiter::WaitForNotification() {
   loop_runner_->Run();
 
   // Each loop runner can only be called once. Create a new one in case
   // the caller wants to call this again to wait for the next notification.
   loop_runner_ = new MessageLoopRunner();
 }
@@ skipping 19 matching lines @@
   for (size_t i = 0; i < root.string_attributes.size(); ++i) {
     if (root.string_attributes[i].first != ui::AX_ATTR_DOC_URL)
       continue;
     const std::string& doc_url = root.string_attributes[i].second;
     return doc_url == url::kAboutBlankURL;
   }
   return false;
 }
 
 }  // namespace content