[OsSettingsLanguages] Fix input method options page route

Add feature flag to input and languages_v2 tests.

Bug: 1123964
Change-Id: I069b2d4f8648a36ab03bfc77c91dbc6737aac988
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2389140Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Commit-Queue: My Nguyen <myy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#803761}

chrome/browser/resources/settings/chromeos/os_route.js

@@ -229,6 +229,9 @@ cr.define('settings', function() {
           r.OS_LANGUAGES, mojom.LANGUAGES_SUBPAGE_PATH, Subpage.kLanguages);
       r.OS_LANGUAGES_INPUT = createSubpage(
           r.OS_LANGUAGES, mojom.INPUT_SUBPAGE_PATH, Subpage.kInput);
+      r.OS_LANGUAGES_INPUT_METHOD_OPTIONS = createSubpage(
+          r.OS_LANGUAGES_INPUT, mojom.INPUT_METHOD_OPTIONS_SUBPAGE_PATH,
+          Subpage.kInputMethodOptions);
     } else {
       r.OS_LANGUAGES_DETAILS = createSubpage(
           r.OS_LANGUAGES, mojom.LANGUAGES_AND_INPUT_DETAILS_SUBPAGE_PATH,

chrome/browser/ui/webui/settings/chromeos/languages_section.cc

@@ -436,6 +436,14 @@ void LanguagesSection::RegisterHierarchy(HierarchyGenerator* generator) const {
                                      mojom::Subpage::kLanguages);
     generator->RegisterNestedSetting(mojom::Setting::kShowInputOptionsInShelf,
                                      mojom::Subpage::kInput);
+
+    // Input method options.
+    generator->RegisterNestedSubpage(
+        IDS_SETTINGS_LANGUAGES_INPUT_METHOD_OPTIONS_TITLE,
+        mojom::Subpage::kInputMethodOptions, mojom::Subpage::kInput,
+        mojom::SearchResultIcon::kGlobe,
+        mojom::SearchResultDefaultRank::kMedium,
+        mojom::kInputMethodOptionsSubpagePath);
   } else {
     static constexpr mojom::Setting kLanguagesAndInputDetailsSettings[] = {
         mojom::Setting::kAddLanguage,
@@ -443,6 +451,15 @@ void LanguagesSection::RegisterHierarchy(HierarchyGenerator* generator) const {
     };
     RegisterNestedSettingBulk(mojom::Subpage::kLanguagesAndInputDetails,
                               kLanguagesAndInputDetailsSettings, generator);
+
+    // Input method options.
+    generator->RegisterNestedSubpage(
+        IDS_SETTINGS_LANGUAGES_INPUT_METHOD_OPTIONS_TITLE,
+        mojom::Subpage::kInputMethodOptions,
+        mojom::Subpage::kLanguagesAndInputDetails,
+        mojom::SearchResultIcon::kGlobe,
+        mojom::SearchResultDefaultRank::kMedium,
+        mojom::kInputMethodOptionsSubpagePath);
   }
 
   // Manage input methods.
@@ -453,14 +470,6 @@ void LanguagesSection::RegisterHierarchy(HierarchyGenerator* generator) const {
       mojom::SearchResultIcon::kGlobe, mojom::SearchResultDefaultRank::kMedium,
       mojom::kManageInputMethodsSubpagePath);
 
-  // Input method options.
-  generator->RegisterNestedSubpage(
-      IDS_SETTINGS_LANGUAGES_INPUT_METHOD_OPTIONS_TITLE,
-      mojom::Subpage::kInputMethodOptions,
-      mojom::Subpage::kLanguagesAndInputDetails,
-      mojom::SearchResultIcon::kGlobe, mojom::SearchResultDefaultRank::kMedium,
-      mojom::kInputMethodOptionsSubpagePath);
-
   // Smart inputs.
   generator->RegisterTopLevelSubpage(
       IDS_SETTINGS_SUGGESTIONS_TITLE, mojom::Subpage::kSmartInputs,

chrome/test/data/webui/settings/chromeos/os_settings_browsertest.js

@@ -1568,6 +1568,11 @@ var OSSettingsLanguagesPageV2Test = class extends OSSettingsBrowserTest {
         'chromeos/os_languages_page/os_languages_page_v2.html';
   }
 
+  /** @override */
+  get featureList() {
+    return {enabled: ['chromeos::features::kLanguageSettingsUpdate']};
+  }
+
   /** @override */
   get extraLibraries() {
     return super.extraLibraries.concat([
@@ -1638,6 +1643,11 @@ var OSSettingsInputPageTest = class extends OSSettingsBrowserTest {
     return super.browsePreload + 'chromeos/os_language_page/input_page.html';
   }
 
+  /** @override */
+  get featureList() {
+    return {enabled: ['chromeos::features::kLanguageSettingsUpdate']};
+  }
+
   /** @override */
   get extraLibraries() {
     return super.extraLibraries.concat([

chrome/test/data/webui/settings/chromeos/os_settings_v3_browsertest.js

@@ -36,11 +36,46 @@ var OSSettingsV3BrowserTest = class extends PolymerTest {
   }
 };
 
+// eslint-disable-next-line no-var
+var OSSettingsInputPageV3Test = class extends OSSettingsV3BrowserTest {
+  /** @override */
+  get browsePreload() {
+    return 'chrome://os-settings/test_loader.html?module=settings/chromeos/input_page_test.m.js';
+  }
+
+  /** @override */
+  get featureList() {
+    return {
+      enabled: super.featureList.enabled.concat(
+          ['chromeos::features::kLanguageSettingsUpdate'])
+    };
+  }
+};
+
+TEST_F('OSSettingsInputPageV3Test', 'All', () => mocha.run());
+
+// eslint-disable-next-line no-var
+var OSSettingsOsLanguagesPageV2V3Test = class extends OSSettingsV3BrowserTest {
+  /** @override */
+  get browsePreload() {
+    return 'chrome://os-settings/test_loader.html?module=settings/chromeos/os_languages_page_v2_tests.m.js';
+  }
+
+  /** @override */
+  get featureList() {
+    return {
+      enabled: super.featureList.enabled.concat(
+          ['chromeos::features::kLanguageSettingsUpdate'])
+    };
+  }
+};
+
+TEST_F('OSSettingsOsLanguagesPageV2V3Test', 'All', () => mocha.run());
+
 [['AmbientModePage', 'ambient_mode_page_test.m.js'],
  ['BluetoothPage', 'bluetooth_page_tests.m.js'],
  ['DateTimePage', 'date_time_page_tests.m.js'],
  ['InputMethodOptionPage', 'input_method_options_page_test.m.js'],
- ['InputPage', 'input_page_test.m.js'],
  ['LocalizedLink', 'localized_link_test.m.js'],
  ['MultideviceFeatureItem', 'multidevice_feature_item_tests.m.js'],
  ['MultideviceFeatureToggle', 'multidevice_feature_toggle_tests.m.js'],
@@ -48,7 +83,6 @@ var OSSettingsV3BrowserTest = class extends PolymerTest {
  ['MultideviceSmartLockSubPage', 'multidevice_smartlock_subpage_test.m.js'],
  ['MultideviceSubPage', 'multidevice_subpage_tests.m.js'],
  ['OsLanguagesPage', 'os_languages_page_tests.m.js'],
- ['OsLanguagesPageV2', 'os_languages_page_v2_tests.m.js'],
  ['NearbyShareReceiveDialog', 'nearby_share_receive_dialog_tests.m.js'],
  ['NearbyShareSubPage', 'nearby_share_subpage_tests.m.js'],
  ['ParentalControlsPage', 'parental_controls_page_test.m.js'],