[CrOS settings] Migrate os_languages_page to polymer3

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

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

@@ -6,13 +6,15 @@
 // import './date_time_page/date_time_page.m.js';
 // import './os_a11y_page/os_a11y_page.m.js';
 // import './os_files_page/os_files_page.m.js';
-// import './os_languages_page/os_languages_section.m.js';
+import './os_languages_page/input_method_options_page.m.js';
+import './os_languages_page/os_languages_page.m.js';
+import './os_languages_page/os_languages_section.m.js';
+import './os_languages_page/smart_inputs_page.m.js';
 // import './os_printing_page/os_printing_page.m.js';
 import './os_privacy_page/os_privacy_page.m.js';
 import './os_reset_page/os_reset_page.m.js';
 import './os_reset_page/os_powerwash_dialog.m.js';
 import './os_reset_page/os_reset_page.m.js';
 
-// clang-format off
+export {LanguagesBrowserProxy, LanguagesBrowserProxyImpl} from '../languages_page/languages_browser_proxy.m.js';
 export {OsResetBrowserProxyImpl} from './os_reset_page/os_reset_browser_proxy.m.js';
-// clang-format on

chrome/browser/resources/settings/chromeos/os_languages_page/BUILD.gn

@@ -15,6 +15,7 @@ js_type_check("closure_compile") {
     ":os_add_languages_dialog",
     ":os_languages_page",
     ":os_languages_section",
+    ":smart_inputs_page",
     "../../languages_page:languages",
     "../../languages_page:languages_browser_proxy",
     "../../languages_page:languages_types",
@@ -96,32 +97,39 @@ js_library("os_add_languages_dialog") {
   ]
 }
 
-# TODO: Uncomment as the Polymer3 migration makes progress.
+js_library("smart_inputs_page") {
+  deps = [
+    "../../prefs:prefs_behavior",
+    "//ui/webui/resources/js:load_time_data",
+  ]
+}
+
 js_type_check("closure_compile_module") {
   is_polymer3 = true
   deps = [
-    #    ":input_method_options_page.m",
-    #    ":input_method_util.m",
+    ":input_method_options_page.m",
+    ":input_method_util.m",
     ":languages_metrics_proxy.m",
-    #    ":manage_input_methods_page.m",
-    #    ":os_add_languages_dialog.m",
-    #    ":os_languages_page.m",
-    #    ":os_languages_section.m"
+    ":manage_input_methods_page.m",
+    ":os_add_languages_dialog.m",
+    ":os_languages_page.m",
+    ":os_languages_section.m",
+    ":smart_inputs_page.m",
   ]
 }
 
 js_library("input_method_util.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_languages_page/input_method_util.m.js" ]
-  deps = [
-    # TODO: Fill those in.
-  ]
+  deps = [ "//ui/webui/resources/js:cr.m" ]
   extra_deps = [ ":modulize" ]
 }
 
 js_library("input_method_options_page.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_languages_page/input_method_options_page.m.js" ]
   deps = [
-    # TODO: Fill those in.
+    ":input_method_util.m",
+    "../../prefs:prefs.m",
+    "//ui/webui/resources/js:i18n_behavior.m",
   ]
   extra_deps = [ ":input_method_options_page_module" ]
 }
@@ -135,16 +143,18 @@ js_library("languages_metrics_proxy.m") {
 
 js_library("manage_input_methods_page.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_languages_page/manage_input_methods_page.m.js" ]
-  deps = [
-    # TODO: Fill those in.
-  ]
+  deps = [ "//ui/webui/resources/js:cr.m" ]
   extra_deps = [ ":manage_input_methods_page_module" ]
 }
 
 js_library("os_add_languages_dialog.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_languages_page/os_add_languages_dialog.m.js" ]
   deps = [
-    # TODO: Fill those in.
+    "../../languages_page:languages.m",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/cr_elements:cr_scrollable_behavior.m",
+    "//ui/webui/resources/cr_elements/cr_search_field:cr_search_field.m",
+    "//ui/webui/resources/js:find_shortcut_behavior.m",
   ]
   extra_deps = [ ":os_add_languages_dialog_module" ]
 }
