Revert "content: convert accessibility notifications to callbacks"

content/browser/accessibility/dump_accessibility_tree_browsertest.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 <set>
 #include <string>
 #include <vector>
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "content/browser/accessibility/browser_accessibility.h"
 #include "content/browser/accessibility/browser_accessibility_manager.h"
 #include "content/browser/accessibility/dump_accessibility_tree_helper.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/port/browser/render_widget_host_view_port.h"
+#include "content/public/browser/notification_service.h"
+#include "content/public/browser/notification_types.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_paths.h"
 #include "content/public/test/test_utils.h"
 #include "content/test/content_browser_test.h"
 #include "content/test/content_browser_test_utils.h"
 #include "content/shell/shell.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+namespace {
+  static const char kCommentToken = '#';
+  static const char* kMarkSkipFile = "#<skip";
+  static const char* kMarkEndOfFile = "<-- End-of-file -->";
+  static const char* kSignalDiff = "*";
+} // namespace
+
 namespace content {
 
-namespace {
-
-const char kCommentToken = '#';
-const char kMarkSkipFile[] = "#<skip";
-const char kMarkEndOfFile[] = "<-- End-of-file -->";
-const char kSignalDiff[] = "*";
-
-}  // namespace
-
 typedef DumpAccessibilityTreeHelper::Filter Filter;
 
 // This test takes a snapshot of the platform BrowserAccessibility tree and
 // tests it against an expected baseline.
 //
 // The flow of the test is as outlined below.
 // 1. Load an html file from chrome/test/data/accessibility.
 // 2. Read the expectation.
 // 3. Browse to the page and serialize the platform specific tree into a human
 //    readable string.
@@ skipping 109 matching lines @@
   // normalize by deleting all \r from the file (if any) to leave only \n.
   std::string expected_contents;
   RemoveChars(expected_contents_raw, "\r", &expected_contents);
 
   if (!expected_contents.compare(0, strlen(kMarkSkipFile), kMarkSkipFile)) {
     printf("Skipping this test on this platform.\n");
     return;
   }
 
   // Load the page.
+  WindowedNotificationObserver tree_updated_observer(
+      NOTIFICATION_ACCESSIBILITY_LOAD_COMPLETE,
+      NotificationService::AllSources());
   string16 html_contents16;
   html_contents16 = UTF8ToUTF16(html_contents);
   GURL url = GetTestUrl("accessibility",
                         html_file.BaseName().MaybeAsASCII().c_str());
-  scoped_refptr<MessageLoopRunner> loop_runner(new MessageLoopRunner);
-  view_host->SetAccessibilityLoadCompleteCallbackForTesting(
-      loop_runner->QuitClosure());
   NavigateToURL(shell(), url);
 
   // Wait for the tree.
-  loop_runner->Run();
+  tree_updated_observer.Wait();
 
   // Perform a diff (or write the initial baseline).
   string16 actual_contents_utf16;
   helper_.DumpAccessibilityTree(
       host_view->GetBrowserAccessibilityManager()->GetRoot(),
       &actual_contents_utf16);
   std::string actual_contents = UTF16ToUTF8(actual_contents_utf16);
   std::vector<std::string> actual_lines, expected_lines;
   Tokenize(actual_contents, "\n", &actual_lines);
   Tokenize(expected_contents, "\n", &expected_lines);
@@ skipping 246 matching lines @@
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityUl) {
   RunTest(FILE_PATH_LITERAL("ul.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityWbr) {
   RunTest(FILE_PATH_LITERAL("wbr.html"));
 }
 
 }  // namespace content