Track usage of Windows accessibility APIs with a UMA histogram

content/browser/accessibility/browser_accessibility_win.cc

Index: content/browser/accessibility/browser_accessibility_win.cc
diff --git a/content/browser/accessibility/browser_accessibility_win.cc b/content/browser/accessibility/browser_accessibility_win.cc
index 2e3d24f90c880afd4c89815b1c4f449e27041fc3..aa5d354818c8f4162626312ee415efb9aa9c957d 100644
--- a/content/browser/accessibility/browser_accessibility_win.cc
+++ b/content/browser/accessibility/browser_accessibility_win.cc
@@ -11,6 +11,7 @@
 #include <iterator>
 #include <utility>
 
+#include "base/metrics/histogram_macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
@@ -31,6 +32,160 @@
 
 namespace content {
 
+enum {

[Mark P, 2016/09/15 23:36:56]

optional: Consider an anonymous namespace.

[Mark P, 2016/09/15 23:36:56]

Please put a comment here, something like
// These values are written to logs.  Do not renumber or delete existing items;
add new entries to the end of the list.

[dmazzoni, 2016/09/16 16:27:15]

Done
Done

+  UMA_API_ACC_DO_DEFAULT_ACTION = 0,
+  UMA_API_ACC_HIT_TEST,

[Mark P, 2016/09/15 23:36:56]

Please explicitly do =1, =2, etc.  This will make it obvious later when someone
who doesn't read the comment deletes something.  Furthermore, it will make an
accidental deletion have a smaller effect (no other entries will get
renumbered).

(We've had these issues with large enum histograms in the past.  That's why I'm
asking for this.)

[dmazzoni, 2016/09/16 16:27:16]

Done. That also makes it easier to spot-check that the numbers match the
histograms.xml file.

+  UMA_API_ACC_LOCATION,
+  UMA_API_ACC_NAVIGATE,
+  UMA_API_ACC_SELECT,
+  UMA_API_ADD_SELECTION,
+  UMA_API_DO_ACTION,
+  UMA_API_GET_ACCESSIBLE_AT,
+  UMA_API_GET_ACC_CHILD,
+  UMA_API_GET_ACC_CHILD_COUNT,
+  UMA_API_GET_ACC_DEFAULT_ACTION,
+  UMA_API_GET_ACC_DESCRIPTION,
+  UMA_API_GET_ACC_FOCUS,
+  UMA_API_GET_ACC_HELP,
+  UMA_API_GET_ACC_HELP_TOPIC,
+  UMA_API_GET_ACC_KEYBOARD_SHORTCUT,
+  UMA_API_GET_ACC_NAME,
+  UMA_API_GET_ACC_PARENT,
+  UMA_API_GET_ACC_ROLE,
+  UMA_API_GET_ACC_SELECTION,
+  UMA_API_GET_ACC_STATE,
+  UMA_API_GET_ACC_VALUE,
+  UMA_API_GET_ANCHOR,
+  UMA_API_GET_ANCHOR_TARGET,
+  UMA_API_GET_APP_NAME,
+  UMA_API_GET_APP_VERSION,
+  UMA_API_GET_ATTRIBUTES_FOR_NAMES,
+  UMA_API_GET_CAPTION,
+  UMA_API_GET_CARET_OFFSET,
+  UMA_API_GET_CELL_AT,
+  UMA_API_GET_CHARACTER_EXTENTS,
+  UMA_API_GET_CHILD_AT,
+  UMA_API_GET_CHILD_INDEX,
+  UMA_API_GET_CLIPPED_SUBSTRING_BOUNDS,
+  UMA_API_GET_COLUMN_DESCRIPTION,
+  UMA_API_GET_COLUMN_EXTENT,
+  UMA_API_GET_COLUMN_EXTENT_AT,
+  UMA_API_GET_COLUMN_HEADER,
+  UMA_API_GET_COLUMN_HEADER_CELLS,
+  UMA_API_GET_COLUMN_INDEX,
+  UMA_API_GET_COMPUTED_STYLE,
+  UMA_API_GET_COMPUTED_STYLE_FOR_PROPERTIES,
+  UMA_API_GET_CURRENT_VALUE,
+  UMA_API_GET_DESCRIPTION,
+  UMA_API_GET_DOC_TYPE,
+  UMA_API_GET_DOM_TEXT,
+  UMA_API_GET_END_INDEX,
+  UMA_API_GET_EXTENDED_ROLE,
+  UMA_API_GET_FIRST_CHILD,
+  UMA_API_GET_FONT_FAMILY,
+  UMA_API_GET_GROUP_POSITION,
+  UMA_API_GET_HOST_RAW_ELEMENT_PROVIDER,
+  UMA_API_GET_HYPERLINK,
+  UMA_API_GET_HYPERLINK_INDEX,
+  UMA_API_GET_IMAGE_POSITION,
+  UMA_API_GET_IMAGE_SIZE,
+  UMA_API_GET_INDEX_IN_PARENT,
+  UMA_API_GET_INNER_HTML,
+  UMA_API_GET_IS_COLUMN_SELECTED,
+  UMA_API_GET_IS_ROW_SELECTED,
+  UMA_API_GET_IS_SELECTED,
+  UMA_API_GET_KEY_BINDING,
+  UMA_API_GET_LANGUAGE,
+  UMA_API_GET_LAST_CHILD,
+  UMA_API_GET_LOCALE,
+  UMA_API_GET_MAXIMUM_VALUE,
+  UMA_API_GET_MIME_TYPE,
+  UMA_API_GET_MINIMUM_VALUE,
+  UMA_API_GET_NAME,
+  UMA_API_GET_NEW_TEXT,
+  UMA_API_GET_NEXT_SIBLING,
+  UMA_API_GET_NODE_INFO,
+  UMA_API_GET_N_CHARACTERS,
+  UMA_API_GET_N_COLUMNS,
+  UMA_API_GET_N_HYPERLINKS,
+  UMA_API_GET_N_RELATIONS,
+  UMA_API_GET_N_ROWS,
+  UMA_API_GET_N_SELECTED_CELLS,
+  UMA_API_GET_N_SELECTED_CHILDREN,
+  UMA_API_GET_N_SELECTED_COLUMNS,
+  UMA_API_GET_N_SELECTED_ROWS,
+  UMA_API_GET_N_SELECTIONS,
+  UMA_API_GET_OFFSET_AT_POINT,
+  UMA_API_GET_OLD_TEXT,
+  UMA_API_GET_PARENT_NODE,
+  UMA_API_GET_PATTERN_PROVIDER,
+  UMA_API_GET_PREVIOUS_SIBLING,
+  UMA_API_GET_PROPERTY_VALUE,
+  UMA_API_GET_PROVIDER_OPTIONS,
+  UMA_API_GET_RELATION,
+  UMA_API_GET_RELATIONS,
+  UMA_API_GET_ROW_COLUMN_EXTENTS,
+  UMA_API_GET_ROW_COLUMN_EXTENTS_AT_INDEX,
+  UMA_API_GET_ROW_DESCRIPTION,
+  UMA_API_GET_ROW_EXTENT,
+  UMA_API_GET_ROW_EXTENT_AT,
+  UMA_API_GET_ROW_HEADER,
+  UMA_API_GET_ROW_HEADER_CELLS,
+  UMA_API_GET_ROW_INDEX,
+  UMA_API_GET_RUNTIME_ID,
+  UMA_API_GET_SELECTED_CELLS,
+  UMA_API_GET_SELECTED_CHILDREN,
+  UMA_API_GET_SELECTED_COLUMNS,
+  UMA_API_GET_SELECTED_ROWS,
+  UMA_API_GET_SELECTION,
+  UMA_API_GET_START_INDEX,
+  UMA_API_GET_STATES,
+  UMA_API_GET_STRING_ATTRIBUTE_AS_BSTR,
+  UMA_API_GET_SUMMARY,
+  UMA_API_GET_TABLE,
+  UMA_API_GET_TEXT,
+  UMA_API_GET_TEXT_AFTER_OFFSET,
+  UMA_API_GET_TEXT_AT_OFFSET,
+  UMA_API_GET_TEXT_BEFORE_OFFSET,
+  UMA_API_GET_TITLE,
+  UMA_API_GET_TOOLKIT_NAME,
+  UMA_API_GET_TOOLKIT_VERSION,
+  UMA_API_GET_UNCLIPPED_SUBSTRING_BOUNDS,
+  UMA_API_GET_UNIQUE_ID,
+  UMA_API_GET_URL,
+  UMA_API_GET_VALID,
+  UMA_API_GET_WINDOW_HANDLE,
+  UMA_API_IA2_GET_ATTRIBUTES,
+  UMA_API_IA2_SCROLL_TO,
+  UMA_API_IATEXT_GET_ATTRIBUTES,
+  UMA_API_ISIMPLEDOMNODE_GET_ATTRIBUTES,
+  UMA_API_ISIMPLEDOMNODE_SCROLL_TO,
+  UMA_API_N_ACTIONS,
+  UMA_API_QUERY_SERVICE,
+  UMA_API_REMOVE_SELECTION,
+  UMA_API_ROLE,
+  UMA_API_SCROLL_SUBSTRING_TO,
+  UMA_API_SCROLL_SUBSTRING_TO_POINT,
+  UMA_API_SCROLL_TO_POINT,
+  UMA_API_SCROLL_TO_SUBSTRING,
+  UMA_API_SELECT_COLUMN,
+  UMA_API_SELECT_ROW,
+  UMA_API_SET_CARET_OFFSET,
+  UMA_API_SET_CURRENT_VALUE,
+  UMA_API_SET_SELECTION,
+  UMA_API_TABLE2_GET_SELECTED_COLUMNS,
+  UMA_API_TABLE2_GET_SELECTED_ROWS,
+  UMA_API_TABLECELL_GET_COLUMN_INDEX,
+  UMA_API_TABLECELL_GET_IS_SELECTED,
+  UMA_API_TABLECELL_GET_ROW_INDEX,
+  UMA_API_UNSELECT_COLUMN,
+  UMA_API_UNSELECT_ROW,
+  UMA_API_MAX

[Mark P, 2016/09/15 23:36:56]

Comment this last entry.
// This enum value must be last.
possibly (if you wish) add
// It's okay to change this value.

[dmazzoni, 2016/09/16 16:27:15]

Done

+};
+
+#define WIN_ACCESSIBILITY_API_HISTOGRAM(enum_value) \
+    UMA_HISTOGRAM_ENUMERATION("Accessibility.WinAPIs", enum_value, UMA_API_MAX)
+
 // These nonstandard GUIDs are taken directly from the Mozilla sources
 // (accessible/src/msaa/nsAccessNodeWrap.cpp); some documentation is here:
 // http://developer.mozilla.org/en/Accessibility/AT-APIs/ImplementationFeatures/MSAA
@@ -236,6 +391,7 @@ BrowserAccessibilityWin::~BrowserAccessibilityWin() {
 //
 
 HRESULT BrowserAccessibilityWin::accDoDefaultAction(VARIANT var_id) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_ACC_DO_DEFAULT_ACTION);
   if (!instance_active())
     return E_FAIL;
 
@@ -254,6 +410,7 @@ HRESULT BrowserAccessibilityWin::accDoDefaultAction(VARIANT var_id) {
 STDMETHODIMP BrowserAccessibilityWin::accHitTest(LONG x_left,
                                                  LONG y_top,
                                                  VARIANT* child) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_ACC_HIT_TEST);
   if (!instance_active())
     return E_FAIL;
 
@@ -284,6 +441,7 @@ STDMETHODIMP BrowserAccessibilityWin::accLocation(LONG* x_left,
                                                   LONG* width,
                                                   LONG* height,
                                                   VARIANT var_id) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_ACC_LOCATION);
   if (!instance_active())
     return E_FAIL;
 