@@ -152,7 +162,21 @@ js_library("os_add_languages_dialog.m") {
 js_library("os_languages_page.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_languages_page/os_languages_page.m.js" ]
   deps = [
-    # TODO: Fill those in.
+    ":input_method_util.m",
+    ":languages_metrics_proxy.m",
+    "..:metrics_recorder.m",
+    "..:os_route.m",
+    "../..:i18n_setup",
+    "../..:lifetime_browser_proxy.m",
+    "../..:router.m",
+    "../localized_link:localized_link.m",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/cr_elements/cr_action_menu:cr_action_menu.m",
+    "//ui/webui/resources/cr_elements/cr_expand_button:cr_expand_button.m",
+    "//ui/webui/resources/cr_elements/cr_lazy_render:cr_lazy_render.m",
+    "//ui/webui/resources/js:assert.m",
+    "//ui/webui/resources/js:cr.m",
+    "//ui/webui/resources/js/cr/ui:focus_without_ink.m",
   ]
   extra_deps = [ ":os_languages_page_module" ]
 }
@@ -160,11 +184,31 @@ js_library("os_languages_page.m") {
 js_library("os_languages_section.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_languages_page/os_languages_section.m.js" ]
   deps = [
-    # TODO: Fill those in.
+    ":input_method_options_page.m",
+    ":manage_input_methods_page.m",
+    ":os_languages_page.m",
+    "..:os_route.m",
+    "../..:router.m",
+    "../../languages_page:languages.m",
+    "../../settings_page:settings_animated_pages.m",
+    "../../settings_page:settings_subpage.m",
+    "//ui/webui/resources/js:assert.m",
+    "//ui/webui/resources/js:cr.m",
+    "//ui/webui/resources/js:load_time_data.m",
+    "//ui/webui/resources/js/cr/ui:focus_without_ink.m",
   ]
   extra_deps = [ ":os_languages_section_module" ]
 }
 
+js_library("smart_inputs_page.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_languages_page/smart_inputs_page.m.js" ]
+  deps = [
+    "../../prefs:prefs_behavior.m",
+    "//ui/webui/resources/js:load_time_data.m",
+  ]
+  extra_deps = [ ":smart_inputs_page_module" ]
+}
+
 import("//tools/polymer/polymer.gni")
 
 group("polymer3_elements") {
@@ -175,6 +219,9 @@ group("polymer3_elements") {
     ":os_add_languages_dialog_module",
     ":os_languages_page_module",
     ":os_languages_section_module",
+    ":smart_inputs_page_module",
+    "../../languages_page:languages_module",
+    "../../languages_page:modulize",
   ]
 }
 
