Revert "content: convert accessibility notifications to callbacks"

content/browser/renderer_host/render_view_host_impl.cc

 // Copyright (c) 2012 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/browser/renderer_host/render_view_host_impl.h"
 
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 1768 matching lines @@
   // This should only be called when swapped out.
   DCHECK(is_swapped_out_);
 
   frame_tree_ = frame_tree;
   Send(new ViewMsg_UpdateFrameTree(GetRoutingID(),
                                    process_id,
                                    route_id,
                                    frame_tree_));
 }
 
-void RenderViewHostImpl::SetAccessibilityLayoutCompleteCallbackForTesting(
-    const base::Closure& callback) {
-  accessibility_layout_callback_ = callback;
-}
-
-void RenderViewHostImpl::SetAccessibilityLoadCompleteCallbackForTesting(
-    const base::Closure& callback) {
-  accessibility_load_callback_ = callback;
-}
-
 void RenderViewHostImpl::UpdateWebkitPreferences(
     const webkit_glue::WebPreferences& prefs) {
   Send(new ViewMsg_UpdateWebPreferences(GetRoutingID(), prefs));
 }
 
 void RenderViewHostImpl::NotifyTimezoneChange() {
   Send(new ViewMsg_TimezoneChange(GetRoutingID()));
 }
 
 void RenderViewHostImpl::ClearFocusedNode() {
@@ skipping 86 matching lines @@
   for (unsigned i = 0; i < params.size(); i++) {
     const AccessibilityHostMsg_NotificationParams& param = params[i];
     AccessibilityNotification src_type = param.notification_type;
 
     if ((src_type == AccessibilityNotificationLayoutComplete ||
          src_type == AccessibilityNotificationLoadComplete) &&
         save_accessibility_tree_for_testing_) {
       accessibility_tree_ = param.acc_tree;
     }
 
-    if (src_type == AccessibilityNotificationLayoutComplete) {
-      accessibility_layout_callback_.Run();
-    } else if (src_type == AccessibilityNotificationLoadComplete) {
-      accessibility_load_callback_.Run();
-    }
+    NotificationType dst_type;
+    if (src_type == AccessibilityNotificationLoadComplete)
+      dst_type = NOTIFICATION_ACCESSIBILITY_LOAD_COMPLETE;
+    else if (src_type == AccessibilityNotificationLayoutComplete)
+      dst_type = NOTIFICATION_ACCESSIBILITY_LAYOUT_COMPLETE;
+    else
+      dst_type = NOTIFICATION_ACCESSIBILITY_OTHER;
+    NotificationService::current()->Notify(
+          dst_type,
+          Source<RenderViewHost>(this),
+          NotificationService::NoDetails());
   }
 
   Send(new AccessibilityMsg_Notifications_ACK(GetRoutingID()));
 }
 
 void RenderViewHostImpl::OnScriptEvalResponse(int id,
                                               const base::ListValue& result) {
   const base::Value* result_value;
   if (!result.Get(0, &result_value)) {
     // Programming error or rogue renderer.
@@ skipping 155 matching lines @@
           GetRoutingID(), snapshot_id, snapshot_size, png));
       return;
     }
   }
 
   Send(new ViewMsg_WindowSnapshotCompleted(
       GetRoutingID(), snapshot_id, gfx::Size(), png));
 }
 
 }  // namespace content