[Live caption] Enable entrypoint in settings page on all platforms

This reflects the change in plan to launch on all platforms.
While doing this change, also move the captions settings on non-Mac and
non-ChromeOS up above the More Features link. They should be at the
same place in the settings as the non-ChromeOS settings. The More
Features link should be the last option listed.

Bug: 1055150
Change-Id: Ib0d65756b0c23f7523e91a4e9508cf8d4ffa03e7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2138155Reviewed-by: Avi Drissman <avi@chromium.org>
Reviewed-by: Dominic Mazzoni <dmazzoni@chromium.org>
Commit-Queue: Abigail Klein <abigailbklein@google.com>
Cr-Commit-Position: refs/heads/master@{#756921}

chrome/browser/resources/settings/a11y_page/a11y_page.html

@@ -48,27 +48,27 @@
             sub-label="$i18n{accessibleImageLabelsSubtitle}">
         </settings-toggle-button>
 </if>
+<if expr="not is_macosx and not chromeos">
+        <template is="dom-if" route-path="/captions">
+          <settings-subpage
+              associated-control="[[$$('#captions')]]"
+              page-title="$i18n{captionsTitle}">
+            <settings-captions prefs="{{prefs}}"></settings-captions>
+          </settings-subpage>
+        </template>
+</if>
+        <template is="dom-if" if="[[enableLiveCaption_]]">
+          <settings-toggle-button
+              pref="{{prefs.accessibility.captions.live_caption_enabled}}"
+              label="$i18n{captionsEnableLiveCaptionTitle}"
+              sub-label="$i18n{captionsEnableLiveCaptionSubtitle}">
+          </settings-toggle-button>
+        </template>
         <cr-link-row class="hr" label="$i18n{moreFeaturesLink}"
             on-click="onMoreFeaturesLinkClick_" sub-label="$i18n{a11yWebStore}"
             external>
         </cr-link-row>
       </div>
-<if expr="not is_macosx and not chromeos">
-      <template is="dom-if" route-path="/captions">
-        <settings-subpage
-            associated-control="[[$$('#captions')]]"
-            page-title="$i18n{captionsTitle}">
-          <settings-captions prefs="{{prefs}}"></settings-captions>
-        </settings-subpage>
-      </template>
-      <template is="dom-if" if="[[enableLiveCaption_]]">
-        <settings-toggle-button
-            pref="{{prefs.accessibility.captions.live_caption_enabled}}"
-            label="$i18n{captionsEnableLiveCaptionTitle}"
-            sub-label="$i18n{captionsEnableLiveCaptionSubtitle}">
-        </settings-toggle-button>
-      </template>
-</if>
     </settings-animated-pages>
   </template>
   <script src="a11y_page.js"></script>