[CrOS Settings] Reorder .gni and test BUILD.gn files in alpha order

Doesn't matter too much but it bugs me when adding new files

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

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

@@ -16,50 +16,50 @@ os_settings_namespace_rewrites = settings_namespace_rewrites +
                                    "settings.AmbientModeBrowserProxy|AmbientModeBrowserProxy",
                                    "settings.ChangePictureBrowserProxy|ChangePictureBrowserProxy",
                                    "settings.DefaultImage|DefaultImage",
+                                   "settings.FingerprintAttempt|FingerprintAttempt",
+                                   "settings.FingerprintBrowserProxy|FingerprintBrowserProxy",
+                                   "settings.FingerprintInfo|FingerprintInfo",
+                                   "settings.FingerprintResultType|FingerprintResultType",
+                                   "settings.FingerprintScan|FingerprintScan",
+                                   "settings.FingerprintSetupStep|FingerprintSetupStep",
+                                   "settings.KerberosAccount|KerberosAccount",
                                    "settings.KerberosAccountsBrowserProxy|KerberosAccountsBrowserProxy",
-                                   "settings.KerberosErrorType|KerberosErrorType",
                                    "settings.KerberosConfigErrorCode|KerberosConfigErrorCode",
+                                   "settings.KerberosErrorType|KerberosErrorType",
+                                   "settings.LanguagesMetricsProxy|LanguagesMetricsProxy",
+                                   "settings.LanguagesPageInteraction|LanguagesPageInteraction",
                                    "settings.MultiDeviceBrowserProxy|MultiDeviceBrowserProxy",
-                                   "settings.MultiDeviceSettingsMode|MultiDeviceSettingsMode",
                                    "settings.MultiDeviceFeature|MultiDeviceFeature",
                                    "settings.MultiDeviceFeatureState|MultiDeviceFeatureState",
                                    "settings.MultiDevicePageContentData|MultiDevicePageContentData",
-                                   "settings.LanguagesMetricsProxy|LanguagesMetricsProxy",
-                                   "settings.LanguagesPageInteraction|LanguagesPageInteraction",
+                                   "settings.MultiDeviceSettingsMode|MultiDeviceSettingsMode",
                                    "settings.OsResetBrowserProxy|OsResetBrowserProxy",
-                                   "settings.RouteObserverBehavior|RouteObserverBehavior",
+                                   "settings.OsSyncBrowserProxy|OsSyncBrowserProxy",
+                                   "settings.OsSyncPrefs|OsSyncPrefs",
+                                   "settings.recordLockScreenProgress|recordLockScreenProgress",
+                                   "settings.recordSettingChange|recordSettingChange",
                                    "settings.Route|Route",
+                                   "settings.RouteObserverBehavior|RouteObserverBehavior",
                                    "settings.routes|routes",
-                                   "settings.recordSettingChange|recordSettingChange",
                                    "settings.SmartLockSignInEnabledState|SmartLockSignInEnabledState",
-                                   "settings.WallpaperBrowserProxy|WallpaperBrowserProxy",
-                                   "settings.FingerprintBrowserProxy|FingerprintBrowserProxy",
-                                   "settings.FingerprintResultType|FingerprintResultType",
-                                   "settings.recordLockScreenProgress|recordLockScreenProgress",
-                                   "settings.OsSyncBrowserProxy|OsSyncBrowserProxy",
-                                   "settings.FingerprintInfo|FingerprintInfo",
-                                   "settings.FingerprintSetupStep|FingerprintSetupStep",
-                                   "settings.FingerprintAttempt|FingerprintAttempt",
-                                   "settings.FingerprintScan|FingerprintScan",
-                                   "settings.KerberosAccount|KerberosAccount",
-                                   "settings.OsSyncPrefs|OsSyncPrefs",
                                    "settings.ValidateKerberosConfigResult|ValidateKerberosConfigResult",
+                                   "settings.WallpaperBrowserProxy|WallpaperBrowserProxy",
                                  ]
 
 os_settings_auto_imports = settings_auto_imports +
                            cr_components_chromeos_auto_imports +
                            cr_elements_chromeos_auto_imports + [
-                             "chrome/browser/resources/settings/chromeos/ambient_mode_page/constants.html|AmbientModeTopicSource,AmbientModeSettings",
                              "chrome/browser/resources/settings/chromeos/ambient_mode_page/ambient_mode_browser_proxy.html|AmbientModeBrowserProxy,AmbientModeBrowserProxyImpl",
+                             "chrome/browser/resources/settings/chromeos/ambient_mode_page/constants.html|AmbientModeTopicSource,AmbientModeSettings",
                              "chrome/browser/resources/settings/chromeos/deep_linking_behavior.html|DeepLinkingBehavior",
                              "chrome/browser/resources/settings/chromeos/metrics_recorder.html|recordSettingChange",
+                             "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_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/os_sync_browser_proxy.html|OsSyncBrowserProxy,OsSyncBrowserProxyImpl,OsSyncPrefs",
                              "chrome/browser/resources/settings/chromeos/os_people_page/lock_state_behavior.html|LockScreenUnlockType,LockStateBehaviorImpl,LockStateBehavior",
-                             "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/os_sync_browser_proxy.html|OsSyncBrowserProxy,OsSyncBrowserProxyImpl,OsSyncPrefs",
                              "chrome/browser/resources/settings/chromeos/os_page_visibility.html|OSPageVisibility",
                              "chrome/browser/resources/settings/chromeos/os_reset_page/os_reset_browser_proxy.html|OsResetBrowserProxy,OsResetBrowserProxyImpl",
                              "chrome/browser/resources/settings/chromeos/os_route.html|routes",
@@ -75,9 +75,9 @@ 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/polymer.html|Polymer,html,flush, afterNextRender",
-                             "ui/webui/resources/html/icon.html|getImage",
                              "ui/webui/resources/html/cr.html|sendWithPromise",
+                             "ui/webui/resources/html/icon.html|getImage",
+                             "ui/webui/resources/html/polymer.html|Polymer,html,flush, afterNextRender",
                            ]
 
 os_settings_migrated_imports = settings_migrated_imports