@@ -306,6 +464,7 @@ STDMETHODIMP BrowserAccessibilityWin::accLocation(LONG* x_left,
 STDMETHODIMP BrowserAccessibilityWin::accNavigate(LONG nav_dir,
                                                   VARIANT start,
                                                   VARIANT* end) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_ACC_NAVIGATE);
   BrowserAccessibilityWin* target = GetTargetFromChildID(start);
   if (!target)
     return E_INVALIDARG;
@@ -354,6 +513,7 @@ STDMETHODIMP BrowserAccessibilityWin::accNavigate(LONG nav_dir,
 
 STDMETHODIMP BrowserAccessibilityWin::get_accChild(VARIANT var_child,
                                                    IDispatch** disp_child) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ACC_CHILD);
   if (!instance_active())
     return E_FAIL;
 
@@ -371,6 +531,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_accChild(VARIANT var_child,
 }
 
 STDMETHODIMP BrowserAccessibilityWin::get_accChildCount(LONG* child_count) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ACC_CHILD_COUNT);
   if (!instance_active())
     return E_FAIL;
 
@@ -384,6 +545,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_accChildCount(LONG* child_count) {
 
 STDMETHODIMP BrowserAccessibilityWin::get_accDefaultAction(VARIANT var_id,
                                                            BSTR* def_action) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ACC_DEFAULT_ACTION);
   if (!instance_active())
     return E_FAIL;
 
