Fix todo's in AXPlatformNodeWin::get_accRole related to string results.

ui/accessibility/platform/ax_platform_node_win.cc

 // Copyright 2015 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 <atlbase.h>
 #include <atlcom.h>
 #include <limits.h>
 #include <oleacc.h>
 #include <stdint.h>
 
 #include "base/containers/hash_tables.h"
 #include "base/lazy_instance.h"
+#include "base/strings/string_util.h"
 #include "base/win/scoped_comptr.h"
 #include "base/win/scoped_variant.h"
 #include "third_party/iaccessible2/ia2_api_all.h"
 #include "ui/accessibility/ax_action_data.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/accessibility/ax_text_utils.h"
 #include "ui/accessibility/platform/ax_platform_node_delegate.h"
 #include "ui/accessibility/platform/ax_platform_node_win.h"
 #include "ui/base/win/atl_module.h"
 #include "ui/gfx/geometry/rect_conversions.h"
@@ skipping 473 matching lines @@
 }
 
 STDMETHODIMP AXPlatformNodeWin::get_accRole(
     VARIANT var_id, VARIANT* role) {
   AXPlatformNodeWin* target;
   COM_OBJECT_VALIDATE_VAR_ID_1_ARG_AND_GET_TARGET(var_id, role, target);
 
   // For historical reasons, we return a string (typically
   // containing the HTML tag name) as the MSAA role, rather
   // than a int.
-  std::string role_string = target->StringOverrideForMSAARole();
+  std::string role_string =
+      base::ToUpperASCII(target->StringOverrideForMSAARole());
   if (!role_string.empty()) {
     role->vt = VT_BSTR;
     std::wstring wsTmp(role_string.begin(), role_string.end());
     role->bstrVal = SysAllocString(wsTmp.c_str());
     return S_OK;
   }
 
   role->vt = VT_I4;
   role->lVal = target->MSAARole();
   return S_OK;
@@ skipping 856 matching lines @@
   std::string html_tag = GetData().GetStringAttribute(ui::AX_ATTR_HTML_TAG);
 
   switch (GetData().role) {
     case ui::AX_ROLE_BLOCKQUOTE:
     case ui::AX_ROLE_DEFINITION:
     case ui::AX_ROLE_IMAGE_MAP:
       return html_tag;
 
     case ui::AX_ROLE_CANVAS:
       if (GetData().GetBoolAttribute(ui::AX_ATTR_CANVAS_HAS_FALLBACK)) {
-        // TODO(dougt) why not just use the html_tag?
-        return "canvas";
+        return html_tag;
       }
       break;
 
     case ui::AX_ROLE_FORM:
-      // TODO(dougt) why not just use the html_tag?
+      // This could be a div with the role of form
+      // so we return just the string "form".
       return "form";
 
     case ui::AX_ROLE_HEADING:
       if (!html_tag.empty())
         return html_tag;
       break;
 
     case ui::AX_ROLE_PARAGRAPH:
-      // TODO(dougt) why not just use the html_tag and why upper case?
-      return "P";
+      return html_tag;
 
     case ui::AX_ROLE_GENERIC_CONTAINER:
       // TODO(dougt) why can't we always use div in this case?
       if (html_tag.empty())
         return "div";
       return html_tag;
 
     case ui::AX_ROLE_SWITCH:
       return "switch";
 
@@ skipping 197 matching lines @@
 
   AXPlatformNodeBase* base =
       FromNativeViewAccessible(node->GetNativeViewAccessible());
   if (base && !IsDescendant(base))
     base = nullptr;
 
   return static_cast<AXPlatformNodeWin*>(base);
 }
 
 }  // namespace ui