Add DumpAccessibilityEvents test framework.

content/browser/accessibility/accessibility_tree_formatter.cc

Index: content/browser/accessibility/accessibility_tree_formatter.cc
diff --git a/content/browser/accessibility/accessibility_tree_formatter.cc b/content/browser/accessibility/accessibility_tree_formatter.cc
index d4c189fb6f1b3a6ff51b5e42ce63775e6e9f33c8..39956c3291ba4d8cd9f6c5ab098fe02cd110b99c 100644
--- a/content/browser/accessibility/accessibility_tree_formatter.cc
+++ b/content/browser/accessibility/accessibility_tree_formatter.cc
@@ -24,7 +24,8 @@ const char* kChildrenDictAttr = "children";
 
 AccessibilityTreeFormatter::AccessibilityTreeFormatter(
     BrowserAccessibility* root)
-    : root_(root) {
+    : root_(root),
+      show_ids_(false) {
   Initialize();
 }
 
@@ -75,12 +76,12 @@ void AccessibilityTreeFormatter::RecursiveBuildAccessibilityTree(
 
 void AccessibilityTreeFormatter::RecursiveFormatAccessibilityTree(
     const base::DictionaryValue& dict, base::string16* contents, int depth) {
-  base::string16 line =
-      ToString(dict, base::string16(depth * kIndentSpaces, ' '));
+  base::string16 indent = base::string16(depth * kIndentSpaces, ' ');
+  base::string16 line = indent + ToString(dict);
   if (line.find(base::ASCIIToUTF16(kSkipString)) != base::string16::npos)
     return;
 
-  *contents += line;
+  *contents += line + base::ASCIIToUTF16("\n");
   const base::ListValue* children;
   dict.GetList(kChildrenDictAttr, &children);
   const base::DictionaryValue* child_dict;
@@ -97,12 +98,10 @@ void AccessibilityTreeFormatter::AddProperties(const BrowserAccessibility& node,
 }
 
 base::string16 AccessibilityTreeFormatter::ToString(
-    const base::DictionaryValue& node,
-    const base::string16& indent) {
+    const base::DictionaryValue& node) {
   int id_value;
   node.GetInteger("id", &id_value);
-  return indent + base::IntToString16(id_value) +
-       base::ASCIIToUTF16("\n");
+  return base::IntToString16(id_value);
 }
 
 void AccessibilityTreeFormatter::Initialize() {}
@@ -140,11 +139,14 @@ void AccessibilityTreeFormatter::SetFilters(
   filters_ = filters;
 }
 
+// static
 bool AccessibilityTreeFormatter::MatchesFilters(
-    const base::string16& text, bool default_result) const {
-  std::vector<Filter>::const_iterator iter = filters_.begin();
+    const std::vector<Filter>& filters,
+    const base::string16& text,
+    bool default_result) {
+  std::vector<Filter>::const_iterator iter = filters.begin();
   bool allow = default_result;
-  for (iter = filters_.begin(); iter != filters_.end(); ++iter) {
+  for (iter = filters.begin(); iter != filters.end(); ++iter) {
     if (MatchPattern(text, iter->match_str)) {
       if (iter->type == Filter::ALLOW_EMPTY)
         allow = true;
@@ -157,6 +159,11 @@ bool AccessibilityTreeFormatter::MatchesFilters(
   return allow;
 }
 
+bool AccessibilityTreeFormatter::MatchesFilters(
+    const base::string16& text, bool default_result) const {
+  return MatchesFilters(filters_, text, default_result);
+}
+
 base::string16 AccessibilityTreeFormatter::FormatCoordinates(
     const char* name, const char* x_name, const char* y_name,
     const base::DictionaryValue& value) {