@@ -400,6 +562,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_accDefaultAction(VARIANT var_id,
 
 STDMETHODIMP BrowserAccessibilityWin::get_accDescription(VARIANT var_id,
                                                          BSTR* desc) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ACC_DESCRIPTION);
   if (!instance_active())
     return E_FAIL;
 
@@ -421,6 +584,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_accDescription(VARIANT var_id,
 }
 
 STDMETHODIMP BrowserAccessibilityWin::get_accFocus(VARIANT* focus_child) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ACC_FOCUS);
   if (!instance_active())
     return E_FAIL;
 
@@ -443,6 +607,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_accFocus(VARIANT* focus_child) {
 }
 
 STDMETHODIMP BrowserAccessibilityWin::get_accHelp(VARIANT var_id, BSTR* help) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ACC_HELP);
   if (!instance_active())
     return E_FAIL;
 
@@ -454,6 +619,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_accHelp(VARIANT var_id, BSTR* help) {
 
 STDMETHODIMP BrowserAccessibilityWin::get_accKeyboardShortcut(VARIANT var_id,
                                                               BSTR* acc_key) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ACC_KEYBOARD_SHORTCUT);
   if (!instance_active())
     return E_FAIL;
 
@@ -469,6 +635,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_accKeyboardShortcut(VARIANT var_id,
 }
 
 STDMETHODIMP BrowserAccessibilityWin::get_accName(VARIANT var_id, BSTR* name) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ACC_NAME);
   if (!instance_active())
     return E_FAIL;
 
@@ -498,6 +665,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_accName(VARIANT var_id, BSTR* name) {
 }
 
 STDMETHODIMP BrowserAccessibilityWin::get_accParent(IDispatch** disp_parent) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ACC_PARENT);
   if (!instance_active())
     return E_FAIL;
 
@@ -528,6 +696,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_accParent(IDispatch** disp_parent) {
 
 STDMETHODIMP BrowserAccessibilityWin::get_accRole(VARIANT var_id,
                                                   VARIANT* role) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ACC_ROLE);
   if (!instance_active())
     return E_FAIL;
 
@@ -550,6 +719,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_accRole(VARIANT var_id,
 
 STDMETHODIMP BrowserAccessibilityWin::get_accState(VARIANT var_id,
                                                    VARIANT* state) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ACC_STATE);
   if (!instance_active())
     return E_FAIL;
 
@@ -570,6 +740,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_accState(VARIANT var_id,
 
 STDMETHODIMP BrowserAccessibilityWin::get_accValue(VARIANT var_id,
                                                    BSTR* value) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ACC_VALUE);
   if (!instance_active())
     return E_FAIL;
 
@@ -613,10 +784,12 @@ STDMETHODIMP BrowserAccessibilityWin::get_accValue(VARIANT var_id,
 STDMETHODIMP BrowserAccessibilityWin::get_accHelpTopic(BSTR* help_file,
                                                        VARIANT var_id,
                                                        LONG* topic_id) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ACC_HELP_TOPIC);
   return E_NOTIMPL;
 }
 
 STDMETHODIMP BrowserAccessibilityWin::get_accSelection(VARIANT* selected) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ACC_SELECTION);
   if (!instance_active())
     return E_FAIL;
 
@@ -666,6 +839,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_accSelection(VARIANT* selected) {
 
 STDMETHODIMP BrowserAccessibilityWin::accSelect(
     LONG flags_sel, VARIANT var_id) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_ACC_SELECT);
   if (!instance_active())
     return E_FAIL;
 
@@ -691,6 +865,7 @@ BrowserAccessibilityWin::put_accValue(VARIANT var_id, BSTR put_val) {
 //
 
 STDMETHODIMP BrowserAccessibilityWin::role(LONG* role) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_ROLE);
   if (!instance_active())
     return E_FAIL;
 
@@ -702,6 +877,7 @@ STDMETHODIMP BrowserAccessibilityWin::role(LONG* role) {
 }
 
 STDMETHODIMP BrowserAccessibilityWin::get_attributes(BSTR* attributes) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_IA2_GET_ATTRIBUTES);
   if (!attributes)
     return E_INVALIDARG;
   *attributes = nullptr;
@@ -722,6 +898,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_attributes(BSTR* attributes) {
 }
 
 STDMETHODIMP BrowserAccessibilityWin::get_states(AccessibleStates* states) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_STATES);
   if (!instance_active())
     return E_FAIL;
 
@@ -734,6 +911,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_states(AccessibleStates* states) {
 }
 
 STDMETHODIMP BrowserAccessibilityWin::get_uniqueID(LONG* unique_id) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_UNIQUE_ID);
   if (!instance_active())
     return E_FAIL;
 
@@ -745,6 +923,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_uniqueID(LONG* unique_id) {
 }
 
 STDMETHODIMP BrowserAccessibilityWin::get_windowHandle(HWND* window_handle) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_WINDOW_HANDLE);
   if (!instance_active())
     return E_FAIL;
 
@@ -760,6 +939,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_windowHandle(HWND* window_handle) {
 }
 
 STDMETHODIMP BrowserAccessibilityWin::get_indexInParent(LONG* index_in_parent) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_INDEX_IN_PARENT);
   if (!instance_active())
     return E_FAIL;
 
@@ -771,6 +951,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_indexInParent(LONG* index_in_parent) {
 }
 
 STDMETHODIMP BrowserAccessibilityWin::get_nRelations(LONG* n_relations) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_N_RELATIONS);
   if (!instance_active())
     return E_FAIL;
 
@@ -784,6 +965,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_nRelations(LONG* n_relations) {
 STDMETHODIMP BrowserAccessibilityWin::get_relation(
     LONG relation_index,
     IAccessibleRelation** relation) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_RELATION);
   if (!instance_active())
     return E_FAIL;
 
@@ -804,6 +986,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_relations(
     LONG max_relations,
     IAccessibleRelation** relations,
     LONG* n_relations) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_RELATIONS);
   if (!instance_active())
     return E_FAIL;
 
@@ -824,6 +1007,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_relations(
 }
 
 STDMETHODIMP BrowserAccessibilityWin::scrollTo(IA2ScrollType scroll_type) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_IA2_SCROLL_TO);
   if (!instance_active())
     return E_FAIL;
 
@@ -866,6 +1050,7 @@ STDMETHODIMP BrowserAccessibilityWin::scrollToPoint(
     IA2CoordinateType coordinate_type,
     LONG x,
     LONG y) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_SCROLL_TO_POINT);
   if (!instance_active())
     return E_FAIL;
 
@@ -890,6 +1075,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_groupPosition(
     LONG* group_level,
     LONG* similar_items_in_group,
     LONG* position_in_group) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_GROUP_POSITION);
   if (!instance_active())
     return E_FAIL;
 
