Improve formatting of accessibility tests that dump the tree.

content/browser/accessibility/dump_accessibility_tree_helper_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/dump_accessibility_tree_helper.h"
 
 #include <oleacc.h>
 
 #include <map>
 #include <string>
@@ skipping 137 matching lines @@
   STATE_MAP(IA2_STATE_OPAQUE)
   STATE_MAP(IA2_STATE_REQUIRED)
   STATE_MAP(IA2_STATE_SELECTABLE_TEXT)
   STATE_MAP(IA2_STATE_SINGLE_LINE)
   STATE_MAP(IA2_STATE_STALE)
   STATE_MAP(IA2_STATE_SUPPORTS_AUTOCOMPLETION)
   STATE_MAP(IA2_STATE_TRANSIENT)
   // STATE_MAP(IA2_STATE_VERTICAL) // Untested.
 }
 
-string16 DumpAccessibilityTreeHelper::ToString(BrowserAccessibility* node) {
+string16 DumpAccessibilityTreeHelper::ToString(
+    BrowserAccessibility* node, char* prefix) {
   if (role_string_map.empty())
     Initialize();
 
   BrowserAccessibilityWin* acc_obj = node->toBrowserAccessibilityWin();
   string16 state;
   std::map<int32, string16>::iterator it;
 
   for (it = state_string_map.begin(); it != state_string_map.end(); ++it) {
-    if (it->first & acc_obj->ia2_state())
-      state += it->second + L"|";
+    if (it->first & acc_obj->ia2_state()) {
+      if (!state.empty())
+        state += L",";
+      state += it->second;
+    }
   }
-  return acc_obj->name() + L"|" + role_string_map[acc_obj->ia2_role()] + L"|" +
-      state;
+  return UTF8ToUTF16(prefix) +
+         role_string_map[acc_obj->ia2_role()] +
+         L" name='" + acc_obj->name() +
+         L"' state=" + state + L"\n";
 }
 
 const FilePath::StringType DumpAccessibilityTreeHelper::GetActualFileSuffix()
     const {
   return FILE_PATH_LITERAL("-actual-win.txt");
 }
 
 const FilePath::StringType DumpAccessibilityTreeHelper::GetExpectedFileSuffix()
     const {
   return FILE_PATH_LITERAL("-expected-win.txt");
 }
-
-const string16 DumpAccessibilityTreeHelper::GetLineEnding() const {
-  return L"\r\n";
-}