Revert of Add DumpAccessibilityEvents test framework.

content/browser/accessibility/accessibility_tree_formatter_android.cc

 // Copyright 2013 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/accessibility_tree_formatter.h"
 
 #include <string>
 
 #include "base/android/jni_android.h"
 #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"
 #include "content/browser/accessibility/browser_accessibility_android.h"
 
 using base::StringPrintf;
 
 namespace content {
 
 namespace {
@@ skipping 38 matching lines @@
   "range_max",
   "range_current_value",
 };
 }
 
 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);
 
   // Class name.
   dict->SetString("class", android_node->GetClassName());
 
   // Bool attributes.
   dict->SetBoolean("checkable", android_node->IsCheckable());
   dict->SetBoolean("checked", android_node->IsChecked());
   dict->SetBoolean("clickable", android_node->IsClickable());
@@ skipping 27 matching lines @@
   dict->SetInteger("column_span", android_node->ColumnSpan());
   dict->SetInteger("input_type", android_node->AndroidInputType());
   dict->SetInteger("live_region_type", android_node->AndroidLiveRegionType());
   dict->SetInteger("range_min", static_cast<int>(android_node->RangeMin()));
   dict->SetInteger("range_max", static_cast<int>(android_node->RangeMax()));
   dict->SetInteger("range_current_value",
                    static_cast<int>(android_node->RangeCurrentValue()));
 }
 
 base::string16 AccessibilityTreeFormatter::ToString(
-    const base::DictionaryValue& dict) {
+    const base::DictionaryValue& dict,
+    const base::string16& indent) {
   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);
 
   for (unsigned i = 0; i < arraysize(BOOL_ATTRIBUTES); i++) {
     const char* attribute_name = BOOL_ATTRIBUTES[i];
     bool value;
     if (dict.GetBoolean(attribute_name, &value) && value)
       WriteAttribute(true, attribute_name, &line);
   }
@@ skipping 11 matching lines @@
   for (unsigned i = 0; i < arraysize(INT_ATTRIBUTES); i++) {
     const char* attribute_name = INT_ATTRIBUTES[i];
     int value;
     if (!dict.GetInteger(attribute_name, &value) || value == 0)
       continue;
     WriteAttribute(true,
                    StringPrintf("%s=%d", attribute_name, value),
                    &line);
   }
 
-  return line;
+  return indent + line + base::ASCIIToUTF16("\n");
 }
 
 // static
 const base::FilePath::StringType
 AccessibilityTreeFormatter::GetActualFileSuffix() {
   return FILE_PATH_LITERAL("-actual-android.txt");
 }
 
 // static
 const base::FilePath::StringType
@@ skipping 10 matching lines @@
 const std::string AccessibilityTreeFormatter::GetAllowString() {
   return "@ANDROID-ALLOW:";
 }
 
 // static
 const std::string AccessibilityTreeFormatter::GetDenyString() {
   return "@ANDROID-DENY:";
 }
 
 }  // namespace content