@@ -910,6 +1096,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_groupPosition(
 //
 
 STDMETHODIMP BrowserAccessibilityWin::get_extendedRole(BSTR* extended_role) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_EXTENDED_ROLE);
   return E_NOTIMPL;
 }
 STDMETHODIMP
@@ -935,6 +1122,7 @@ BrowserAccessibilityWin::get_localizedExtendedStates(
   return E_NOTIMPL;
 }
 STDMETHODIMP BrowserAccessibilityWin::get_locale(IA2Locale* locale) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_LOCALE);
   return E_NOTIMPL;
 }
 
@@ -943,6 +1131,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_locale(IA2Locale* locale) {
 //
 
 STDMETHODIMP BrowserAccessibilityWin::get_appName(BSTR* app_name) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_APP_NAME);
   // No need to check |instance_active()| because this interface is
   // global, and doesn't depend on any local state.
 
@@ -963,6 +1152,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_appName(BSTR* app_name) {
 }
 
 STDMETHODIMP BrowserAccessibilityWin::get_appVersion(BSTR* app_version) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_APP_VERSION);
   // No need to check |instance_active()| because this interface is
   // global, and doesn't depend on any local state.
 
@@ -984,6 +1174,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_appVersion(BSTR* app_version) {
 }
 
 STDMETHODIMP BrowserAccessibilityWin::get_toolkitName(BSTR* toolkit_name) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_TOOLKIT_NAME);
   // No need to check |instance_active()| because this interface is
   // global, and doesn't depend on any local state.
 
@@ -1000,6 +1191,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_toolkitName(BSTR* toolkit_name) {
 
 STDMETHODIMP BrowserAccessibilityWin::get_toolkitVersion(
     BSTR* toolkit_version) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_TOOLKIT_VERSION);
   // No need to check |instance_active()| because this interface is
   // global, and doesn't depend on any local state.
 
@@ -1017,6 +1209,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_toolkitVersion(
 //
 
 STDMETHODIMP BrowserAccessibilityWin::get_description(BSTR* desc) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_DESCRIPTION);
   if (!instance_active())
     return E_FAIL;
 
@@ -1036,6 +1229,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_imagePosition(
     IA2CoordinateType coordinate_type,
     LONG* x,
     LONG* y) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_IMAGE_POSITION);
   if (!instance_active())
     return E_FAIL;
 
@@ -1060,6 +1254,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_imagePosition(
 }
 
 STDMETHODIMP BrowserAccessibilityWin::get_imageSize(LONG* height, LONG* width) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_IMAGE_SIZE);
   if (!instance_active())
     return E_FAIL;
 
@@ -1079,6 +1274,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_accessibleAt(
     long row,
     long column,
     IUnknown** accessible) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ACCESSIBLE_AT);
   if (!instance_active())
     return E_FAIL;
 
@@ -1115,6 +1311,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_accessibleAt(
 }
 
 STDMETHODIMP BrowserAccessibilityWin::get_caption(IUnknown** accessible) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_CAPTION);
   if (!instance_active())
     return E_FAIL;
 
@@ -1128,6 +1325,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_caption(IUnknown** accessible) {
 STDMETHODIMP BrowserAccessibilityWin::get_childIndex(long row,
                                                      long column,
                                                      long* cell_index) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_CHILD_INDEX);
   if (!instance_active())
     return E_FAIL;
 
@@ -1166,6 +1364,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_childIndex(long row,
 
 STDMETHODIMP BrowserAccessibilityWin::get_columnDescription(long column,
                                                             BSTR* description) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_COLUMN_DESCRIPTION);
   if (!instance_active())
     return E_FAIL;
 
@@ -1212,6 +1411,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_columnExtentAt(
     long row,
     long column,
     long* n_columns_spanned) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_COLUMN_EXTENT_AT);
   if (!instance_active())
     return E_FAIL;
 
@@ -1250,12 +1450,14 @@ STDMETHODIMP BrowserAccessibilityWin::get_columnExtentAt(
 STDMETHODIMP BrowserAccessibilityWin::get_columnHeader(
     IAccessibleTable** accessible_table,
     long* starting_row_index) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_COLUMN_HEADER);
   // TODO(dmazzoni): implement
   return E_NOTIMPL;
 }
 
 STDMETHODIMP BrowserAccessibilityWin::get_columnIndex(long cell_index,
                                                       long* column_index) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_COLUMN_INDEX);
   if (!instance_active())
     return E_FAIL;
 
@@ -1284,6 +1486,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_columnIndex(long cell_index,
 }
 
 STDMETHODIMP BrowserAccessibilityWin::get_nColumns(long* column_count) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_N_COLUMNS);
   if (!instance_active())
     return E_FAIL;
 
@@ -1301,6 +1504,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_nColumns(long* column_count) {
 }
 
 STDMETHODIMP BrowserAccessibilityWin::get_nRows(long* row_count) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_N_ROWS);
   if (!instance_active())
     return E_FAIL;
 
@@ -1317,6 +1521,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_nRows(long* row_count) {
 }
 
 STDMETHODIMP BrowserAccessibilityWin::get_nSelectedChildren(long* cell_count) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_N_SELECTED_CHILDREN);
   if (!instance_active())
     return E_FAIL;
 
@@ -1329,6 +1534,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_nSelectedChildren(long* cell_count) {
 }
 
 STDMETHODIMP BrowserAccessibilityWin::get_nSelectedColumns(long* column_count) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_N_SELECTED_COLUMNS);
   if (!instance_active())
     return E_FAIL;
 
@@ -1340,6 +1546,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_nSelectedColumns(long* column_count) {
 }
 
 STDMETHODIMP BrowserAccessibilityWin::get_nSelectedRows(long* row_count) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_N_SELECTED_ROWS);
   if (!instance_active())
     return E_FAIL;
 
@@ -1352,6 +1559,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_nSelectedRows(long* row_count) {
 
 STDMETHODIMP BrowserAccessibilityWin::get_rowDescription(long row,
                                                          BSTR* description) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ROW_DESCRIPTION);
   if (!instance_active())
     return E_FAIL;
 
@@ -1397,6 +1605,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_rowDescription(long row,
 STDMETHODIMP BrowserAccessibilityWin::get_rowExtentAt(long row,
                                                       long column,
                                                       long* n_rows_spanned) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ROW_EXTENT_AT);
   if (!instance_active())
     return E_FAIL;
 
@@ -1435,12 +1644,14 @@ STDMETHODIMP BrowserAccessibilityWin::get_rowExtentAt(long row,
 STDMETHODIMP BrowserAccessibilityWin::get_rowHeader(
     IAccessibleTable** accessible_table,
     long* starting_column_index) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ROW_HEADER);
   // TODO(dmazzoni): implement
   return E_NOTIMPL;
 }
 
 STDMETHODIMP BrowserAccessibilityWin::get_rowIndex(long cell_index,
                                                    long* row_index) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ROW_INDEX);
   if (!instance_active())
     return E_FAIL;
 
