Revert "Make HTML5 <mark> accessible."

This reverts commit cfc36461f4cdfd039355ff39b6a5cc64dab63ce3.

Cr-Commit-Position: refs/branch-heads/2436@{#11}
Cr-Branched-From: e8ebe017f7a9f039749b395bcbefe8f699263528-refs/heads/master@{#335190}

12 files changed, 33 insertions, 55 deletions

diff --git a/chrome/common/extensions/api/automation.idl b/chrome/common/extensions/api/automation.idl
index b49c3a5..426163e 100644
--- a/chrome/common/extensions/api/automation.idl
+++ b/chrome/common/extensions/api/automation.idl
@@ -114,7 +114,6 @@
     locationBar,
     log,
     main,
-    mark,
     marquee,
     math,
     menuBar,
diff --git a/components/test_runner/web_ax_object_proxy.cc b/components/test_runner/web_ax_object_proxy.cc
index 4ed30f2..125507b 100644
--- a/components/test_runner/web_ax_object_proxy.cc
+++ b/components/test_runner/web_ax_object_proxy.cc
@@ -132,8 +132,6 @@ std::string RoleToString(blink::WebAXRole role)
       return result.append("Log");
     case blink::WebAXRoleMain:
       return result.append("Main");
-    case blink::WebAXRoleMark:
-      return result.append("Mark");
     case blink::WebAXRoleMarquee:
       return result.append("Marquee");
     case blink::WebAXRoleMath:
diff --git a/content/app/strings/content_strings.grd b/content/app/strings/content_strings.grd
index 64fbc02..e853a97 100644
--- a/content/app/strings/content_strings.grd
+++ b/content/app/strings/content_strings.grd
@@ -335,9 +335,6 @@ below:
         <ph name="WEEK">$1<ex>Week 38, 2014</ex></ph>, starting on <ph name="WEEK_START_DATE">$2<ex>September 15, 2014</ex></ph>
       </message>
 
-      <message name="IDS_AX_ROLE_ADDRESS" desc="accessibility role description for an address (as in a person's contact information)">
-        address
-      </message>
       <message name="IDS_AX_ROLE_ARTICLE" desc="accessibility role description for article">
         article
       </message>
@@ -356,11 +353,26 @@ below:
       <message name="IDS_AX_ROLE_DESCRIPTION_TERM" desc="accessibility role description for description term(as in a description list)">
         term
       </message>
+      <message name="IDS_AX_ROLE_WEB_AREA" desc="accessibility role description for web area">
+        HTML content
+      </message>
+      <message name="IDS_AX_ROLE_LINK" desc="accessibility role description for link">
+        link
+      </message>
+      <message name="IDS_AX_ROLE_LIST_MARKER" desc="accessibility role description for list marker">
+        list marker
+      </message>
+      <message name="IDS_AX_ROLE_IMAGE_MAP" desc="accessibility role description for image map">
+        image map
+      </message>
+      <message name="IDS_AX_ROLE_HEADING" desc="accessibility role description for headings">
+        heading
+      </message>
       <message name="IDS_AX_ROLE_FIGURE" desc="accessibility role description for figure">
         figure
       </message>
-      <message name="IDS_AX_ROLE_FORM" desc="accessibility role description for form">
-        form
+      <message name="IDS_AX_ROLE_REGION" desc="accessibility role description for region">
+        region
       </message>
       <if expr="is_macosx">
         <message name="IDS_AX_ROLE_FOOTER" desc="accessibility role description for footers">
@@ -373,45 +385,30 @@ below:
           toggle button
         </message>
       </if>
-      <message name="IDS_AX_ROLE_HEADING" desc="accessibility role description for headings">
-        heading
-      </message>
-      <message name="IDS_AX_ROLE_IMAGE_MAP" desc="accessibility role description for image map">
-        image map
-      </message>
-      <message name="IDS_AX_ROLE_LINK" desc="accessibility role description for link">
-        link
-      </message>
-      <message name="IDS_AX_ROLE_LIST_MARKER" desc="accessibility role description for list marker">
-        list marker
+      <message name="IDS_AX_ROLE_ADDRESS" desc="accessibility role description for an address (as in a person's contact information)">
+        address
       </message>
       <message name="IDS_AX_ROLE_MAIN_CONTENT" desc="accessibility role description for main content of the document.">
         main
       </message>
-      <message name="IDS_AX_ROLE_MARK" desc="accessibility role description for highlighted content.">
-        highlighted content
-      </message>
-      <message name="IDS_AX_ROLE_MATH" desc="accessibility role description for math">
-        math
-      </message>
       <message name="IDS_AX_ROLE_NAVIGATIONAL_LINK" desc="accessibility role description for group of navigational links.">
         navigation
       </message>
-      <message name="IDS_AX_ROLE_REGION" desc="accessibility role description for region">
-        region
+      <message name="IDS_AX_ROLE_FORM" desc="accessibility role description for form">
+        form
       </message>
-      <message name="IDS_AX_ROLE_SEARCH_BOX" desc="accessibility role description for search text field">
-        search text field
+      <message name="IDS_AX_ROLE_MATH" desc="accessibility role description for math">
+        math
       </message>
       <message name="IDS_AX_ROLE_STATUS" desc="accessibility role description for status">
         status
       </message>
+      <message name="IDS_AX_ROLE_SEARCH_BOX" desc="accessibility role description for search text field">
+        search text field
+      </message>
       <message name="IDS_AX_ROLE_SWITCH" desc="accessibility role description for switch">
         switch
       </message>
-      <message name="IDS_AX_ROLE_WEB_AREA" desc="accessibility role description for web area">
-        HTML content
-      </message>
 
       <message name="IDS_AX_BUTTON_ACTION_VERB" desc="Verb stating the action that will occur when a button is pressed, as used by accessibility.">
         press
diff --git a/content/browser/accessibility/browser_accessibility_cocoa.mm b/content/browser/accessibility/browser_accessibility_cocoa.mm
index b2fef33..2b5903b 100644
--- a/content/browser/accessibility/browser_accessibility_cocoa.mm
+++ b/content/browser/accessibility/browser_accessibility_cocoa.mm
@@ -971,9 +971,6 @@ bool InitializeAccessibilityTreeSearch(
   case ui::AX_ROLE_MAIN:
     return base::SysUTF16ToNSString(content_client->GetLocalizedString(
         IDS_AX_ROLE_MAIN_CONTENT));
-  case ui::AX_ROLE_MARK:
-    return base::SysUTF16ToNSString(content_client->GetLocalizedString(
-        IDS_AX_ROLE_MARK));
   case ui::AX_ROLE_MATH:
     return base::SysUTF16ToNSString(content_client->GetLocalizedString(
         IDS_AX_ROLE_MATH));
diff --git a/content/browser/accessibility/browser_accessibility_win.cc b/content/browser/accessibility/browser_accessibility_win.cc
index 285f99d..3c79052 100644
--- a/content/browser/accessibility/browser_accessibility_win.cc
+++ b/content/browser/accessibility/browser_accessibility_win.cc
@@ -4120,10 +4120,6 @@ void BrowserAccessibilityWin::InitRoleAndState() {
       ia_role = ROLE_SYSTEM_GROUPING;
       ia2_role = IA2_ROLE_PARAGRAPH;
       break;
-    case ui::AX_ROLE_MARK:
-      ia_role = ROLE_SYSTEM_TEXT;
-      ia2_role = IA2_ROLE_TEXT_FRAME;
-      break;
     case ui::AX_ROLE_MARQUEE:
       ia_role = ROLE_SYSTEM_ANIMATION;
       break;
diff --git a/content/browser/accessibility/dump_accessibility_tree_browsertest.cc b/content/browser/accessibility/dump_accessibility_tree_browsertest.cc
index bae4365..288e6e4 100644
--- a/content/browser/accessibility/dump_accessibility_tree_browsertest.cc
+++ b/content/browser/accessibility/dump_accessibility_tree_browsertest.cc
@@ -965,7 +965,7 @@ IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityMain) {
   RunHtmlTest(FILE_PATH_LITERAL("main.html"));
 }
 
-IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityMark) {
+IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, DISABLED_AccessibilityMark) {
   RunHtmlTest(FILE_PATH_LITERAL("mark.html"));
 }
 
diff --git a/content/renderer/accessibility/blink_ax_enum_conversion.cc b/content/renderer/accessibility/blink_ax_enum_conversion.cc
index a48994a..376426b 100644
--- a/content/renderer/accessibility/blink_ax_enum_conversion.cc
+++ b/content/renderer/accessibility/blink_ax_enum_conversion.cc
@@ -205,8 +205,6 @@ ui::AXRole AXRoleFromBlink(blink::WebAXRole role) {
       return ui::AX_ROLE_MAIN;
     case blink::WebAXRoleMarquee:
       return ui::AX_ROLE_MARQUEE;
-    case blink::WebAXRoleMark:
-      return ui::AX_ROLE_MARK;
     case blink::WebAXRoleMath:
       return ui::AX_ROLE_MATH;
     case blink::WebAXRoleMenu:
diff --git a/content/test/data/accessibility/html/mark-expected-mac.txt b/content/test/data/accessibility/html/mark-expected-mac.txt
index c275b85..41895ea 100644
--- a/content/test/data/accessibility/html/mark-expected-mac.txt
+++ b/content/test/data/accessibility/html/mark-expected-mac.txt
@@ -1,6 +1,5 @@
-AXWebArea AXRoleDescription='HTML content'
-++AXGroup AXRoleDescription='group'
-++++AXStaticText AXRoleDescription='text' AXValue='This test is to check '
-++++AXGroup AXRoleDescription='highlighted content'
-++++++AXStaticText AXRoleDescription='text' AXValue='mark tag'
-++++AXStaticText AXRoleDescription='text' AXValue='.'
+AXWebArea
+++AXGroup
+++++AXStaticText AXValue='This test is to check '
+++++AXStaticText AXValue='mark tag'
+++++AXStaticText AXValue='.'
diff --git a/content/test/data/accessibility/html/mark-expected-win.txt b/content/test/data/accessibility/html/mark-expected-win.txt
index 03e6f81..902f229 100644
--- a/content/test/data/accessibility/html/mark-expected-win.txt
+++ b/content/test/data/accessibility/html/mark-expected-win.txt
@@ -1,6 +1,5 @@
 ROLE_SYSTEM_DOCUMENT READONLY FOCUSABLE
 ++IA2_ROLE_PARAGRAPH
 ++++ROLE_SYSTEM_STATICTEXT name='This test is to check '
-++++IA2_ROLE_TEXT_FRAME
-++++++ROLE_SYSTEM_STATICTEXT name='mark tag'
+++++ROLE_SYSTEM_STATICTEXT name='mark tag'
 ++++ROLE_SYSTEM_STATICTEXT name='.'
diff --git a/content/test/data/accessibility/html/mark.html b/content/test/data/accessibility/html/mark.html
index 0ec7cdc..5afffec 100644
--- a/content/test/data/accessibility/html/mark.html
+++ b/content/test/data/accessibility/html/mark.html
@@ -1,6 +1,3 @@
-<!--
-@MAC-ALLOW:AXRole*
--->
 <!DOCTYPE html>
 <html>
 <body>
diff --git a/ui/accessibility/ax_enums.idl b/ui/accessibility/ax_enums.idl
index da88a54..c6fead9 100644
--- a/ui/accessibility/ax_enums.idl
+++ b/ui/accessibility/ax_enums.idl
@@ -125,7 +125,6 @@
     location_bar,
     log,
     main,
-    mark,
     marquee,
     math,
     menu_bar,
diff --git a/ui/accessibility/platform/ax_platform_node_mac.mm b/ui/accessibility/platform/ax_platform_node_mac.mm
index dd6ae35..3bfa7b0 100644
--- a/ui/accessibility/platform/ax_platform_node_mac.mm
+++ b/ui/accessibility/platform/ax_platform_node_mac.mm
@@ -77,7 +77,6 @@ RoleMap BuildRoleMap() {
       {ui::AX_ROLE_LIST_MARKER, @"AXListMarker"},
       {ui::AX_ROLE_LOG, NSAccessibilityGroupRole},
       {ui::AX_ROLE_MAIN, NSAccessibilityGroupRole},
-      {ui::AX_ROLE_MARK, NSAccessibilityGroupRole},
       {ui::AX_ROLE_MARQUEE, NSAccessibilityGroupRole},
       {ui::AX_ROLE_MATH, NSAccessibilityGroupRole},
       {ui::AX_ROLE_MENU, NSAccessibilityMenuRole},