Add DumpAccessibilityEvents test framework.

content/browser/accessibility/accessibility_tree_formatter_android.cc

Index: content/browser/accessibility/accessibility_tree_formatter_android.cc
diff --git a/content/browser/accessibility/accessibility_tree_formatter_android.cc b/content/browser/accessibility/accessibility_tree_formatter_android.cc
index 65f8fa3d0fa687948884c77c02ecd9b8614e0300..32e74285dbacb2bd359a4154068a7ed7ecb9a763 100644
--- a/content/browser/accessibility/accessibility_tree_formatter_android.cc
+++ b/content/browser/accessibility/accessibility_tree_formatter_android.cc
@@ -10,6 +10,7 @@
 #include "base/android/jni_string.h"
 #include "base/files/file_path.h"
 #include "base/json/json_writer.h"
+#include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
@@ -68,6 +69,8 @@ void AccessibilityTreeFormatter::Initialize() {
 
 void AccessibilityTreeFormatter::AddProperties(
     const BrowserAccessibility& node, base::DictionaryValue* dict) {
+  dict->SetInteger("id", node.GetId());
+
   const BrowserAccessibilityAndroid* android_node =
       static_cast<const BrowserAccessibilityAndroid*>(&node);
 
@@ -115,10 +118,15 @@ void AccessibilityTreeFormatter::AddProperties(
 }
 
 base::string16 AccessibilityTreeFormatter::ToString(
-    const base::DictionaryValue& dict,
-    const base::string16& indent) {
+    const base::DictionaryValue& dict) {
   base::string16 line;
 
+  if (show_ids_) {
+    int id_value;
+    dict.GetInteger("id", &id_value);
+    WriteAttribute(true, base::IntToString16(id_value), &line);
+  }
+
   base::string16 class_value;
   dict.GetString("class", &class_value);
   WriteAttribute(true, base::UTF16ToUTF8(class_value), &line);
@@ -150,7 +158,7 @@ base::string16 AccessibilityTreeFormatter::ToString(
                    &line);
   }
 
-  return indent + line + base::ASCIIToUTF16("\n");
+  return line;
 }
 
 // static