@@ -1471,6 +1682,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_rowIndex(long cell_index,
 STDMETHODIMP BrowserAccessibilityWin::get_selectedChildren(long max_children,
                                                            long** children,
                                                            long* n_children) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_SELECTED_CHILDREN);
   if (!instance_active())
     return E_FAIL;
 
@@ -1485,6 +1697,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_selectedChildren(long max_children,
 STDMETHODIMP BrowserAccessibilityWin::get_selectedColumns(long max_columns,
                                                           long** columns,
                                                           long* n_columns) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_SELECTED_COLUMNS);
   if (!instance_active())
     return E_FAIL;
 
@@ -1499,6 +1712,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_selectedColumns(long max_columns,
 STDMETHODIMP BrowserAccessibilityWin::get_selectedRows(long max_rows,
                                                        long** rows,
                                                        long* n_rows) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_SELECTED_ROWS);
   if (!instance_active())
     return E_FAIL;
 
@@ -1511,6 +1725,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_selectedRows(long max_rows,
 }
 
 STDMETHODIMP BrowserAccessibilityWin::get_summary(IUnknown** accessible) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_SUMMARY);
   if (!instance_active())
     return E_FAIL;
 
@@ -1524,6 +1739,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_summary(IUnknown** accessible) {
 STDMETHODIMP BrowserAccessibilityWin::get_isColumnSelected(
     long column,
     boolean* is_selected) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_IS_COLUMN_SELECTED);
   if (!instance_active())
     return E_FAIL;
 
@@ -1537,6 +1753,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_isColumnSelected(
 
 STDMETHODIMP BrowserAccessibilityWin::get_isRowSelected(long row,
                                                         boolean* is_selected) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_IS_ROW_SELECTED);
   if (!instance_active())
     return E_FAIL;
 
@@ -1551,6 +1768,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_isRowSelected(long row,
 STDMETHODIMP BrowserAccessibilityWin::get_isSelected(long row,
                                                      long column,
                                                      boolean* is_selected) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_IS_SELECTED);
   if (!instance_active())
     return E_FAIL;
 
@@ -1569,6 +1787,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_rowColumnExtentsAtIndex(
     long* row_extents,
     long* column_extents,
     boolean* is_selected) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ROW_COLUMN_EXTENTS_AT_INDEX);
   if (!instance_active())
     return E_FAIL;
 
@@ -1603,18 +1822,22 @@ STDMETHODIMP BrowserAccessibilityWin::get_rowColumnExtentsAtIndex(
 }
 
 STDMETHODIMP BrowserAccessibilityWin::selectRow(long row) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_SELECT_ROW);
   return E_NOTIMPL;
 }
 
 STDMETHODIMP BrowserAccessibilityWin::selectColumn(long column) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_SELECT_COLUMN);
   return E_NOTIMPL;
 }
 
 STDMETHODIMP BrowserAccessibilityWin::unselectRow(long row) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_UNSELECT_ROW);
   return E_NOTIMPL;
 }
 
 STDMETHODIMP BrowserAccessibilityWin::unselectColumn(long column) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_UNSELECT_COLUMN);
   return E_NOTIMPL;
 }
 
@@ -1630,16 +1853,19 @@ BrowserAccessibilityWin::get_modelChange(IA2TableModelChange* model_change) {
 STDMETHODIMP BrowserAccessibilityWin::get_cellAt(long row,
                                                  long column,
                                                  IUnknown** cell) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_CELL_AT);
   return get_accessibleAt(row, column, cell);
 }
 
 STDMETHODIMP BrowserAccessibilityWin::get_nSelectedCells(long* cell_count) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_N_SELECTED_CELLS);
   return get_nSelectedChildren(cell_count);
 }
 
 STDMETHODIMP BrowserAccessibilityWin::get_selectedCells(
     IUnknown*** cells,
     long* n_selected_cells) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_SELECTED_CELLS);
   if (!instance_active())
     return E_FAIL;
 
@@ -1653,6 +1879,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_selectedCells(
 
 STDMETHODIMP BrowserAccessibilityWin::get_selectedColumns(long** columns,
                                                           long* n_columns) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_TABLE2_GET_SELECTED_COLUMNS);
   if (!instance_active())
     return E_FAIL;
 
@@ -1666,6 +1893,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_selectedColumns(long** columns,
 
 STDMETHODIMP BrowserAccessibilityWin::get_selectedRows(long** rows,
                                                        long* n_rows) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_TABLE2_GET_SELECTED_ROWS);
   if (!instance_active())
     return E_FAIL;
 
@@ -1684,6 +1912,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_selectedRows(long** rows,
 
 STDMETHODIMP BrowserAccessibilityWin::get_columnExtent(
     long* n_columns_spanned) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_COLUMN_EXTENT);
   if (!instance_active())
     return E_FAIL;
 
@@ -1704,6 +1933,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_columnExtent(
 STDMETHODIMP BrowserAccessibilityWin::get_columnHeaderCells(
     IUnknown*** cell_accessibles,
     long* n_column_header_cells) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_COLUMN_HEADER_CELLS);
   if (!instance_active())
     return E_FAIL;
 
@@ -1764,6 +1994,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_columnHeaderCells(
 }
 
 STDMETHODIMP BrowserAccessibilityWin::get_columnIndex(long* column_index) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_TABLECELL_GET_COLUMN_INDEX);
   if (!instance_active())
     return E_FAIL;
 
@@ -1781,6 +2012,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_columnIndex(long* column_index) {
 }
 
 STDMETHODIMP BrowserAccessibilityWin::get_rowExtent(long* n_rows_spanned) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ROW_EXTENT);
   if (!instance_active())
     return E_FAIL;
 
@@ -1801,6 +2033,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_rowExtent(long* n_rows_spanned) {
 STDMETHODIMP BrowserAccessibilityWin::get_rowHeaderCells(
     IUnknown*** cell_accessibles,
     long* n_row_header_cells) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ROW_HEADER_CELLS);
   if (!instance_active())
     return E_FAIL;
 
@@ -1861,6 +2094,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_rowHeaderCells(
 }
 
 STDMETHODIMP BrowserAccessibilityWin::get_rowIndex(long* row_index) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_TABLECELL_GET_ROW_INDEX);
   if (!instance_active())
     return E_FAIL;
 
@@ -1876,6 +2110,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_rowIndex(long* row_index) {
 }
 
 STDMETHODIMP BrowserAccessibilityWin::get_isSelected(boolean* is_selected) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_TABLECELL_GET_IS_SELECTED);
   if (!instance_active())
     return E_FAIL;
 
