Revert of Add DumpAccessibilityEvents test framework.

content/browser/accessibility/accessibility_tree_formatter_mac.mm

 // Copyright (c) 2012 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"
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
 #include "base/json/json_writer.h"
-#include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/accessibility/browser_accessibility_cocoa.h"
 #include "content/browser/accessibility/browser_accessibility_mac.h"
 #include "content/browser/accessibility/browser_accessibility_manager.h"
 
 using base::StringPrintf;
 using base::SysNSStringToUTF8;
 using base::SysNSStringToUTF16;
@@ skipping 161 matching lines @@
 }
 
 }  // namespace
 
 void AccessibilityTreeFormatter::Initialize() {
 }
 
 
 void AccessibilityTreeFormatter::AddProperties(const BrowserAccessibility& node,
                                                base::DictionaryValue* dict) {
-  dict->SetInteger("id", node.GetId());
   BrowserAccessibilityCocoa* cocoa_node =
       const_cast<BrowserAccessibility*>(&node)->ToBrowserAccessibilityCocoa();
   NSArray* supportedAttributes = [cocoa_node accessibilityAttributeNames];
 
   string role = SysNSStringToUTF8(
       [cocoa_node accessibilityAttributeValue:NSAccessibilityRoleAttribute]);
   dict->SetString(SysNSStringToUTF8(NSAccessibilityRoleAttribute), role);
 
   NSString* subrole =
       [cocoa_node accessibilityAttributeValue:NSAccessibilitySubroleAttribute];
@@ skipping 11 matching lines @@
       dict->Set(
           SysNSStringToUTF8(requestedAttribute),
           PopulateObject(value).release());
     }
   }
   dict->Set(kPositionDictAttr, PopulatePosition(node).release());
   dict->Set(kSizeDictAttr, PopulateSize(cocoa_node).release());
 }
 
 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);
-  }
-
   NSArray* defaultAttributes =
       [NSArray arrayWithObjects:NSAccessibilityTitleAttribute,
                                 NSAccessibilityValueAttribute,
                                 nil];
   string s_value;
   dict.GetString(SysNSStringToUTF8(NSAccessibilityRoleAttribute), &s_value);
   WriteAttribute(true, base::UTF8ToUTF16(s_value), &line);
 
   string subroleAttribute = SysNSStringToUTF8(NSAccessibilitySubroleAttribute);
   if (dict.GetString(subroleAttribute, &s_value)) {
@@ skipping 34 matching lines @@
                                      *d_value),
                    &line);
   }
   if (dict.GetDictionary(kSizeDictAttr, &d_value)) {
     WriteAttribute(false,
                    FormatCoordinates(kSizeDictAttr,
                                      kWidthDictAttr, kHeightDictAttr, *d_value),
                    &line);
   }
 
-  return line;
+  return indent + line + base::ASCIIToUTF16("\n");
 }
 
 // static
 const base::FilePath::StringType
 AccessibilityTreeFormatter::GetActualFileSuffix() {
   return FILE_PATH_LITERAL("-actual-mac.txt");
 }
 
 // static
 const base::FilePath::StringType
@@ skipping 10 matching lines @@
 const string AccessibilityTreeFormatter::GetAllowString() {
   return "@MAC-ALLOW:";
 }
 
 // static
 const string AccessibilityTreeFormatter::GetDenyString() {
   return "@MAC-DENY:";
 }
 
 }  // namespace content