@@ -182,30 +229,54 @@ polymer_modulizer("manage_input_methods_page") {
   js_file = "manage_input_methods_page.js"
   html_file = "manage_input_methods_page.html"
   html_type = "dom-module"
+  migrated_imports = settings_migrated_imports
+  namespace_rewrites = os_settings_namespace_rewrites
+  auto_imports = os_settings_auto_imports
 }
 
 polymer_modulizer("os_add_languages_dialog") {
   js_file = "os_add_languages_dialog.js"
   html_file = "os_add_languages_dialog.html"
   html_type = "dom-module"
+  migrated_imports = settings_migrated_imports
+  namespace_rewrites = os_settings_namespace_rewrites
+  auto_imports = os_settings_auto_imports
 }
 
 polymer_modulizer("os_languages_page") {
   js_file = "os_languages_page.js"
   html_file = "os_languages_page.html"
   html_type = "dom-module"
+  migrated_imports = settings_migrated_imports
+  namespace_rewrites = os_settings_namespace_rewrites
+  auto_imports = os_settings_auto_imports
 }
 
 polymer_modulizer("os_languages_section") {
   js_file = "os_languages_section.js"
   html_file = "os_languages_section.html"
   html_type = "dom-module"
+  migrated_imports = settings_migrated_imports
+  namespace_rewrites = os_settings_namespace_rewrites
+  auto_imports = os_settings_auto_imports
 }
 
 polymer_modulizer("input_method_options_page") {
   js_file = "input_method_options_page.js"
   html_file = "input_method_options_page.html"
   html_type = "dom-module"
+  migrated_imports = settings_migrated_imports
+  namespace_rewrites = os_settings_namespace_rewrites
+  auto_imports = os_settings_auto_imports
+}
+
+polymer_modulizer("smart_inputs_page") {
+  js_file = "smart_inputs_page.js"
+  html_file = "smart_inputs_page.html"
+  html_type = "dom-module"
+  migrated_imports = settings_migrated_imports
+  namespace_rewrites = os_settings_namespace_rewrites
+  auto_imports = os_settings_auto_imports
 }
 
 js_modulizer("modulize") {

chrome/browser/resources/settings/chromeos/os_languages_page/input_method_options_page.html

@@ -2,7 +2,11 @@
 
 <link rel="import" href="chrome://resources/cr_elements/md_select_css.html">
 <link rel="import" href="chrome://resources/cr_elements/cr_toggle/cr_toggle.html">
+<link rel="import" href="chrome://resources/html/assert.html">
+<link rel="import" href="chrome://resources/html/i18n_behavior.html">
 <link rel="import" href="input_method_util.html">
+<link rel="import" href="../os_route.html">
+<link rel="import" href="../../router.html">
 <link rel="import" href="../../settings_shared_css.html">
 <link rel="import" href="../../prefs/prefs_behavior.html">
 

chrome/browser/resources/settings/chromeos/os_languages_page/input_method_util.js

@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+// #import {assert, assertNotReached} from 'chrome://resources/js/assert.m.js';
+
 /**
  * @fileoverview constants related to input method options.
  */
@@ -10,7 +12,7 @@ cr.define('settings.input_method_util', function() {
    * The prefix string shared by all first party input method ID.
    * @private @const
    */
-  const FIRST_PARTY_INPUT_METHOD_ID_PREFIX =
+  /* #export */ const FIRST_PARTY_INPUT_METHOD_ID_PREFIX =
       '_comp_ime_jkghodnilhceideoidjikpgommlajknk';
 
   /**
@@ -44,7 +46,7 @@ cr.define('settings.input_method_util', function() {
    *
    * @enum {string}
    */
-  const OptionType = {
+  /* #export */ const OptionType = {
     EDIT_USER_DICT: 'editUserDict',
     ENABLE_COMPLETION: 'enableCompletion',
     ENABLE_DOUBLE_SPACE_PERIOD: 'enableDoubleSpacePeriod',

chrome/browser/resources/settings/chromeos/os_languages_page/os_languages_page.html

@@ -14,19 +14,16 @@
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
 <link rel="import" href="chrome://resources/cr_elements/cr_action_menu/cr_action_menu.html">
 <link rel="import" href="chrome://resources/cr_elements/cr_lazy_render/cr_lazy_render.html">
-<link rel="import" href="chrome://resources/cr_elements/cr_toggle/cr_toggle.html">
 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_indicator.html">
-<link rel="import" href="chrome://resources/cr_elements/icons.html">
 <link rel="import" href="input_method_util.html">
 <link rel="import" href="languages_metrics_proxy.html">
 <link rel="import" href="os_add_languages_dialog.html">
 <link rel="import" href="../localized_link/localized_link.html">
-<link rel="import" href="../../controls/controlled_radio_button.html">
-<link rel="import" href="../../controls/settings_radio_group.html">
 <link rel="import" href="../../controls/settings_toggle_button.html">
 <link rel="import" href="../../lifetime_browser_proxy.html">
 <link rel="import" href="../../prefs/prefs_behavior.html">
 <link rel="import" href="../os_route.html">
+<link rel="import" href="../../i18n_setup.html">
 <link rel="import" href="../../router.html">
 <link rel="import" href="../../settings_shared_css.html">
 <link rel="import" href="../../settings_vars_css.html">

chrome/browser/resources/settings/chromeos/os_settings.gni

@@ -22,10 +22,23 @@ os_settings_namespace_rewrites = settings_namespace_rewrites +
                                    "settings.FingerprintResultType|FingerprintResultType",
                                    "settings.FingerprintScan|FingerprintScan",
                                    "settings.FingerprintSetupStep|FingerprintSetupStep",
+                                   "settings.input_method_util.generateOptions|generateOptions",
+                                   "settings.input_method_util.getFirstPartyInputMethodEngineId|getFirstPartyInputMethodEngineId",
+                                   "settings.input_method_util.getOptionLabelName|getOptionLabelName",
+                                   "settings.input_method_util.getOptionMenuItems|getOptionMenuItems",
+                                   "settings.input_method_util.getOptionUiType|getOptionUiType",
+                                   "settings.input_method_util.getOptionUrl|getOptionUrl",
+                                   "settings.input_method_util.hasOptionsPageInSettings|hasOptionsPageInSettings",
+                                   "settings.input_method_util.InputToolCode|InputToolCode",
+                                   "settings.input_method_util.isNumberValue|isNumberValue",
+                                   "settings.input_method_util.OPTION_DEFAULT|OPTION_DEFAULT",
+                                   "settings.input_method_util.OptionType|OptionType",
+                                   "settings.input_method_util.UiType|UiType",
                                    "settings.KerberosAccount|KerberosAccount",
                                    "settings.KerberosAccountsBrowserProxy|KerberosAccountsBrowserProxy",
                                    "settings.KerberosConfigErrorCode|KerberosConfigErrorCode",
                                    "settings.KerberosErrorType|KerberosErrorType",
+                                   "settings.kMenuCloseDelay|kMenuCloseDelay",
                                    "settings.LanguagesMetricsProxy|LanguagesMetricsProxy",
                                    "settings.LanguagesPageInteraction|LanguagesPageInteraction",
                                    "settings.MultiDeviceBrowserProxy|MultiDeviceBrowserProxy",
@@ -40,6 +53,7 @@ os_settings_namespace_rewrites = settings_namespace_rewrites +
                                    "settings.recordSettingChange|recordSettingChange",
                                    "settings.Route|Route",
                                    "settings.RouteObserverBehavior|RouteObserverBehavior",
+                                   "settings.Router|Router",
                                    "settings.routes|routes",
                                    "settings.SmartLockSignInEnabledState|SmartLockSignInEnabledState",
                                    "settings.ValidateKerberosConfigResult|ValidateKerberosConfigResult",
@@ -56,6 +70,9 @@ os_settings_auto_imports = settings_auto_imports +
                              "chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_browser_proxy.html|MultiDeviceBrowserProxy,MultiDeviceBrowserProxyImpl",
                              "chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_constants.html|MultiDeviceSettingsMode,MultiDeviceFeature,MultiDeviceFeatureState,MultiDevicePageContentData,SmartLockSignInEnabledState",
                              "chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_feature_behavior.html|MultiDeviceFeatureBehavior",
+                             "chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_browser_proxy.html|MultiDeviceBrowserProxy,MultiDeviceBrowserProxyImpl",
+                             "chrome/browser/resources/settings/chromeos/os_languages_page/input_method_util.html|generateOptions,getFirstPartyInputMethodEngineId,getOptionLabelName,getOptionMenuItems,getOptionUiType,getOptionUrl,hasOptionsPageInSettings,InputToolCode,isNumberValue,OPTION_DEFAULT,OptionType,UiType",
+                             "chrome/browser/resources/settings/chromeos/os_languages_page/languages_metrics_proxy.html|LanguagesMetricsProxy, LanguagesMetricsProxyImpl, LanguagesPageInteraction",
                              "chrome/browser/resources/settings/chromeos/os_people_page/fingerprint_browser_proxy.html|FingerprintInfo,FingerprintBrowserProxy,FingerprintResultType,FingerprintBrowserProxyImpl,FingerprintAttempt,FingerprintScan",
                              "chrome/browser/resources/settings/chromeos/os_people_page/kerberos_accounts_browser_proxy.html|KerberosAccount,KerberosAccountsBrowserProxyImpl,KerberosAccountsBrowserProxy,KerberosErrorType,KerberosConfigErrorCode,ValidateKerberosConfigResult",
                              "chrome/browser/resources/settings/chromeos/os_people_page/lock_state_behavior.html|LockScreenUnlockType,LockStateBehaviorImpl,LockStateBehavior",
@@ -75,9 +92,10 @@ os_settings_auto_imports = settings_auto_imports +
                              "chrome/browser/resources/settings/people_page/sync_browser_proxy.html|SyncBrowserProxyImpl,SyncBrowserProxy,StatusAction,SyncStatus",
                              "chrome/browser/resources/settings/route.html|routes",
                              "chrome/browser/resources/settings/router.html|Router,Route,RouteObserverBehavior",
+                             "ui/webui/resources/html/assert.html|assert,assertNotReached",
                              "ui/webui/resources/html/cr.html|sendWithPromise",
                              "ui/webui/resources/html/icon.html|getImage",
-                             "ui/webui/resources/html/polymer.html|Polymer,html,flush, afterNextRender",
+                             "ui/webui/resources/html/polymer.html|afterNextRender,Polymer,html,flush",
                            ]
 
 os_settings_migrated_imports = settings_migrated_imports

chrome/browser/resources/settings/chromeos/os_settings_resources_v3.grdp

@@ -67,6 +67,58 @@
            use_base_dir="false"
            compress="false"
            type="BINDATA" />
+  <include name="IDR_OS_SETTINGS_LANGUAGES_PAGE_LANGUAGES_BROWSER_PROXY_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/languages_page/languages_browser_proxy.m.js"
+           use_base_dir="false"
+           compress="false"
+           preprocess="true"
+           type="BINDATA" />
+  <include name="IDR_OS_SETTINGS_LANGUAGES_PAGE_LANGUAGES_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/languages_page/languages.m.js"
+           use_base_dir="false"
+           compress="false"
+           preprocess="true"
+           type="BINDATA" />
+  <include name="IDR_OS_SETTINGS_LANGUAGES_PAGE_OS_ADD_LANGUAGES_DIALOG_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/os_languages_page/os_add_languages_dialog.m.js"
+           use_base_dir="false"
+           compress="false"
+           type="BINDATA" />
+  <include name="IDR_OS_SETTINGS_LANGUAGES_PAGE_OS_INPUT_METHOD_OPTIONS_PAGE_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/os_languages_page/input_method_options_page.m.js"
+           use_base_dir="false"
+           compress="false"
+           type="BINDATA" />
+  <include name="IDR_OS_SETTINGS_LANGUAGES_PAGE_OS_INPUT_METHOD_UTIL_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/os_languages_page/input_method_util.m.js"
+           use_base_dir="false"
+           compress="false"
+           type="BINDATA" />
+  <include name="IDR_OS_SETTINGS_LANGUAGES_PAGE_OS_MANAGE_INPUT_METHODS_PAGE_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/os_languages_page/manage_input_methods_page.m.js"
+           use_base_dir="false"
+           compress="false"
+           type="BINDATA" />
+  <include name="IDR_OS_SETTINGS_LANGUAGES_PAGE_LANGUAGES_METRICS_PROXY_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/os_languages_page/languages_metrics_proxy.m.js"
+           use_base_dir="false"
+           compress="false"
+           type="BINDATA" />
+  <include name="IDR_OS_SETTINGS_LANGUAGES_PAGE_OS_LANGUAGES_PAGE_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/os_languages_page/os_languages_page.m.js"
+           use_base_dir="false"
+           compress="false"
+           type="BINDATA" />
+  <include name="IDR_OS_SETTINGS_LANGUAGES_PAGE_OS_LANGUAGES_SECTION_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/os_languages_page/os_languages_section.m.js"
+           use_base_dir="false"
+           compress="false"
+           type="BINDATA" />
+  <include name="IDR_OS_SETTINGS_LANGUAGES_PAGE_SMART_INPUTS_PAGE_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/os_languages_page/smart_inputs_page.m.js"
+           use_base_dir="false"
+           compress="false"
+           type="BINDATA" />
   <include name="IDR_OS_SETTINGS_PEOPLE_PAGE_ACCOUNT_MANAGER_BROWSER_PROXY_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/people_page/account_manager_browser_proxy.m.js"
            use_base_dir="false"

chrome/test/data/webui/BUILD.gn

@@ -242,6 +242,7 @@ if (include_js_tests) {
         "$root_gen_dir/chrome/test/data/webui/settings/chromeos/fake_bluetooth_private.m.js",
         "$root_gen_dir/chrome/test/data/webui/settings/chromeos/fake_bluetooth.m.js",
         "$root_gen_dir/chrome/test/data/webui/settings/chromeos/fake_quick_unlock_private.m.js",
+        "$root_gen_dir/chrome/test/data/webui/settings/chromeos/input_method_options_page_test.m.js",
         "$root_gen_dir/chrome/test/data/webui/settings/chromeos/localized_link_test.m.js",
         "$root_gen_dir/chrome/test/data/webui/settings/chromeos/multidevice_feature_item_tests.m.js",
         "$root_gen_dir/chrome/test/data/webui/settings/chromeos/multidevice_feature_toggle_tests.m.js",
@@ -249,6 +250,7 @@ if (include_js_tests) {
         "$root_gen_dir/chrome/test/data/webui/settings/chromeos/multidevice_smartlock_subpage_test.m.js",
         "$root_gen_dir/chrome/test/data/webui/settings/chromeos/multidevice_subpage_tests.m.js",
         "$root_gen_dir/chrome/test/data/webui/settings/chromeos/nearby_share_subpage_tests.m.js",
+        "$root_gen_dir/chrome/test/data/webui/settings/chromeos/os_languages_page_tests.m.js",
         "$root_gen_dir/chrome/test/data/webui/settings/chromeos/os_reset_page_test.m.js",
         "$root_gen_dir/chrome/test/data/webui/settings/chromeos/os_people_page_test.m.js",
         "$root_gen_dir/chrome/test/data/webui/settings/chromeos/os_privacy_page_test.m.js",
@@ -257,7 +259,9 @@ if (include_js_tests) {
         "$root_gen_dir/chrome/test/data/webui/settings/chromeos/people_page_change_picture_test.m.js",
         "$root_gen_dir/chrome/test/data/webui/settings/chromeos/people_page_kerberos_accounts_test.m.js",
         "$root_gen_dir/chrome/test/data/webui/settings/chromeos/personalization_page_test.m.js",
+        "$root_gen_dir/chrome/test/data/webui/settings/chromeos/smart_inputs_page_test.m.js",
         "$root_gen_dir/chrome/test/data/webui/settings/chromeos/test_multidevice_browser_proxy.m.js",
+        "$root_gen_dir/chrome/test/data/webui/settings/chromeos/test_os_languages_browser_proxy.m.js",
         "$root_gen_dir/chrome/test/data/webui/settings/chromeos/test_os_lifetime_browser_proxy.m.js",
         "$root_gen_dir/chrome/test/data/webui/settings/chromeos/test_os_reset_browser_proxy.m.js",
         "$root_gen_dir/chrome/test/data/webui/settings/chromeos/test_os_sync_browser_proxy.m.js",

chrome/test/data/webui/settings/chromeos/BUILD.gn

@@ -35,9 +35,10 @@ js_modulizer("modulize") {
     "bluetooth_page_tests.js",
     "fake_bluetooth.js",
     "fake_bluetooth_private.js",
+    "fake_quick_unlock_private.js",
     "fake_settings_search_handler.js",
     "fake_user_action_recorder.js",
-    "fake_quick_unlock_private.js",
+    "input_method_options_page_test.js",
     "localized_link_test.js",
     "multidevice_feature_item_tests.js",
     "multidevice_feature_toggle_tests.js",
@@ -45,6 +46,7 @@ js_modulizer("modulize") {
     "multidevice_smartlock_subpage_test.js",
     "multidevice_subpage_tests.js",
     "nearby_share_subpage_tests.js",
+    "os_languages_page_tests.js",
     "os_reset_page_test.js",
     "os_people_page_test.js",
     "os_privacy_page_test.js",
@@ -53,8 +55,10 @@ js_modulizer("modulize") {
     "people_page_change_picture_test.js",
     "people_page_kerberos_accounts_test.js",
     "personalization_page_test.js",
-    "test_multidevice_browser_proxy.js",
+    "smart_inputs_page_test.js",
+    "test_os_languages_browser_proxy.js",
     "test_os_lifetime_browser_proxy.js",
+    "test_multidevice_browser_proxy.js",
     "test_os_reset_browser_proxy.js",
     "test_wallpaper_browser_proxy.js",
     "test_os_sync_browser_proxy.js",

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

@@ -2,6 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+// clang-format off
+// #import 'chrome://os-settings/chromeos/lazy_load.js';
+// #import {CrSettingsPrefs, Router, routes} from 'chrome://os-settings/chromeos/os_settings.js';
+// #import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
+// #import {FakeSettingsPrivate} from '../fake_settings_private.m.js';
+// #import {waitAfterNextRender} from '../../test_util.m.js';
+// clang-format on
+
 /**
  * @fileoverview Suite of tests for the OS Settings input method options page.
  */

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

@@ -2,6 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+// clang-format off
+// #import {LanguagesBrowserProxyImpl} from 'chrome://os-settings/chromeos/lazy_load.js';
+// #import {CrSettingsPrefs, Router} from 'chrome://os-settings/chromeos/os_settings.js';
+// #import {assert} from 'chrome://resources/js/assert.m.js';
+// #import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
+// #import {getFakeLanguagePrefs} from '../fake_language_settings_private.m.js'
+// #import {FakeSettingsPrivate} from '../fake_settings_private.m.js';
+// #import {TestLanguagesBrowserProxy} from './test_os_languages_browser_proxy.m.js';
+// #import {assertEquals, assertFalse, assertTrue} from '../../chai_assert.js';
+// #import {fakeDataBind} from '../../test_util.m.js';
+// clang-format on
+
 cr.define('os_languages_page_tests', function() {
   /** @enum {string} */
   const TestNames = {
@@ -128,7 +140,7 @@ cr.define('os_languages_page_tests', function() {
        */
       function assertRestartButtonActiveState(shouldBeActive) {
         const activeElement = getActiveElement();
-        isRestartButtonActive =
+        const isRestartButtonActive =
             activeElement && (activeElement.id === 'restartButton');
         assertEquals(isRestartButtonActive, shouldBeActive);
       }
@@ -329,5 +341,6 @@ cr.define('os_languages_page_tests', function() {
     });
   });
 
+  // #cr_define_end
   return {TestNames: TestNames};
 });

chrome/test/data/webui/settings/chromeos/os_namespace_rewrites.gni

@@ -9,10 +9,16 @@ os_test_namespace_rewrites = os_settings_namespace_rewrites + [
                                "settings.FakeBluetooth|FakeBluetooth",
                                "settings.FakeBluetoothPrivate|FakeBluetoothPrivate",
                                "settings.FakeQuickUnlockPrivate|FakeQuickUnlockPrivate",
+                               "settings.FakeLanguageSettingsPrivate|FakeLanguageSettingsPrivate",
+                               "settings.FakeInputMethodPrivate|FakeInputMethodPrivate",
+                               "settings.FakeSettingsPrivate|FakeSettingsPrivate",
+                               "settings.getFakeLanguagePrefs|getFakeLanguagePrefs",
                                "settings.MultiDeviceSettingsMode|MultiDeviceSettingsMode",
+                               "settings.TestLanguagesBrowserProxy|TestLanguagesBrowserProxy",
                                "settings.TestLifetimeBrowserProxy|TestLifetimeBrowserProxy",
                                "settings.TestWallpaperBrowserProxy|TestWallpaperBrowserProxy",
                                "test_util.eventToPromise|eventToPromise",
+                               "test_util.fakeDataBind|fakeDataBind",
                                "test_util.flushTasks|flushTasks",
                                "test_util.waitAfterNextRender|waitAfterNextRender",
                              ]

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

@@ -1355,10 +1355,10 @@ var OSSettingsLanguagesPageTest = class extends OSSettingsBrowserTest {
       BROWSER_SETTINGS_PATH + '../test_browser_proxy.js',
       BROWSER_SETTINGS_PATH + 'fake_input_method_private.js',
       BROWSER_SETTINGS_PATH + 'fake_language_settings_private.js',
-      BROWSER_SETTINGS_PATH + 'test_languages_browser_proxy.js',
       BROWSER_SETTINGS_PATH + 'fake_settings_private.js',
       BROWSER_SETTINGS_PATH + '../test_util.js',
       'os_languages_page_tests.js',
+      'test_os_languages_browser_proxy.js',
     ]);
   }
 };

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

@@ -38,22 +38,25 @@ var OSSettingsV3BrowserTest = class extends PolymerTest {
 };
 
 [['AmbientModePpage', 'ambient_mode_page_test.m.js'],
- ['ResetPage', 'os_reset_page_test.m.js'],
- ['LocalizedLink', 'localized_link_test.m.js'],
  ['BluetoothPage', 'bluetooth_page_tests.m.js'],
- ['NearbyShareSubPage', 'nearby_share_subpage_tests.m.js'],
- ['MultidevicePage', 'multidevice_page_tests.m.js'],
- ['MultideviceSubPage', 'multidevice_subpage_tests.m.js'],
- ['MultideviceSmartLockSubPage', 'multidevice_smartlock_subpage_test.m.js'],
+ ['InputMethodOptionPage', 'input_method_options_page_test.m.js'],
+ ['LocalizedLink', 'localized_link_test.m.js'],
  ['MultideviceFeatureItem', 'multidevice_feature_item_tests.m.js'],
  ['MultideviceFeatureToggle', 'multidevice_feature_toggle_tests.m.js'],
+ ['MultidevicePage', 'multidevice_page_tests.m.js'],
+ ['MultideviceSmartLockSubPage', 'multidevice_smartlock_subpage_test.m.js'],
+ ['MultideviceSubPage', 'multidevice_subpage_tests.m.js'],
+ ['OsLanguagesPage', 'os_languages_page_tests.m.js'],
+ ['NearbyShareSubPage', 'nearby_share_subpage_tests.m.js'],
  ['ParentalControlsPage', 'parental_controls_page_test.m.js'],
  ['PeoplePage', 'os_people_page_test.m.js'],
- ['PersonalizationPage', 'personalization_page_test.m.js'],
  ['PeoplePageAccountManager', 'people_page_account_manager_test.m.js'],
  ['PeoplePageChangePicture', 'people_page_change_picture_test.m.js'],
  ['PeoplePageKerberosAccounts', 'people_page_kerberos_accounts_test.m.js'],
+ ['PersonalizationPage', 'personalization_page_test.m.js'],
  ['PrivacyPage', 'os_privacy_page_test.m.js'],
+ ['ResetPage', 'os_reset_page_test.m.js'],
+ ['SmartInputsPage', 'smart_inputs_page_test.m.js'],
  ['TimezoneSelector', 'timezone_selector_test.m.js'],
 ].forEach(test => registerTest(...test));
 

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

 // Copyright 2020 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.
-let smartInputsPage = null;
+
+// clang-format off
+// #import 'chrome://os-settings/chromeos/lazy_load.js';
+// #import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
+// clang-format on
+
+let smartInputsPage;
 
 function createSmartInputsPage() {
   PolymerTest.clearBody();

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

+// Copyright 2020 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.
+
+// clang-format off
+// #import {LanguagesBrowserProxy} from 'chrome://os-settings/chromeos/lazy_load.js';
+// #import {FakeInputMethodPrivate} from '../fake_input_method_private.m.js';
+// #import {FakeLanguageSettingsPrivate} from '../fake_language_settings_private.m.js';
+// #import {TestBrowserProxy} from '../../test_browser_proxy.m.js';
+// clang-format on
+
+cr.define('settings', function() {
+  /** @implements {settings.LanguagesBrowserProxy} */
+  /* #export */ class TestLanguagesBrowserProxy extends TestBrowserProxy {
+    constructor() {
+      const methodNames = [];
+      methodNames.push('getProspectiveUILanguage', 'setProspectiveUILanguage');
+
+      super(methodNames);
+
+      /** @private {!LanguageSettingsPrivate} */
+      this.languageSettingsPrivate_ =
+          new settings.FakeLanguageSettingsPrivate();
+
+      /** @private {!InputMethodPrivate} */
+      this.inputMethodPrivate_ = /** @type{!InputMethodPrivate} */ (
+          new settings.FakeInputMethodPrivate());
+    }
+
+    /** @override */
+    getLanguageSettingsPrivate() {
+      return this.languageSettingsPrivate_;
+    }
+
+    /** @param {!LanguageSettingsPrivate} languageSettingsPrivate */
+    setLanguageSettingsPrivate(languageSettingsPrivate) {
+      this.languageSettingsPrivate_ = languageSettingsPrivate;
+    }
+
+    /** @override */
+    getProspectiveUILanguage() {
+      this.methodCalled('getProspectiveUILanguage');
+      return Promise.resolve('en-US');
+    }
+
+    /** @override */
+    setProspectiveUILanguage(language) {
+      this.methodCalled('setProspectiveUILanguage', language);
+    }
+
+
+    getInputMethodPrivate() {
+      return this.inputMethodPrivate_;
+    }
+  }
+
+  // #cr_define_end
+  return {
+    TestLanguagesBrowserProxy: TestLanguagesBrowserProxy,
+  };
+});