@@ -1892,6 +2127,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_rowColumnExtents(
     long* row_extents,
     long* column_extents,
     boolean* is_selected) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ROW_COLUMN_EXTENTS);
   if (!instance_active())
     return E_FAIL;
 
@@ -1926,6 +2162,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_rowColumnExtents(
 }
 
 STDMETHODIMP BrowserAccessibilityWin::get_table(IUnknown** table) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_TABLE);
   if (!instance_active())
     return E_FAIL;
 
@@ -1957,6 +2194,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_table(IUnknown** table) {
 //
 
 STDMETHODIMP BrowserAccessibilityWin::get_nCharacters(LONG* n_characters) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_N_CHARACTERS);
   if (!instance_active())
     return E_FAIL;
 
@@ -1968,6 +2206,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_nCharacters(LONG* n_characters) {
 }
 
 STDMETHODIMP BrowserAccessibilityWin::get_caretOffset(LONG* offset) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_CARET_OFFSET);
   if (!instance_active())
     return E_FAIL;
 
@@ -1994,6 +2233,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_characterExtents(
     LONG* out_y,
     LONG* out_width,
     LONG* out_height) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_CHARACTER_EXTENTS);
   if (!instance_active())
     return E_FAIL;
 
@@ -2026,6 +2266,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_characterExtents(
 }
 
 STDMETHODIMP BrowserAccessibilityWin::get_nSelections(LONG* n_selections) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_N_SELECTIONS);
   if (!instance_active())
     return E_FAIL;
 
@@ -2046,6 +2287,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_nSelections(LONG* n_selections) {
 STDMETHODIMP BrowserAccessibilityWin::get_selection(LONG selection_index,
                                                     LONG* start_offset,
                                                     LONG* end_offset) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_SELECTION);
   if (!instance_active())
     return E_FAIL;
 
@@ -2078,6 +2320,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_selection(LONG selection_index,
 STDMETHODIMP BrowserAccessibilityWin::get_text(LONG start_offset,
                                                LONG end_offset,
                                                BSTR* text) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_TEXT);
   if (!instance_active())
     return E_FAIL;
 
@@ -2120,6 +2363,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_textAtOffset(
     LONG* start_offset,
     LONG* end_offset,
     BSTR* text) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_TEXT_AT_OFFSET);
   if (!instance_active())
     return E_FAIL;
 
@@ -2170,6 +2414,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_textBeforeOffset(
     LONG* start_offset,
     LONG* end_offset,
     BSTR* text) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_TEXT_BEFORE_OFFSET);
   if (!instance_active())
     return E_FAIL;
 
@@ -2199,6 +2444,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_textAfterOffset(
     LONG* start_offset,
     LONG* end_offset,
     BSTR* text) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_TEXT_AFTER_OFFSET);
   if (!instance_active())
     return E_FAIL;
 
@@ -2223,6 +2469,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_textAfterOffset(
 }
 
 STDMETHODIMP BrowserAccessibilityWin::get_newText(IA2TextSegment* new_text) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_NEW_TEXT);
   if (!instance_active())
     return E_FAIL;
 
@@ -2245,6 +2492,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_newText(IA2TextSegment* new_text) {
 }
 
 STDMETHODIMP BrowserAccessibilityWin::get_oldText(IA2TextSegment* old_text) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_OLD_TEXT);
   if (!instance_active())
     return E_FAIL;
 
@@ -2272,6 +2520,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_offsetAtPoint(
     LONG y,
     IA2CoordinateType coord_type,
     LONG* offset) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_OFFSET_AT_POINT);
   if (!instance_active())
     return E_FAIL;
 
@@ -2289,6 +2538,7 @@ STDMETHODIMP BrowserAccessibilityWin::scrollSubstringTo(
     LONG start_index,
     LONG end_index,
     IA2ScrollType scroll_type) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_SCROLL_SUBSTRING_TO);
   // TODO(dmazzoni): adjust this for the start and end index, too.
   return scrollTo(scroll_type);
 }
@@ -2299,12 +2549,14 @@ STDMETHODIMP BrowserAccessibilityWin::scrollSubstringToPoint(
     IA2CoordinateType coordinate_type,
     LONG x,
     LONG y) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_SCROLL_SUBSTRING_TO_POINT);
   // TODO(dmazzoni): adjust this for the start and end index, too.
   return scrollToPoint(coordinate_type, x, y);
 }
 
 STDMETHODIMP BrowserAccessibilityWin::addSelection(LONG start_offset,
                                                    LONG end_offset) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_ADD_SELECTION);
   if (!instance_active())
     return E_FAIL;
 
@@ -2317,6 +2569,7 @@ STDMETHODIMP BrowserAccessibilityWin::addSelection(LONG start_offset,
 }
 
 STDMETHODIMP BrowserAccessibilityWin::removeSelection(LONG selection_index) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_REMOVE_SELECTION);
   if (!instance_active())
     return E_FAIL;
 
@@ -2328,6 +2581,7 @@ STDMETHODIMP BrowserAccessibilityWin::removeSelection(LONG selection_index) {
 }
 
 STDMETHODIMP BrowserAccessibilityWin::setCaretOffset(LONG offset) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_SET_CARET_OFFSET);
   if (!instance_active())
     return E_FAIL;
 
@@ -2340,6 +2594,7 @@ STDMETHODIMP BrowserAccessibilityWin::setCaretOffset(LONG offset) {
 STDMETHODIMP BrowserAccessibilityWin::setSelection(LONG selection_index,
                                                    LONG start_offset,
                                                    LONG end_offset) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_SET_SELECTION);
   if (!instance_active())
     return E_FAIL;
 
@@ -2358,6 +2613,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_attributes(LONG offset,
                                                      LONG* start_offset,
                                                      LONG* end_offset,
                                                      BSTR* text_attributes) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_IATEXT_GET_ATTRIBUTES);
   if (!start_offset || !end_offset || !text_attributes)
     return E_INVALIDARG;
 
@@ -2395,6 +2651,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_attributes(LONG offset,
 //
 
 STDMETHODIMP BrowserAccessibilityWin::get_nHyperlinks(long* hyperlink_count) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_N_HYPERLINKS);
   if (!instance_active())
     return E_FAIL;
 
@@ -2408,6 +2665,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_nHyperlinks(long* hyperlink_count) {
 STDMETHODIMP BrowserAccessibilityWin::get_hyperlink(
     long index,
     IAccessibleHyperlink** hyperlink) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_HYPERLINK);
   if (!instance_active())
     return E_FAIL;
 
@@ -2430,6 +2688,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_hyperlink(
 STDMETHODIMP BrowserAccessibilityWin::get_hyperlinkIndex(
     long char_index,
     long* hyperlink_index) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_HYPERLINK_INDEX);
   if (!instance_active())
     return E_FAIL;
 
