Move GN obj files to target-specific dirs

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/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
+import("//chrome/chrome_tests.gni")
 import("//chrome/test/base/js2gtest.gni")
 import("//testing/test.gni")
 
 # This target exists to reference other test executables to bring these files
 # into the build.
 group("test") {
   testonly = true
 }
 
 # GYP version: chrome/chrome_tests_unit.gypi:test_support_common
@@ skipping 178 matching lines @@
 
   if (enable_extensions) {
     deps += [
       "//chrome/common/extensions/api",
       "//extensions:test_support",
     ]
   }
 }
 
 if (!is_android) {
-  import("//chrome/chrome_tests.gni")
   import("//third_party/protobuf/proto_library.gni")
 
   # GYP version: chrome/chrome_tests_unit.gypi:ipc_protobuf_message_test_proto
   proto_library("test_proto") {
     sources = [
       "../common/safe_browsing/ipc_protobuf_message_test.proto",
     ]
   }
 
   test("interactive_ui_tests") {
@@ skipping 28 matching lines @@
       "//testing/gtest",
       "//third_party/hunspell",
       "//third_party/icu",
       "//third_party/libpng",
       "//third_party/zlib",
       "//ui/base:test_support",
       "//ui/resources:ui_test_pak",
       "//ui/web_dialogs:test_support",
     ]
 
+    # TODO(rockot) bug 505926: The chrome_extensions_interactive_uitests target
+    # should be deleted and this line removed. See the
+    # chrome_extensions_interactive_uitests target for more.
+    deps += [ "//extensions:chrome_extensions_interactive_uitests" ]
+
     # Runtime dependencies
     datadeps = [
       "//ppapi:ppapi_tests",
       "//third_party/mesa:osmesa",
     ]
 
     if (toolkit_views) {
       sources += rebase_path(
               chrome_tests_gypi_values.chrome_interactive_ui_test_views_sources,
               ".",
@@ skipping 323 matching lines @@
       "//third_party/webrtc/modules/desktop_capture",
       "//third_party/widevine/cdm:version_h",
       "//ui/accessibility:test_support",
       "//ui/base:test_support",
       "//ui/compositor:test_support",
       "//ui/resources",
       "//ui/web_dialogs:test_support",
       "//v8",
     ]
 
+    # TODO(rockot) bug 505926: The chrome_extensions_browsertests target should
+    # be deleted and this line removed. See the chrome_extensions_browsertests
+    # target for more.
+    deps += [ "//extensions:chrome_extensions_browsertests" ]
+
     # Runtime dependencies
     data_deps = [
       "//ppapi:ppapi_tests",
 
       #'../remoting/remoting.gyp:remoting_browser_test_resources',  TODO(GYP)
       #'../remoting/remoting.gyp:remoting_webapp_unittests',  TODO(GYP)
       "//third_party/mesa:osmesa",
       "//third_party/widevine/cdm:widevine_test_license_server",
     ]
 
@@ skipping 491 matching lines @@
     ]
 
     if (enable_pepper_cdms) {
       data_deps = [
         "//media/cdm/ppapi:clearkeycdmadapter",
         "//third_party/widevine/cdm:widevinecdmadapter",
       ]
     }
   }
 
