Modify AccessibilityTreeFormatter to build up an internal representation of the tree

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/string_util.h"
 #include "base/stringprintf.h"
 #include "base/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 "content/common/accessibility_node_data.h"
 #include "third_party/iaccessible2/ia2_api_all.h"
 #include "ui/base/win/atl_module.h"
 
 namespace content {
 
 void AccessibilityTreeFormatter::Initialize() {
   ui::win::CreateATLModuleIfNeeded();
 }
 
 string16 AccessibilityTreeFormatter::ToString(
-    BrowserAccessibility* node, char* prefix) {
+    BrowserAccessibility* node, string16& indent) {

[dmazzoni, 2013/04/08 05:46:35]

string16& indent -> const string16& indent

   BrowserAccessibilityWin* acc_obj = node->ToBrowserAccessibilityWin();
 
   // Get the computed name.
   VARIANT variant_self;
   variant_self.vt = VT_I4;
   variant_self.lVal = CHILDID_SELF;
   CComBSTR msaa_variant;
   HRESULT hresult = acc_obj->get_accName(variant_self, &msaa_variant);
   string16 name;
   if (S_OK == hresult)
@@ skipping 109 matching lines @@
     Add(false, base::StringPrintf(L"n_selections=%d", n_selections));
     if (n_selections > 0) {
       LONG start, end;
       if (acc_obj->get_selection(0, &start, &end) == S_OK) {
         Add(false, base::StringPrintf(L"selection_start=%d", start));
         Add(false, base::StringPrintf(L"selection_end=%d", end));
       }
     }
   }
 
-  return UTF8ToUTF16(prefix) + FinishLine() + ASCIIToUTF16("\n");
+  return indent + FinishLine() + 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