Re-land (2): Fix loading accessibility tree for child frame that's already loaded.

content/browser/accessibility/dump_accessibility_browsertest_base.cc

 // Copyright 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 "content/browser/accessibility/dump_accessibility_browsertest_base.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
@@ skipping 54 matching lines @@
       return true;
     }
   }
   return false;
 }
 
 }  // namespace
 
 typedef AccessibilityTreeFormatter::Filter Filter;
 
-DumpAccessibilityTestBase::DumpAccessibilityTestBase() {
+DumpAccessibilityTestBase::DumpAccessibilityTestBase()
+    : is_blink_pass_(false),
+      enable_accessibility_after_navigating_(false) {
 }
 
 DumpAccessibilityTestBase::~DumpAccessibilityTestBase() {
 }
 
 void DumpAccessibilityTestBase::SetUpCommandLine(
     base::CommandLine* command_line) {
   IsolateAllSitesForTesting(command_line);
 }
 
@@ skipping 149 matching lines @@
   if (!expected_contents.compare(0, strlen(kMarkSkipFile), kMarkSkipFile)) {
     LOG(INFO) << "Skipping this test on this platform.";
     return;
   }
 
   // Parse filters and other directives in the test file.
   std::vector<std::string> wait_for;
   AddDefaultFilters(&filters_);
   ParseHtmlForExtraDirectives(html_contents, &filters_, &wait_for);
 
-  // Load the test html and wait for the "load complete" AX event.
+  // Get the test URL.
   GURL url(embedded_test_server()->GetURL(
       "/" + std::string(file_dir) + "/" + file_path.BaseName().MaybeAsASCII()));
-  AccessibilityNotificationWaiter accessibility_waiter(
-      shell()->web_contents(),
-      AccessibilityModeComplete,
-      ui::AX_EVENT_LOAD_COMPLETE);
-  NavigateToURL(shell(), url);
-  accessibility_waiter.WaitForNotification();
+  WebContentsImpl* web_contents = static_cast<WebContentsImpl*>(
+      shell()->web_contents());
+
+  if (enable_accessibility_after_navigating_ &&
+      web_contents->GetAccessibilityMode() == AccessibilityModeOff) {
+    // Load the url, then enable accessibility.
+    NavigateToURL(shell(), url);
+    AccessibilityNotificationWaiter accessibility_waiter(
+        web_contents,
+        AccessibilityModeComplete,
+        ui::AX_EVENT_NONE);
+    accessibility_waiter.WaitForNotification();
+  } else {
+    // Enable accessibility, then load the test html and wait for the
+    // "load complete" AX event.
+    AccessibilityNotificationWaiter accessibility_waiter(
+        web_contents,
+        AccessibilityModeComplete,
+        ui::AX_EVENT_LOAD_COMPLETE);
+    NavigateToURL(shell(), url);
+    accessibility_waiter.WaitForNotification();
+  }
 
   // Get the url of every frame in the frame tree.
-  WebContentsImpl* web_contents = static_cast<WebContentsImpl*>(
-      shell()->web_contents());
   FrameTree* frame_tree = web_contents->GetFrameTree();
   std::vector<std::string> all_frame_urls;
   for (FrameTreeNode* node : frame_tree->Nodes()) {
     // Ignore about:blank urls because of the case where a parent frame A
     // has a child iframe B and it writes to the document using
     // contentDocument.open() on the child frame B.
     //
     // In this scenario, B's contentWindow.location.href matches A's url,
     // but B's url in the browser frame tree is still "about:blank".
     std::string url = node->current_url().spec();
@@ skipping 108 matching lines @@
           expected_file, actual_contents.c_str(), actual_contents.size()));
       LOG(INFO) << "Wrote expectations to: "
                 << expected_file.LossyDisplayName();
     }
   } else {
     LOG(INFO) << "Test output matches expectations.";
   }
 }
 
 }  // namespace content