Reorder chrome/test/BUILD.gn to match order in chrome_tests_unit.gypi

chrome/test/BUILD.gn

 # Copyright 2014 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.
 
 import("//build/config/chrome_build.gni")
 import("//build/config/compiler/compiler.gni")
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//chrome/chrome_tests.gni")
@@ skipping 1604 matching lines @@
       deps += [ "//testing/android/native_test:native_test_native_code" ]
       isolate_file = "../unit_tests.isolate"
     } else {
       sources += rebase_path(
               chrome_tests_unit_gypi_values.chrome_unit_tests_non_android_sources,
               ".",
               "//chrome")
       sources -= [ "../browser/download/download_request_infobar_delegate_unittest.cc" ]
     }
 
+    if (!is_android && !is_ios) {
+      sources += rebase_path(
+              chrome_tests_unit_gypi_values.chrome_unit_tests_non_mobile_sources,
+              ".",
+              "//chrome")
+    }
+
     if (is_ios || is_chromeos) {
       sources -= [ "../browser/signin/chrome_signin_status_metrics_provider_delegate_unittest.cc" ]
     }
     if (enable_background) {
       sources += rebase_path(
               chrome_tests_unit_gypi_values.chrome_unit_tests_background_sources,
               ".",
               "//chrome")
     }
     if (enable_spellcheck) {
@@ skipping 30 matching lines @@
                 ".",
                 "//chrome")
       }
       if (!is_chromeos) {
         sources += rebase_path(
                 chrome_tests_unit_gypi_values.chrome_unit_tests_extensions_non_chromeos_sources,
                 ".",
                 "//chrome")
       }
     }
-    if (toolkit_views) {
-      deps += [
-        "//components/web_modal:test_support",
-        "//ui/views",
-        "//ui/views:test_support",
-      ]
-      sources += rebase_path(
-              chrome_tests_unit_gypi_values.chrome_unit_tests_views_sources,
-              ".",
-              "//chrome")
-      if (!is_chromeos && (!is_mac || mac_views_browser)) {
-        sources += rebase_path(
-                chrome_tests_unit_gypi_values.chrome_unit_tests_views_non_chromeos_sources,
-                ".",
-                "//chrome")
-      }
-      if (!is_mac) {
-        sources += rebase_path(
-                chrome_tests_unit_gypi_values.chrome_unit_tests_views_non_mac_sources,
-                ".",
-                "//chrome")
-      }
-    }
     if (use_ash) {
       sources += rebase_path(
               chrome_tests_unit_gypi_values.chrome_unit_tests_ash_sources,
               ".",
               "//chrome")
       deps += [
         "//ash:test_support",
         "//ash/resources",
         "//ash/strings",
       ]
@@ skipping 108 matching lines @@
               chrome_tests_unit_gypi_values.chrome_unit_tests_plugins_sources,
               ".",
               "//chrome")
     }
     if (enable_print_preview) {
       sources += rebase_path(
               chrome_tests_unit_gypi_values.chrome_unit_tests_print_preview_sources,
               ".",
               "//chrome")
     }
-    if (enable_captive_portal_detection) {
-      sources += rebase_path(
-              chrome_tests_unit_gypi_values.chrome_unit_tests_captive_portal_sources,
-              ".",
-              "//chrome")
-    }
-    if (enable_session_service) {
-      sources += rebase_path(
-              chrome_tests_unit_gypi_values.chrome_unit_tests_session_service_sources,
-              ".",
-              "//chrome")
-    }
     if (enable_media_router) {
       sources += rebase_path(
               chrome_tests_unit_gypi_values.chrome_unit_tests_media_router_sources,
               ".",
               "//chrome")
       deps += [ "//chrome/browser/media/router:test_support" ]
       if (!is_android) {
         sources += rebase_path(
                 chrome_tests_unit_gypi_values.chrome_unit_tests_media_router_non_android_sources,
                 ".",
                 "//chrome")
       }
     }
+    if (enable_captive_portal_detection) {
+      sources += rebase_path(
+              chrome_tests_unit_gypi_values.chrome_unit_tests_captive_portal_sources,
+              ".",
+              "//chrome")
+    }
+    if (enable_session_service) {
+      sources += rebase_path(
+              chrome_tests_unit_gypi_values.chrome_unit_tests_session_service_sources,
+              ".",
+              "//chrome")
+    }
     if (enable_webrtc) {
       sources += rebase_path(
               chrome_tests_unit_gypi_values.chrome_unit_tests_webrtc_sources,
               ".",
               "//chrome")
     }
     if (is_chromeos) {
       deps += [ "//chrome/browser/chromeos:unit_tests" ]
       sources -= [ "../browser/signin/signin_manager_unittest.cc" ]
     }
@@ skipping 66 matching lines @@
               chrome_tests_unit_gypi_values.chrome_unit_tests_mac_android_sources,
               ".",
               "//chrome")
     }
     if (is_android) {
       sources += rebase_path(
               chrome_tests_unit_gypi_values.chrome_unit_tests_android_sources,
               ".",
               "//chrome")
     }
-    if (!is_android && !is_ios) {
-      sources += rebase_path(
-              chrome_tests_unit_gypi_values.chrome_unit_tests_non_mobile_sources,
-              ".",
-              "//chrome")
-    }
     if (!is_mac && !is_ios) {
       deps += [
         "//chrome/tools/convert_dict:lib",
         "//chrome:packed_extra_resources",
         "//chrome:packed_resources",
         "//third_party/hunspell",
       ]
     }
     if (is_win || is_mac) {
       sources += rebase_path(
@@ skipping 60 matching lines @@
               chrome_tests_unit_gypi_values.chrome_unit_tests_non_android_or_chromeos_sources,
               ".",
               "//chrome")
     }
     if (enable_themes) {
       sources += rebase_path(
               chrome_tests_unit_gypi_values.chrome_unit_tests_themes_sources,
               ".",
               "//chrome")
     }
+    if (toolkit_views) {
+      deps += [
+        "//components/web_modal:test_support",
+        "//ui/views",
+        "//ui/views:test_support",
+      ]
+      sources += rebase_path(
+              chrome_tests_unit_gypi_values.chrome_unit_tests_views_sources,
+              ".",
+              "//chrome")
+      if (!is_chromeos && (!is_mac || mac_views_browser)) {
+        sources += rebase_path(
+                chrome_tests_unit_gypi_values.chrome_unit_tests_views_non_chromeos_sources,
+                ".",
+                "//chrome")
+      }
+      if (!is_mac) {
+        sources += rebase_path(
+                chrome_tests_unit_gypi_values.chrome_unit_tests_views_non_mac_sources,
+                ".",
+                "//chrome")
+      }
+    }
     if (!is_android && (use_nss_certs || use_openssl_certs)) {
       sources += [ "../common/net/x509_certificate_model_unittest.cc" ]
     }
     if (enable_supervised_users) {
       sources += rebase_path(
               chrome_tests_unit_gypi_values.chrome_unit_tests_supervised_user_sources,
               ".",
               "//chrome")
     }
     if (enable_supervised_users && !is_android && !is_ios) {
@@ skipping 134 matching lines @@
     "//third_party/mojo/src/mojo/edk/system",
   ]
 
   if (!is_android && use_ash) {
     sources += rebase_path(
             chrome_tests_unit_gypi_values.chrome_test_support_unit_ash_sources,
             ".",
             "//chrome")
   }
 }