Revert of Add DumpAccessibilityEvents test framework.

content/browser/accessibility/accessibility_tree_formatter_win.cc

 // 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"
 
 #include <oleacc.h>
 
 #include <string>
 
 #include "base/files/file_path.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/accessibility_tree_formatter_utils_win.h"
 #include "content/browser/accessibility/browser_accessibility_manager.h"
 #include "content/browser/accessibility/browser_accessibility_win.h"
 #include "third_party/iaccessible2/ia2_api_all.h"
 #include "ui/base/win/atl_module.h"
 
 using base::StringPrintf;
@@ skipping 29 matching lines @@
     "selection_start",
     "selection_end"
 };
 
 void AccessibilityTreeFormatter::Initialize() {
   ui::win::CreateATLModuleIfNeeded();
 }
 
 void AccessibilityTreeFormatter::AddProperties(
     const BrowserAccessibility& node, base::DictionaryValue* dict) {
-  dict->SetInteger("id", node.GetId());
   BrowserAccessibilityWin* acc_obj =
       const_cast<BrowserAccessibility*>(&node)->ToBrowserAccessibilityWin();
 
   VARIANT variant_self;
   variant_self.vt = VT_I4;
   variant_self.lVal = CHILDID_SELF;
 
   dict->SetString("role", IAccessible2RoleToString(acc_obj->ia2_role()));
 
   CComBSTR msaa_variant;
@@ skipping 121 matching lines @@
       LONG start, end;
       if (acc_obj->get_selection(0, &start, &end) == S_OK) {
         dict->SetInteger("selection_start", start);
         dict->SetInteger("selection_end", end);
       }
     }
   }
 }
 
 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 role_value;
   dict.GetString("role", &role_value);
   WriteAttribute(true, base::UTF16ToUTF8(role_value), &line);
 
   for (int i = 0; i < arraysize(ALL_ATTRIBUTES); i++) {
     const char* attribute_name = ALL_ATTRIBUTES[i];
     const base::Value* value;
     if (!dict.Get(attribute_name, &value))
       continue;
 
@@ skipping 60 matching lines @@
                          &line);
         }
         break;
       }
       default:
         NOTREACHED();
         break;
     }
   }
 
-  return line;
+  return indent + line + base::ASCIIToUTF16("\n");
 }
 
 // static
 const base::FilePath::StringType
 AccessibilityTreeFormatter::GetActualFileSuffix() {
   return FILE_PATH_LITERAL("-actual-win.txt");
 }
 
 // static
 const base::FilePath::StringType
@@ skipping 10 matching lines @@
 const std::string AccessibilityTreeFormatter::GetAllowString() {
   return "@WIN-ALLOW:";
 }
 
 // static
 const std::string AccessibilityTreeFormatter::GetDenyString() {
   return "@WIN-DENY:";
 }
 
 }  // namespace content