Improvements to our windows accessibility tree testing.

content/browser/accessibility/browser_accessibility_com_win.h

 // Copyright (c) 2017 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.
 
 #ifndef CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_COM_WIN_H_
 #define CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_COM_WIN_H_
 
 #include <atlbase.h>
 #include <atlcom.h>
 #include <oleacc.h>
@@ skipping 700 matching lines @@
 
   // Computes and caches the IA2 text style attributes for the text and other
   // embedded child objects.
   CONTENT_EXPORT void ComputeStylesIfNeeded();
 
   // |offset| could either be a text character or a child index in case of
   // non-text objects.
   AXPlatformPosition::AXPositionInstance CreatePositionForSelectionAt(
       int offset) const;
 
-  // Accessors.
+  // Public accessors (these do not have COM accessible accessors)
+  const base::string16& role_name() const { return win_attributes_->role_name; }
+  const std::map<int, std::vector<base::string16>>& offset_to_text_attributes()
+      const {
+    return win_attributes_->offset_to_text_attributes;
+  }
+
+ private:
+  // Private accessors.
   int32_t ia_role() const { return win_attributes_->ia_role; }
   int32_t ia_state() const { return win_attributes_->ia_state; }
-  const base::string16& role_name() const { return win_attributes_->role_name; }
   int32_t ia2_role() const { return win_attributes_->ia2_role; }
   int32_t ia2_state() const { return win_attributes_->ia2_state; }
   const std::vector<base::string16>& ia2_attributes() const {
     return win_attributes_->ia2_attributes;
   }
   base::string16 name() const { return win_attributes_->name; }
   base::string16 description() const { return win_attributes_->description; }
   base::string16 value() const { return win_attributes_->value; }
-  const std::map<int, std::vector<base::string16>>& offset_to_text_attributes()
-      const {
-    return win_attributes_->offset_to_text_attributes;
-  }
+
   std::map<int32_t, int32_t>& hyperlink_offset_to_index() const {
     return win_attributes_->hyperlink_offset_to_index;
   }
   std::vector<int32_t>& hyperlinks() const {
     return win_attributes_->hyperlinks;
   }
 
- private:
   // Setter and getter for the browser accessibility owner
   BrowserAccessibilityWin* owner() const { return owner_; }
   void SetOwner(BrowserAccessibilityWin* owner) { owner_ = owner; }
 
   BrowserAccessibilityManager* Manager() const;
 
   //
   // AXPlatformNode overrides
   //
   void Destroy() override;
@@ skipping 229 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(BrowserAccessibilityComWin);
 };
 
 CONTENT_EXPORT BrowserAccessibilityComWin* ToBrowserAccessibilityComWin(
     BrowserAccessibility* obj);
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_COM_WIN_H_