-  unit_gypi_values = exec_script("//build/gypi_to_gn.py",
-                                 [ rebase_path("../chrome_tests_unit.gypi") ],
-                                 "scope",
-                                 [ "../chrome_tests_unit.gypi" ])
-
   js2gtest("unit_tests_js") {
     test_type = "unit"
-    sources = rebase_path(unit_gypi_values.chrome_unit_tests_gtestjs_sources,
-                          ".",
-                          "//chrome")
-    extra_js_files = rebase_path(unit_gypi_values.chrome_unit_tests_js_sources,
-                                 ".",
-                                 "//chrome")
+    sources = rebase_path(
+            chrome_tests_unit_gypi_values.chrome_unit_tests_gtestjs_sources,
+            ".",
+            "//chrome")
+    extra_js_files =
+        rebase_path(chrome_tests_unit_gypi_values.chrome_unit_tests_js_sources,
+                    ".",
+                    "//chrome")
     if (is_chromeos) {
       sources += rebase_path(
-              unit_gypi_values.chrome_unit_tests_chromeos_gtestjs_sources,
+              chrome_tests_unit_gypi_values.chrome_unit_tests_chromeos_gtestjs_sources,
               ".",
               "//chrome")
-      extra_js_files +=
-          rebase_path(unit_gypi_values.chrome_unit_tests_chromeos_js_sources,
-                      ".",
-                      "//chrome")
+      extra_js_files += rebase_path(
+              chrome_tests_unit_gypi_values.chrome_unit_tests_chromeos_js_sources,
+              ".",
+              "//chrome")
     }
   }
 
   test("unit_tests") {
     sources =
-        rebase_path(unit_gypi_values.chrome_unit_tests_sources, ".", "//chrome")
+        rebase_path(chrome_tests_unit_gypi_values.chrome_unit_tests_sources,
+                    ".",
+                    "//chrome")
 
     defines = []
 
     deps = [
       # NOTE: New depndencies should generally be added in the OS!="ios"
       # dependencies block below, rather than here.
       # Unit tests should only depend on:
       # 1) everything that the chrome binaries depend on:
       "//chrome:browser_dependencies",
       "//chrome:child_dependencies",
@@ skipping 66 matching lines @@
 
     if (is_android) {
       deps -= [ "//third_party/libaddressinput" ]
 
       # Some android targets still depend on --gc-sections to link.
       # TODO: remove --gc-sections for Debug builds (crbug.com/159847).
       ldflags = [ "-Wl,--gc-sections" ]
       deps += [ "//testing/android/native_test:native_test_native_code" ]
       isolate_file = "../unit_tests.isolate"
     } else {
-      sources +=
-          rebase_path(unit_gypi_values.chrome_unit_tests_non_android_sources,
-                      ".",
-                      "//chrome")
+      sources += rebase_path(
+              chrome_tests_unit_gypi_values.chrome_unit_tests_non_android_sources,
+              ".",
+              "//chrome")
     }
     if (is_ios || is_chromeos) {
       sources -=
           [ "../browser/metrics/signin_status_metrics_provider_unittest.cc" ]
     }
     if (enable_background) {
-      sources +=
-          rebase_path(unit_gypi_values.chrome_unit_tests_background_sources,
-                      ".",
-                      "//chrome")
+      sources += rebase_path(
+              chrome_tests_unit_gypi_values.chrome_unit_tests_background_sources,
+              ".",
+              "//chrome")
     }
     if (enable_spellcheck) {
-      sources +=
-          rebase_path(unit_gypi_values.chrome_unit_tests_spellchecker_sources,
-                      ".",
-                      "//chrome")
+      sources += rebase_path(
+              chrome_tests_unit_gypi_values.chrome_unit_tests_spellchecker_sources,
+              ".",
+              "//chrome")
       if (is_mac && !is_ios) {
         deps += [ "//third_party/hunspell" ]
       }
     }
 
     if (enable_one_click_signin) {
       sources += [
         "../browser/ui/sync/one_click_signin_sync_observer_unittest.cc",
         "../browser/ui/sync/one_click_signin_sync_starter_unittest.cc",
       ]
     }
 
     if (enable_extensions) {
-      sources +=
-          rebase_path(unit_gypi_values.chrome_unit_tests_extensions_sources,
-                      ".",
-                      "//chrome")
+      sources += rebase_path(
+              chrome_tests_unit_gypi_values.chrome_unit_tests_extensions_sources,
+              ".",
+              "//chrome")
       deps += [
         "//chrome/common/extensions/api",
         "//device/usb:mocks",
         "//extensions:extensions_resources",
         "//extensions/strings",
       ]
       if (enable_configuration_policy) {
         sources += rebase_path(
-                unit_gypi_values.chrome_unit_tests_extensions_policy_sources,
+                chrome_tests_unit_gypi_values.chrome_unit_tests_extensions_policy_sources,
                 ".",
                 "//chrome")
       }
       if (!is_chromeos) {
         sources += rebase_path(
-                unit_gypi_values.chrome_unit_tests_extensions_non_chromeos_sources,
+                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(unit_gypi_values.chrome_unit_tests_views_sources,
-                             ".",
-                             "//chrome")
+      sources += rebase_path(
+              chrome_tests_unit_gypi_values.chrome_unit_tests_views_sources,
+              ".",
+              "//chrome")
       if (!is_mac) {
         sources += rebase_path(
-                unit_gypi_values.chrome_unit_tests_views_non_mac_sources,
+                chrome_tests_unit_gypi_values.chrome_unit_tests_views_non_mac_sources,
                 ".",
                 "//chrome")
       }
     }
     if (use_ash) {
-      sources += rebase_path(unit_gypi_values.chrome_unit_tests_ash_sources,
-                             ".",
-                             "//chrome")
+      sources += rebase_path(
+              chrome_tests_unit_gypi_values.chrome_unit_tests_ash_sources,
+              ".",
+              "//chrome")
       deps += [
         "//ash:test_support",
         "//ash/resources",
         "//ash/strings",
       ]
 
       # 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" ]
       }
     }
     if (use_aura) {
       sources += [ "//ui/views/controls/webview/webview_unittest.cc" ]
       deps += [
         "//ui/wm",
         "//ui/aura:test_support",
         "//ui/views:test_support",
       ]
     }
     if (!is_chromeos && is_linux) {
-      sources +=
-          rebase_path(unit_gypi_values.chrome_unit_tests_desktop_linux_sources,
-                      ".",
-                      "//chrome")
+      sources += rebase_path(
+              chrome_tests_unit_gypi_values.chrome_unit_tests_desktop_linux_sources,
+              ".",
+              "//chrome")
     }
     if (!is_chromeos && !use_ozone && is_linux) {
       deps += [
         "//chrome/browser/ui/libgtk2ui",
         "//build/config/linux:gio",
       ]
     }
 
     if (enable_task_manager) {
-      sources +=
-          rebase_path(unit_gypi_values.chrome_unit_tests_task_manager_sources,
-                      ".",
-                      "//chrome")
+      sources += rebase_path(
+              chrome_tests_unit_gypi_values.chrome_unit_tests_task_manager_sources,
+              ".",
+              "//chrome")
     }
     if (enable_mdns) {
-      sources += rebase_path(unit_gypi_values.chrome_unit_tests_mdns_sources,
-                             ".",
-                             "//chrome")
+      sources += rebase_path(
+              chrome_tests_unit_gypi_values.chrome_unit_tests_mdns_sources,
+              ".",
+              "//chrome")
     }
     if (enable_service_discovery) {
       sources += rebase_path(
-              unit_gypi_values.chrome_unit_tests_service_discovery_sources,
+              chrome_tests_unit_gypi_values.chrome_unit_tests_service_discovery_sources,
               ".",
               "//chrome")
     }
     if (enable_configuration_policy) {
       sources += rebase_path(
-              unit_gypi_values.chrome_unit_tests_configuration_policy_sources,
+              chrome_tests_unit_gypi_values.chrome_unit_tests_configuration_policy_sources,
               ".",
               "//chrome")
       if (is_chromeos) {
         sources -=
             [ "../browser/policy/cloud/user_policy_signin_service_unittest.cc" ]
       } else if (is_android) {
         sources -= [ "../browser/policy/policy_path_parser_unittest.cc" ]
       }
       if (!is_android && !is_ios && !is_chromeos) {
         sources +=
             [ "../browser/net/disk_cache_dir_policy_handler_unittest.cc" ]
       }
       if (!is_android && !is_ios) {
         sources +=
             [ "../browser/download/download_dir_policy_handler_unittest.cc" ]
       }
     }
     if (enable_web_speech) {
-      sources += rebase_path(unit_gypi_values.chrome_unit_tests_speech_sources,
-                             ".",
-                             "//chrome")
+      sources += rebase_path(
+              chrome_tests_unit_gypi_values.chrome_unit_tests_speech_sources,
+              ".",
+              "//chrome")
     }
     if (enable_notifications) {
-      sources +=
-          rebase_path(unit_gypi_values.chrome_unit_tests_notifications_sources,
-                      ".",
-                      "//chrome")
+      sources += rebase_path(
+              chrome_tests_unit_gypi_values.chrome_unit_tests_notifications_sources,
+              ".",
+              "//chrome")
       if (is_android) {
         sources -= [
           # Android does not use the Message Center notification system.
           "../browser/notifications/message_center_notifications_unittest.cc",
           "../browser/notifications/message_center_settings_controller_unittest.cc",
         ]
       }
     }
     if (safe_browsing_mode == 1) {
       # TODO(sgurun): enable tests for safe_browsing==2.
       sources += rebase_path(
-              unit_gypi_values.chrome_unit_tests_full_safe_browsing_sources,
+              chrome_tests_unit_gypi_values.chrome_unit_tests_full_safe_browsing_sources,
               ".",
               "//chrome")
       deps += [ ":test_proto" ]
       if (is_android) {
         deps -= [ ":test_proto" ]
         sources -= [
           # Android doesn't support download feedbacks.
           "../browser/safe_browsing/download_feedback_service_unittest.cc",
           "../browser/safe_browsing/download_feedback_unittest.cc",
           "../browser/safe_browsing/download_protection_service_unittest.cc",
           "../browser/safe_browsing/two_phase_uploader_unittest.cc",
           "../common/safe_browsing/ipc_protobuf_message_test_messages.h",
           "../common/safe_browsing/ipc_protobuf_message_unittest.cc",
         ]
       }
     }
     if (enable_autofill_dialog && !is_android) {
       sources += rebase_path(
-              unit_gypi_values.chrome_unit_tests_autofill_dialog_sources,
+              chrome_tests_unit_gypi_values.chrome_unit_tests_autofill_dialog_sources,
               ".",
               "//chrome")
     }
     if (enable_plugins) {
-      sources += rebase_path(unit_gypi_values.chrome_unit_tests_plugins_sources,
-                             ".",
-                             "//chrome")
+      sources += rebase_path(
+              chrome_tests_unit_gypi_values.chrome_unit_tests_plugins_sources,
+              ".",
+              "//chrome")
     }
     if (enable_print_preview) {
-      sources +=
-          rebase_path(unit_gypi_values.chrome_unit_tests_print_preview_sources,
-                      ".",
-                      "//chrome")
+      sources += rebase_path(
+              chrome_tests_unit_gypi_values.chrome_unit_tests_print_preview_sources,
+              ".",
+              "//chrome")
     }
     if (enable_captive_portal_detection) {
-      sources +=
-          rebase_path(unit_gypi_values.chrome_unit_tests_captive_portal_sources,
-                      ".",
-                      "//chrome")
+      sources += rebase_path(
+              chrome_tests_unit_gypi_values.chrome_unit_tests_captive_portal_sources,
+              ".",
+              "//chrome")
     }
     if (enable_session_service) {
       sources += rebase_path(
-              unit_gypi_values.chrome_unit_tests_session_service_sources,
+              chrome_tests_unit_gypi_values.chrome_unit_tests_session_service_sources,
               ".",
               "//chrome")
     }
     if (enable_media_router) {
-      sources +=
-          rebase_path(unit_gypi_values.chrome_unit_tests_media_router_sources,
-                      ".",
-                      "//chrome")
+      sources += rebase_path(
+              chrome_tests_unit_gypi_values.chrome_unit_tests_media_router_sources,
+              ".",
+              "//chrome")
       deps += [ "//chrome/browser/media/router:test_support" ]
       if (!toolkit_views) {
         sources -= [ "../browser/ui/views/media_router/media_router_ui_browsertest.cc" ]
       }
     }
     if (enable_webrtc) {
-      sources += rebase_path(unit_gypi_values.chrome_unit_tests_webrtc_sources,
-                             ".",
-                             "//chrome")
+      sources += rebase_path(
+              chrome_tests_unit_gypi_values.chrome_unit_tests_webrtc_sources,
+              ".",
+              "//chrome")
     }
     if (is_chromeos) {
-      sources +=
-          rebase_path(unit_gypi_values.chrome_unit_tests_chromeos_sources,
-                      ".",
-                      "//chrome")
-      deps += [
-        "//ash/resources",
-        "//ui/chromeos/resources",
-      ]
+      deps += [ "//chrome/browser/chromeos:unit_tests" ]
       sources -= [
         "../browser/signin/signin_global_error_unittest.cc",
         "../browser/signin/signin_manager_unittest.cc",
         "../browser/ui/views/app_list/linux/app_list_linux_unittest.cc",
         "../browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc",
         "../browser/ui/views/sync/one_click_signin_bubble_view_unittest.cc",
       ]
     }
     if (use_x11) {
       deps += [ "//ui/events/devices" ]
@@ skipping 24 matching lines @@
       deps += [
         "//dbus",
         "//dbus:test_support",
         "//ui/aura:test_support",
       ]
     }
     if (is_linux && is_chrome_branded && current_cpu == "x86") {
       ldflags = [ "-Wl,--strip-debug" ]
     }
     if (is_mac) {
-      sources += rebase_path(unit_gypi_values.chrome_unit_tests_mac_sources,
-                             ".",
-                             "//chrome")
+      sources += rebase_path(
+              chrome_tests_unit_gypi_values.chrome_unit_tests_mac_sources,
+              ".",
+              "//chrome")
       sources -= [
         "../browser/ui/tests/ui_gfx_image_unittest.cc",
         "../renderer/spellchecker/spellcheck_provider_hunspell_unittest.cc",
         "../tools/convert_dict/convert_dict_unittest.cc",
       ]
 
       # The test fetches resources which means Mac need the app bundle to exist
       # on disk so it can pull from it.
       deps += [
         "//third_party/google_toolbox_for_mac",
         "//third_party/ocmock",
       ]
 
       # TODO(mark): We really want this for all non-static library targets,
       # but when we tried to pull it up to the common.gypi level, it broke
       # other things like the ui and startup tests. *shrug*
       ldflags = [ "-Wl,-ObjC" ]
     }
     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(unit_gypi_values.chrome_unit_tests_win_mac_sources,
-                             ".",
-                             "//chrome")
+      sources += rebase_path(
+              chrome_tests_unit_gypi_values.chrome_unit_tests_win_mac_sources,
+              ".",
+              "//chrome")
     }
     if (is_win || is_mac || is_chromeos) {
       sources += [ "../common/extensions/api/networking_private/networking_private_crypto_unittest.cc" ]
     }
     if (enable_rlz) {
       deps += [ "//rlz:test_support" ]
     } else {
       sources -= [ "../browser/rlz/rlz_unittest.cc" ]
     }
     if (is_win) {
       if (!is_component_build) {
         # Unit_tests pdb files can get too big when incremental linking is
         # on, disabling for this target.
         #'LinkIncremental': '<(msvs_debug_link_nonincremental)',  TODO(GYP)
       }
 
-      sources += rebase_path(unit_gypi_values.chrome_unit_tests_win_sources,
-                             ".",
-                             "//chrome")
+      sources += rebase_path(
+              chrome_tests_unit_gypi_values.chrome_unit_tests_win_sources,
+              ".",
+              "//chrome")
       deps += [
         #'browser/safe_browsing/incident_reporting/verifier_test/verifier_unittest.gyp:verifier_test_dll_1',  TODO(GYP)
         #'browser/safe_browsing/incident_reporting/verifier_test/verifier_unittest.gyp:verifier_test_dll_2',  TODO(GYP)
         "//chrome:other_version",
         "//chrome_elf:blacklist_test_dll_1",
         "//chrome/installer/util:strings",
         "//third_party/iaccessible2",
         "//third_party/isimpledom",
         "//third_party/wtl",
         "//ui/resources",
@@ skipping 21 matching lines @@
       ]
     } else {
       sources -= [
         "../browser/metrics/variations/variations_request_scheduler_mobile_unittest.cc",
         "../browser/web_resource/promo_resource_service_mobile_ntp_unittest.cc",
       ]
       deps += [ "//chrome/tools/profile_reset:jtl_compiler_lib" ]
     }
     if (!is_android && !is_chromeos) {
       sources += rebase_path(
-              unit_gypi_values.chrome_unit_tests_non_android_or_chromeos_sources,
+              chrome_tests_unit_gypi_values.chrome_unit_tests_non_android_or_chromeos_sources,
               ".",
               "//chrome")
     }
     if (enable_themes) {
-      sources += rebase_path(unit_gypi_values.chrome_unit_tests_themes_sources,
-                             ".",
-                             "//chrome")
+      sources += rebase_path(
+              chrome_tests_unit_gypi_values.chrome_unit_tests_themes_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(
-              unit_gypi_values.chrome_unit_tests_supervised_user_sources,
+              chrome_tests_unit_gypi_values.chrome_unit_tests_supervised_user_sources,
               ".",
               "//chrome")
     }
     if (enable_supervised_users && !is_android && !is_ios) {
       sources += rebase_path(
-              unit_gypi_values.chrome_unit_tests_supervised_user_legacy_sources,
+              chrome_tests_unit_gypi_values.chrome_unit_tests_supervised_user_legacy_sources,
               ".",
               "//chrome")
     }
     if (safe_browsing_mode == 1 && enable_extensions) {
       sources += [ "../browser/extensions/blacklist_unittest.cc" ]
     }
     if (cld_version == 1) {
       sources += [ "//third_party/cld/encodings/compact_lang_det/compact_lang_det_unittest_small.cc" ]
       defines += [ "CLD_WINDOWS" ]
       deps += [ "//third_party/cld" ]
     }
     if (enable_app_list) {
-      sources +=
-          rebase_path(unit_gypi_values.chrome_unit_tests_app_list_sources,
-                      ".",
-                      "//chrome")
+      sources += rebase_path(
+              chrome_tests_unit_gypi_values.chrome_unit_tests_app_list_sources,
+              ".",
+              "//chrome")
       deps += [ "//ui/app_list:test_support" ]
     }
     if (enable_app_list && is_chromeos) {
       sources += rebase_path(
-              unit_gypi_values.chrome_unit_tests_app_list_chromeos_sources,
+              chrome_tests_unit_gypi_values.chrome_unit_tests_app_list_chromeos_sources,
               ".",
               "//chrome")
     }
     if (!enable_plugin_installation) {
       sources -= [ "../browser/plugins/plugin_installer_unittest.cc" ]
     }
   }
 
   if (is_win || (is_linux && !is_chromeos)) {
     # TODO(GYP): Figure out which of these work and are needed on other
@@ skipping 91 matching lines @@
     "//base",
     "//chrome:resources",
     "//chrome:strings",
     "//chrome/browser",
     "//chrome/common",
     "//mojo/environment:chromium",
     "//third_party/mojo/src/mojo/edk/system",
   ]
 
   if (!is_android && use_ash) {
-    sources +=
-        rebase_path(unit_gypi_values.chrome_test_support_unit_ash_sources,
-                    ".",
-                    "//chrome")
+    sources += rebase_path(
+            chrome_tests_unit_gypi_values.chrome_test_support_unit_ash_sources,
+            ".",
+            "//chrome")
   }
 }