Enable DumpAccessibilityTree tests to use cross-process iframes.

content/browser/accessibility/dump_accessibility_browsertest_base.h

 // 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 <string>
 #include <vector>
 
 #include "base/debug/leak_annotations.h"
 #include "base/strings/string16.h"
 #include "build/build_config.h"
 #include "content/browser/accessibility/accessibility_tree_formatter.h"
+#include "content/browser/site_per_process_browsertest.h"
 #include "content/public/test/content_browser_test.h"
 
 namespace content {
 
 // Base class for an accessibility browsertest that takes an HTML file as
 // input, loads it into a tab, dumps some accessibility data in text format,
 // then compares that text to an expectation file in the same directory.
 //
 // The system was inspired by WebKit/Blink LayoutTests, but customized for
 // testing accessibility in Chromium.
-class DumpAccessibilityTestBase : public ContentBrowserTest {
+class DumpAccessibilityTestBase : public SitePerProcessBrowserTest {

[nasko, 2016/01/07 00:07:37]

nit: It seems that this tests uses only the setup of the test class. It might be
easier to just copy those over.

[dmazzoni, 2016/01/07 19:19:08]

Done.

  public:
   DumpAccessibilityTestBase();
   ~DumpAccessibilityTestBase() override;
 
   // Given a path to an HTML file relative to the test directory,
   // loads the HTML, loads the accessibility tree, calls Dump(), then
   // compares the output to the expected result and has the test succeed
   // or fail based on the diff.
   void RunTest(const base::FilePath file_path, const char* file_dir);
 
@@ skipping 39 matching lines @@
   // filter specifies strings that should be suppressed. As an example,
   // @MAC-ALLOW:AXSubrole=* means that the AXSubrole attribute should be
   // printed, while @MAC-ALLOW:AXSubrole=AXList* means that any subrole
   // beginning with the text "AXList" should be printed.
   //
   // The @WAIT-FOR:text directive allows the test to specify that the document
   // may dynamically change after initial load, and the test is to wait
   // until the given string (e.g., "text") appears in the resulting dump.
   // A test can make some changes to the document, then append a magic string
   // indicating that the test is done, and this framework will wait for that
-  // string to appear before comparing the results.
+  // string to appear before comparing the results. There can be multiple
+  // @WAIT-FOR: directives.
   void ParseHtmlForExtraDirectives(
       const std::string& test_html,
       std::vector<AccessibilityTreeFormatter::Filter>* filters,
-      std::string* wait_for);
+      std::vector<std::string>* wait_for);
 
   // Create the right AccessibilityTreeFormatter subclass.
   AccessibilityTreeFormatter* CreateAccessibilityTreeFormatter();
 
   void RunTestForPlatform(const base::FilePath file_path, const char* file_dir);
 
   // The default filters plus the filters loaded from the test file.
   std::vector<AccessibilityTreeFormatter::Filter> filters_;
 
 #if defined(LEAK_SANITIZER) && !defined(OS_NACL)
   // http://crbug.com/568674
   ScopedLeakSanitizerDisabler lsan_disabler;
 #endif
 
   // The current AccessibilityTreeFormatter.
   scoped_ptr<AccessibilityTreeFormatter> formatter_;
 
   // Whether we're doing a native pass or internal/blink tree pass.
   bool is_blink_pass_;
 };
 
 }  // namespace content