@@ -2457,6 +2716,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_hyperlinkIndex(
 
 // Currently, only text links are supported.
 STDMETHODIMP BrowserAccessibilityWin::get_anchor(long index, VARIANT* anchor) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ANCHOR);
   if (!instance_active() || !IsHyperlink())
     return E_FAIL;
 
@@ -2480,6 +2740,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_anchor(long index, VARIANT* anchor) {
 // Currently, only text links are supported.
 STDMETHODIMP BrowserAccessibilityWin::get_anchorTarget(long index,
                                                        VARIANT* anchor_target) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ANCHOR_TARGET);
   if (!instance_active() || !IsHyperlink())
     return E_FAIL;
 
@@ -2506,6 +2767,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_anchorTarget(long index,
 }
 
 STDMETHODIMP BrowserAccessibilityWin::get_startIndex(long* index) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_START_INDEX);
   if (!instance_active() || !IsHyperlink())
     return E_FAIL;
 
@@ -2523,6 +2785,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_startIndex(long* index) {
 }
 
 STDMETHODIMP BrowserAccessibilityWin::get_endIndex(long* index) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_END_INDEX);
   LONG start_index;
   HRESULT hr = get_startIndex(&start_index);
   if (hr == S_OK)
@@ -2532,6 +2795,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_endIndex(long* index) {
 
 // This method is deprecated in the IA2 Spec.
 STDMETHODIMP BrowserAccessibilityWin::get_valid(boolean* valid) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_VALID);
   return E_NOTIMPL;
 }
 
@@ -2540,6 +2804,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_valid(boolean* valid) {
 //
 
 STDMETHODIMP BrowserAccessibilityWin::nActions(long* n_actions) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_N_ACTIONS);
   if (!instance_active())
     return E_FAIL;
 
@@ -2559,6 +2824,7 @@ STDMETHODIMP BrowserAccessibilityWin::nActions(long* n_actions) {
 }
 
 STDMETHODIMP BrowserAccessibilityWin::doAction(long action_index) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_DO_ACTION);
   if (!instance_active())
     return E_FAIL;
 
@@ -2577,10 +2843,12 @@ STDMETHODIMP BrowserAccessibilityWin::get_keyBinding(long action_index,
                                                      long n_max_bindings,
                                                      BSTR** key_bindings,
                                                      long* n_bindings) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_KEY_BINDING);
   return E_NOTIMPL;
 }
 
 STDMETHODIMP BrowserAccessibilityWin::get_name(long action_index, BSTR* name) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_NAME);
   if (!instance_active())
     return E_FAIL;
 
@@ -2610,6 +2878,7 @@ BrowserAccessibilityWin::get_localizedName(long action_index,
 //
 
 STDMETHODIMP BrowserAccessibilityWin::get_currentValue(VARIANT* value) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_CURRENT_VALUE);
   if (!instance_active())
     return E_FAIL;
 
@@ -2629,6 +2898,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_currentValue(VARIANT* value) {
 }
 
 STDMETHODIMP BrowserAccessibilityWin::get_minimumValue(VARIANT* value) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_MINIMUM_VALUE);
   if (!instance_active())
     return E_FAIL;
 
@@ -2648,6 +2918,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_minimumValue(VARIANT* value) {
 }
 
 STDMETHODIMP BrowserAccessibilityWin::get_maximumValue(VARIANT* value) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_MAXIMUM_VALUE);
   if (!instance_active())
     return E_FAIL;
 
@@ -2667,6 +2938,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_maximumValue(VARIANT* value) {
 }
 
 STDMETHODIMP BrowserAccessibilityWin::setCurrentValue(VARIANT new_value) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_SET_CURRENT_VALUE);
   // TODO(dmazzoni): Implement this.
   return E_NOTIMPL;
 }
@@ -2676,6 +2948,7 @@ STDMETHODIMP BrowserAccessibilityWin::setCurrentValue(VARIANT new_value) {
 //
 
 STDMETHODIMP BrowserAccessibilityWin::get_URL(BSTR* url) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_URL);
   if (!instance_active())
     return E_FAIL;
 
@@ -2696,6 +2969,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_URL(BSTR* url) {
 }
 
 STDMETHODIMP BrowserAccessibilityWin::get_title(BSTR* title) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_TITLE);
   if (!instance_active())
     return E_FAIL;
 
@@ -2713,6 +2987,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_title(BSTR* title) {
 }
 
 STDMETHODIMP BrowserAccessibilityWin::get_mimeType(BSTR* mime_type) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_MIME_TYPE);
   if (!instance_active())
     return E_FAIL;
 
@@ -2730,6 +3005,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_mimeType(BSTR* mime_type) {
 }
 
 STDMETHODIMP BrowserAccessibilityWin::get_docType(BSTR* doc_type) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_DOC_TYPE);
   if (!instance_active())
     return E_FAIL;
 
@@ -2768,6 +3044,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_nodeInfo(
     unsigned int* num_children,
     unsigned int* unique_id,
     unsigned short* node_type) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_NODE_INFO);
   if (!instance_active())
     return E_FAIL;
 
@@ -2805,6 +3082,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_attributes(
     short* name_space_id,
     BSTR* attrib_values,
     unsigned short* num_attribs) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_ISIMPLEDOMNODE_GET_ATTRIBUTES);
   if (!instance_active())
     return E_FAIL;
 
@@ -2830,6 +3108,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_attributesForNames(
     BSTR* attrib_names,
     short* name_space_id,
     BSTR* attrib_values) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ATTRIBUTES_FOR_NAMES);
   if (!instance_active())
     return E_FAIL;
 
@@ -2861,6 +3140,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_computedStyle(
     BSTR* style_properties,
     BSTR* style_values,
     unsigned short *num_style_properties)  {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_COMPUTED_STYLE);
   if (!instance_active())
     return E_FAIL;
 
@@ -2888,6 +3168,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_computedStyleForProperties(
     boolean use_alternate_view,
     BSTR* style_properties,
     BSTR* style_values) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_COMPUTED_STYLE_FOR_PROPERTIES);
   if (!instance_active())
     return E_FAIL;
 
@@ -2912,11 +3193,13 @@ STDMETHODIMP BrowserAccessibilityWin::get_computedStyleForProperties(
 }
 
 STDMETHODIMP BrowserAccessibilityWin::scrollTo(boolean placeTopLeft) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_ISIMPLEDOMNODE_SCROLL_TO);
   return scrollTo(placeTopLeft ?
       IA2_SCROLL_TYPE_TOP_LEFT : IA2_SCROLL_TYPE_ANYWHERE);
 }
 
 STDMETHODIMP BrowserAccessibilityWin::get_parentNode(ISimpleDOMNode** node) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_PARENT_NODE);
   if (!instance_active())
     return E_FAIL;
 
