Clean up chrome/test/BUILD.gn for Chrome OS and ash

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/common/features.gni")
@@ skipping 758 matching lines @@
       ]
     }
 
     if (use_ash) {
       sources += [
         "../browser/ui/views/ash/tab_scrubber_browsertest.cc",
         "../browser/ui/window_sizer/window_sizer_ash_uitest.cc",
         "//ash/drag_drop/drag_drop_interactive_uitest.cc",
         "//ash/wm/ash_native_cursor_manager_interactive_uitest.cc",
       ]
-      if (is_chromeos) {
-        sources -= [
-          # Use only the _chromeos version on ChromeOS.
-          "base/view_event_test_platform_part_default.cc",
-        ]
-      }
+      sources -= [
+        # Use only the _chromeos version on Ash / Chrome OS.
+        "base/view_event_test_platform_part_default.cc",
+      ]
       deps += [ "//ash/test:interactive_ui_test_support" ]
     }
 
     if (is_android) {
       sources -= [
         # Android does not use the message center-based Notification system.
         "../browser/notifications/message_center_notifications_browsertest.cc",
 
         # TODO(peter): Enable the Notification browser tests.
         "../browser/notifications/notification_interactive_uitest.cc",
@@ skipping 1555 matching lines @@
       deps += [
         "//chromeos/ime:gencode",
         "//components/arc:arc_test_support",
         "//components/user_manager:test_support",
         "//ui/login:resources",
       ]
 
       if (use_dbus) {
         deps += [ "//dbus:test_support" ]
       }
-    } else {
+    } else {  # !is_chromeos
       sources -= [
         "../browser/extensions/api/enterprise_device_attributes/enterprise_device_attributes_apitest.cc",
         "../browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc",
         "../browser/extensions/api/platform_keys/platform_keys_apitest_nss.cc",
         "../browser/extensions/api/terminal/terminal_private_apitest.cc",
         "../browser/invalidation/profile_invalidation_provider_factory_browsertest.cc",
         "../browser/net/nss_context_chromeos_browsertest.cc",
         "data/webui/certificate_viewer_ui_test-inl.h",
       ]
-      if (use_ash) {
-        sources -= [ "../browser/ui/ash/keyboard_controller_browsertest.cc" ]
-      }
       if (toolkit_views) {
         sources -= [ "../browser/ui/views/select_file_dialog_extension_browsertest.cc" ]
       }
       if (is_win || is_linux) {
         sources +=
             [ "../browser/ui/views/ime/input_ime_apitest_nonchromeos.cc" ]
       }
     }
     if (safe_browsing_mode == 1) {
       sources += [
@@ skipping 39 matching lines @@
         "//chrome/app:command_ids",
         "//third_party/wtl",
         "//ui/resources",
       ]
     } else {
       sources -= [
         "../app/chrome_version.rc.version",
         "../browser/media_galleries/fileapi/iapps_finder_impl_win_browsertest.cc",
       ]
     }
-    if (!is_chromeos && use_ash) {
-      sources -= [
-        # On Windows and Linux, we currently don't support enough of the
-        # ash environment to run these unit tests.
-        #
-        # TODO: enable these on windows and linux.
-        "../browser/ui/ash/accelerator_commands_browsertest.cc",
-        "../browser/ui/ash/accelerator_controller_browsertest.cc",
-        "../browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc",
-        "../browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc",
-        "../browser/ui/ash/shelf_browsertest.cc",
-      ]
-
-      if (toolkit_views) {
-        sources -= [ "../browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc" ]
-      }
-    }
     if (is_mac) {
       # Other platforms only need .pak files, and can build this target
       # standalone much faster.
       deps += [
         "//chrome",
         "//chrome/common:app_mode_app_support",
 
         # TODO(GYP) Mac: GYP has this dependency. Uncommenting this line
         # generates duplicate symbols between
         #   obj/components/crash/content/app/breakpad_stubs/crash_reporter_client.o
@@ skipping 1687 matching lines @@
       "../browser/ui/ash/window_positioner_unittest.cc",
       "../browser/ui/window_sizer/window_sizer_ash_unittest.cc",
     ]
     deps += [
       "//ash/common/strings",
       "//ash/resources",
       "//ash/test:ash_with_aura_test_support",
       "//ash/test:test_support_with_content",
     ]
 
-    # We eventually want to compile both in Win Aura builds, see
-    # http://crbug.com/155545.
-    if (!is_win) {
-      sources -= [ "../browser/ui/window_sizer/window_sizer_unittest.cc" ]
-    }
+    # Chrome OS uses window_sizer_ash_unittest.cc
+    sources -= [ "../browser/ui/window_sizer/window_sizer_unittest.cc" ]
   }
   if (use_aura) {
     deps += [
       "//ui/aura:test_support",
       "//ui/views:test_support",
       "//ui/wm",
     ]
   }
   if (!is_chromeos && is_linux) {
     sources += [
@@ skipping 952 matching lines @@
 }
 
 if (is_win) {
   loadable_module("conflicts_dll") {
     testonly = true
     sources = [
       "conflicts/conflicts_dll.cc",
     ]
   }
 }