chrome/test/data/webui/BUILD.gn

@@ -243,11 +243,11 @@ if (include_js_tests) {
         "$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/localized_link_test.m.js",
-        "$root_gen_dir/chrome/test/data/webui/settings/chromeos/multidevice_page_tests.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/multidevice_smartlock_subpage_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",
+        "$root_gen_dir/chrome/test/data/webui/settings/chromeos/multidevice_page_tests.m.js",
+        "$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_reset_page_test.m.js",
         "$root_gen_dir/chrome/test/data/webui/settings/chromeos/os_people_page_test.m.js",
@@ -256,11 +256,11 @@ if (include_js_tests) {
         "$root_gen_dir/chrome/test/data/webui/settings/chromeos/people_page_account_manager_test.m.js",
         "$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/test_os_sync_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_lifetime_browser_proxy.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/personalization_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_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",
         "$root_gen_dir/chrome/test/data/webui/settings/chromeos/test_wallpaper_browser_proxy.m.js",
         "$root_gen_dir/chrome/test/data/webui/settings/chromeos/timezone_selector_test.m.js",
       ]

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

@@ -39,11 +39,11 @@ js_modulizer("modulize") {
     "fake_user_action_recorder.js",
     "fake_quick_unlock_private.js",
     "localized_link_test.js",
-    "multidevice_page_tests.js",
-    "multidevice_subpage_tests.js",
-    "multidevice_smartlock_subpage_test.js",
     "multidevice_feature_item_tests.js",
     "multidevice_feature_toggle_tests.js",
+    "multidevice_page_tests.js",
+    "multidevice_smartlock_subpage_test.js",
+    "multidevice_subpage_tests.js",
     "nearby_share_subpage_tests.js",
     "os_reset_page_test.js",
     "os_people_page_test.js",
@@ -53,9 +53,9 @@ js_modulizer("modulize") {
     "people_page_change_picture_test.js",
     "people_page_kerberos_accounts_test.js",
     "personalization_page_test.js",
-    "test_os_reset_browser_proxy.js",
-    "test_os_lifetime_browser_proxy.js",
     "test_multidevice_browser_proxy.js",
+    "test_os_lifetime_browser_proxy.js",
+    "test_os_reset_browser_proxy.js",
     "test_wallpaper_browser_proxy.js",
     "test_os_sync_browser_proxy.js",
     "timezone_selector_test.js",

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

@@ -2,17 +2,17 @@ import("//chrome/browser/resources/settings/chromeos/os_settings.gni")
 
 os_test_namespace_rewrites = os_settings_namespace_rewrites + [
                                "multidevice.createFakePageContentData|createFakePageContentData",
-                               "multidevice.TestMultideviceBrowserProxy|TestMultideviceBrowserProxy",
                                "multidevice.HOST_DEVICE|HOST_DEVICE",
+                               "multidevice.TestMultideviceBrowserProxy|TestMultideviceBrowserProxy",
+                               "parental_controls.ParentalControlsBrowserProxy|ParentalControlsBrowserProxy",
                                "reset_page.TestOsResetBrowserProxy|TestOsResetBrowserProxy",
-                               "settings.TestLifetimeBrowserProxy|TestLifetimeBrowserProxy",
                                "settings.FakeBluetooth|FakeBluetooth",
                                "settings.FakeBluetoothPrivate|FakeBluetoothPrivate",
+                               "settings.FakeQuickUnlockPrivate|FakeQuickUnlockPrivate",
                                "settings.MultiDeviceSettingsMode|MultiDeviceSettingsMode",
-                               "test_util.flushTasks|flushTasks",
+                               "settings.TestLifetimeBrowserProxy|TestLifetimeBrowserProxy",
+                               "settings.TestWallpaperBrowserProxy|TestWallpaperBrowserProxy",
                                "test_util.eventToPromise|eventToPromise",
+                               "test_util.flushTasks|flushTasks",
                                "test_util.waitAfterNextRender|waitAfterNextRender",
-                               "settings.TestWallpaperBrowserProxy|TestWallpaperBrowserProxy",
-                               "parental_controls.ParentalControlsBrowserProxy|ParentalControlsBrowserProxy",
-                               "settings.FakeQuickUnlockPrivate|FakeQuickUnlockPrivate",
                              ]