@@ -2928,6 +3211,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_parentNode(ISimpleDOMNode** node) {
 }
 
 STDMETHODIMP BrowserAccessibilityWin::get_firstChild(ISimpleDOMNode** node)  {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_FIRST_CHILD);
   if (!instance_active())
     return E_FAIL;
 
@@ -2944,6 +3228,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_firstChild(ISimpleDOMNode** node)  {
 }
 
 STDMETHODIMP BrowserAccessibilityWin::get_lastChild(ISimpleDOMNode** node) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_LAST_CHILD);
   if (!instance_active())
     return E_FAIL;
 
@@ -2962,6 +3247,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_lastChild(ISimpleDOMNode** node) {
 
 STDMETHODIMP BrowserAccessibilityWin::get_previousSibling(
     ISimpleDOMNode** node) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_PREVIOUS_SIBLING);
   if (!instance_active())
     return E_FAIL;
 
@@ -2979,6 +3265,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_previousSibling(
 }
 
 STDMETHODIMP BrowserAccessibilityWin::get_nextSibling(ISimpleDOMNode** node) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_NEXT_SIBLING);
   if (!instance_active())
     return E_FAIL;
 
@@ -3001,6 +3288,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_nextSibling(ISimpleDOMNode** node) {
 STDMETHODIMP BrowserAccessibilityWin::get_childAt(
     unsigned int child_index,
     ISimpleDOMNode** node) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_CHILD_AT);
   if (!instance_active())
     return E_FAIL;
 
@@ -3021,6 +3309,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_childAt(
 }
 
 STDMETHODIMP BrowserAccessibilityWin::get_innerHTML(BSTR* innerHTML) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_INNER_HTML);
   return E_NOTIMPL;
 }
 
@@ -3030,6 +3319,7 @@ BrowserAccessibilityWin::get_localInterface(void** local_interface) {
 }
 
 STDMETHODIMP BrowserAccessibilityWin::get_language(BSTR* language) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_LANGUAGE);
   if (!language)
     return E_INVALIDARG;
   *language = nullptr;
@@ -3051,6 +3341,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_language(BSTR* language) {
 //
 
 STDMETHODIMP BrowserAccessibilityWin::get_domText(BSTR* dom_text) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_DOM_TEXT);
   if (!instance_active())
     return E_FAIL;
 
@@ -3068,6 +3359,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_clippedSubstringBounds(
     int* out_y,
     int* out_width,
     int* out_height) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_CLIPPED_SUBSTRING_BOUNDS);
   // TODO(dmazzoni): fully support this API by intersecting the
   // rect with the container's rect.
   return get_unclippedSubstringBounds(
@@ -3081,6 +3373,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_unclippedSubstringBounds(
     int* out_y,
     int* out_width,
     int* out_height) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_UNCLIPPED_SUBSTRING_BOUNDS);
   if (!instance_active())
     return E_FAIL;
 
@@ -3105,6 +3398,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_unclippedSubstringBounds(
 STDMETHODIMP BrowserAccessibilityWin::scrollToSubstring(
     unsigned int start_index,
     unsigned int end_index) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_SCROLL_TO_SUBSTRING);
   if (!instance_active())
     return E_FAIL;
 
@@ -3122,6 +3416,7 @@ STDMETHODIMP BrowserAccessibilityWin::scrollToSubstring(
 }
 
 STDMETHODIMP BrowserAccessibilityWin::get_fontFamily(BSTR* font_family) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_FONT_FAMILY);
   if (!font_family)
     return E_INVALIDARG;
   *font_family = nullptr;
@@ -3146,6 +3441,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_fontFamily(BSTR* font_family) {
 STDMETHODIMP BrowserAccessibilityWin::QueryService(REFGUID guid_service,
                                                    REFIID riid,
                                                    void** object) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_QUERY_SERVICE);
   if (!instance_active())
     return E_FAIL;
 
@@ -3209,6 +3505,7 @@ BrowserAccessibilityWin::GetIAccessiblePair(IAccessible** acc, long* child_id) {
 }
 
 STDMETHODIMP BrowserAccessibilityWin::GetRuntimeId(SAFEARRAY** runtime_id) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_RUNTIME_ID);
   return E_NOTIMPL;
 }
 
@@ -3221,6 +3518,7 @@ BrowserAccessibilityWin::ConvertReturnedElement(
 
 STDMETHODIMP BrowserAccessibilityWin::GetPatternProvider(PATTERNID id,
                                                          IUnknown** provider) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_PATTERN_PROVIDER);
   DVLOG(1) << "In Function: " << __func__ << " for pattern id: " << id;
   if (id == UIA_ValuePatternId || id == UIA_TextPatternId) {
     if (HasState(ui::AX_STATE_EDITABLE)) {
@@ -3235,6 +3533,7 @@ STDMETHODIMP BrowserAccessibilityWin::GetPatternProvider(PATTERNID id,
 
 STDMETHODIMP BrowserAccessibilityWin::GetPropertyValue(PROPERTYID id,
                                                        VARIANT* ret) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_PROPERTY_VALUE);
   DVLOG(1) << "In Function: " << __func__ << " for property id: " << id;
   V_VT(ret) = VT_EMPTY;
   if (id == UIA_ControlTypePropertyId) {
@@ -3251,11 +3550,13 @@ STDMETHODIMP BrowserAccessibilityWin::GetPropertyValue(PROPERTYID id,
 
 STDMETHODIMP BrowserAccessibilityWin::get_ProviderOptions(
     ProviderOptions* ret) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_PROVIDER_OPTIONS);
   return E_NOTIMPL;
 }
 
 STDMETHODIMP BrowserAccessibilityWin::get_HostRawElementProvider(
     IRawElementProviderSimple** provider) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_HOST_RAW_ELEMENT_PROVIDER);
   return E_NOTIMPL;
 }
 
@@ -3947,6 +4248,7 @@ BrowserAccessibilityWin* BrowserAccessibilityWin::GetTargetFromChildID(
 HRESULT BrowserAccessibilityWin::GetStringAttributeAsBstr(
     ui::AXStringAttribute attribute,
     BSTR* value_bstr) {
+  WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_STRING_ATTRIBUTE_AS_BSTR);

[Mark P, 2016/09/15 23:36:56]

I thought this was the private method section.  Why are you logging this?  And
if so then what about some of the other private methods around here, e.g.
GetTargetFromChildID?

[dmazzoni, 2016/09/16 16:27:15]

Oops, good catch. This one was a mistake.

   base::string16 str;
 
   if (!GetString16Attribute(attribute, &str))