Move GN obj files to target-specific dirs

chrome/chrome_tests.gypi

 # Copyright 2013 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.
 {
   'variables': {
     'chrome_browser_extensions_test_support_sources': [
       # A list of sources which is shared between different browser tests.
       'browser/apps/app_browsertest_util.cc',
       'browser/apps/app_browsertest_util.h',
       'browser/extensions/browsertest_util.cc',
       'browser/extensions/browsertest_util.h',
       'browser/extensions/extension_apitest.cc',
       'browser/extensions/extension_apitest.h',
       'browser/extensions/extension_browsertest.cc',
       'browser/extensions/extension_browsertest.h',
       'browser/extensions/extension_function_test_utils.cc',
       'browser/extensions/extension_function_test_utils.h',
       'browser/extensions/extension_test_notification_observer.cc',
       'browser/extensions/extension_test_notification_observer.h',
       'browser/extensions/updater/extension_cache_fake.cc',
       'browser/extensions/updater/extension_cache_fake.h',
     ],
-    'chrome_browser_tests_sources': [
-      # The list of sources which is only used by chrome browser tests.
-      '../apps/app_restore_service_browsertest.cc',
-      '../apps/load_and_launch_browsertest.cc',
-      # TODO(rockot): Remove this once extensions_browsertests exists.
+    # TODO(rockot): These should be moved to extensions_browsertests but have
+    # old dependencies on chrome files. The chrome dependencies should be
+    # removed and these moved to the extensions_browsertests target.
+    'chrome_browser_tests_extensions_sources': [

[Nico, 2015/06/30 20:38:46]

Can you file a bug on rockot for this? I doubt he's polling the codebase for
TODOs that people add on him. (Yes, there was a TODO before, but it has now
changed in scope)

       '../extensions/browser/api/app_window/app_window_apitest.cc',
       '../extensions/browser/api/bluetooth/bluetooth_apitest.cc',
       '../extensions/browser/api/bluetooth/bluetooth_private_apitest.cc',
       '../extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_apitest.cc',
       '../extensions/browser/api/cast_channel/cast_channel_apitest.cc',
       '../extensions/browser/api/runtime/runtime_apitest.cc',
       '../extensions/browser/api/serial/serial_apitest.cc',
       '../extensions/browser/api/usb/usb_manual_apitest.cc',
       '../extensions/browser/app_window/app_window_browsertest.cc',
       '../extensions/browser/guest_view/extension_options/extension_options_apitest.cc',
       '../extensions/browser/guest_view/mime_handler_view/mime_handler_view_browsertest.cc',
       '../extensions/renderer/console_apitest.cc',
       '../extensions/renderer/script_context_browsertest.cc',
+    ],
+    'chrome_browser_tests_sources': [
+      # The list of sources which is only used by chrome browser tests.
+      '../apps/app_restore_service_browsertest.cc',
+      '../apps/load_and_launch_browsertest.cc',
       'app/chrome_command_ids.h',
       'app/chrome_dll.rc',
       'app/chrome_dll_resource.h',
       'app/chrome_version.rc.version',
       'browser/accessibility/browser_accessibility_state_browsertest.cc',
       'browser/app_controller_mac_browsertest.mm',
       'browser/apps/app_browsertest.cc',
       'browser/apps/app_shim/app_shim_host_manager_browsertest_mac.mm',
       'browser/apps/app_shim/test/app_shim_host_manager_test_api_mac.cc',
       'browser/apps/app_shim/test/app_shim_host_manager_test_api_mac.h',
+      'browser/apps/app_speech_recognition_browsertest.cc',
       'browser/apps/app_url_redirector_browsertest.cc',
       'browser/apps/app_window_browsertest.cc',
       'browser/apps/ephemeral_app_browsertest.cc',
       'browser/apps/ephemeral_app_browsertest.h',
       'browser/apps/ephemeral_app_launcher_browsertest.cc',
       'browser/apps/ephemeral_app_service_browsertest.cc',
       'browser/apps/event_page_browsertest.cc',
       'browser/apps/guest_view/app_view_browsertest.cc',
       'browser/apps/guest_view/extension_view/extension_view_browsertest.cc',
       'browser/apps/guest_view/web_view_browsertest.cc',
-      'browser/apps/speech_recognition_browsertest.cc',
       'browser/apps/window_controls_browsertest.cc',
       'browser/autocomplete/autocomplete_browsertest.cc',
       'browser/autofill/autofill_browsertest.cc',
       'browser/autofill/autofill_server_browsertest.cc',
       'browser/autofill/content_autofill_driver_browsertest.cc',
       'browser/autofill/form_structure_browsertest.cc',
       'browser/banners/app_banner_data_fetcher_browsertest.cc',
       'browser/bitmap_fetcher/bitmap_fetcher_browsertest.cc',
       'browser/browser_encoding_browsertest.cc',
       'browser/browsing_data/browsing_data_database_helper_browsertest.cc',
@@ skipping 857 matching lines @@
       'test/data/webui/net_internals/net_internals_test.js',
       'test/data/webui/net_internals/prerender_view.js',
       'test/data/webui/net_internals/timeline_view.js',
       'test/data/webui/net_internals/waterfall_view.js',
       'test/data/webui/net_internals/sdch_view.js',
       'test/data/webui/ntp4.js',
       'test/data/webui/polymer_browser_test_base.js',
       'test/data/webui/print_preview.js',
       'test/data/webui/sandboxstatus_browsertest.js',
     ],
+    # TODO(rockot): These should be moved to a target in //extensions but have
+    # old dependencies on chrome files. The chrome dependencies should be
+    # removed and these moved to the extensions_browsertests target.
+    'chrome_interactive_ui_test_extensions_sources': [
+      '../extensions/browser/app_window/app_window_interactive_uitest.cc',
+    ],
     'chrome_interactive_ui_test_sources': [
-      '../extensions/browser/app_window/app_window_interactive_uitest.cc',
       '../ui/base/clipboard/clipboard_android_unittest.cc',
       '../ui/base/clipboard/clipboard_unittest.cc',
       'browser/apps/app_browsertest_util.cc',
       'browser/apps/app_browsertest_util.h',
       'browser/apps/app_pointer_lock_interactive_uitest.cc',
       'browser/apps/app_shim/app_shim_interactive_uitest_mac.mm',
       'browser/apps/app_shim/app_shim_quit_interactive_uitest_mac.mm',
       'browser/apps/app_window_interactive_uitest.cc',
       'browser/apps/app_window_intercept_all_keys_uitest.cc',
       'browser/apps/guest_view/web_view_interactive_browsertest.cc',
@@ skipping 116 matching lines @@
     # TODO(tapted): Move these to chrome_interactive_ui_test_views_sources when
     # the corresponding files are moved in chrome_browser_ui.gypi (i.e. out of
     # chrome_browser_ui_views_non_mac_sources).
     'chrome_interactive_ui_test_views_non_mac_sources': [
       'browser/ui/views/bookmarks/bookmark_bar_view_test.cc',
       'browser/ui/views/bookmarks/bookmark_bar_view_test_helper.h',
       'browser/ui/views/certificate_selector_browsertest.cc',
       'browser/ui/views/constrained_window_views_browsertest.cc',
       'browser/ui/views/extensions/extension_dialog_interactive_uitest.cc',
       'browser/ui/views/find_bar_controller_interactive_uitest.cc',
-      'browser/ui/views/find_bar_host_interactive_uitest.cc',
+      'browser/ui/views/find_bar_views_interactive_uitest.cc',
       'browser/ui/views/frame/browser_view_focus_uitest.cc',
       'browser/ui/views/frame/browser_view_interactive_uitest.cc',
       'browser/ui/views/keyboard_access_browsertest.cc',
       'browser/ui/views/location_bar/location_icon_view_interactive_uitest.cc',
       'browser/ui/views/location_bar/page_action_image_view_interactive_uitest.cc',
       'browser/ui/views/location_bar/star_view_browsertest.cc',
       'browser/ui/views/omnibox/omnibox_view_views_browsertest.cc',
       'browser/ui/views/passwords/manage_passwords_bubble_view_browsertest.cc',
       'browser/ui/views/passwords/manage_passwords_icon_view_browsertest.cc',
       'browser/ui/views/ssl_client_certificate_selector_browsertest.cc',
@@ skipping 450 matching lines @@
         # Runtime dependencies
         '../third_party/mesa/mesa.gyp:osmesa',
       ],
       'include_dirs': [
         '..',
       ],
       'defines': [
         'HAS_OUT_OF_PROC_TEST_RUNNER',
       ],
       'sources': [
+        '<@(chrome_interactive_ui_test_extensions_sources)',
         '<@(chrome_interactive_ui_test_sources)',
       ],
       'conditions': [
         [ 'cld_version==0 or cld_version==2', {
           'dependencies': [
             # Interactive tests should use whatever CLD2 data access mode that
             # the application embedder is using.
             '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld2_platform_impl', ],
         }],
         ['use_x11==1', {
@@ skipping 496 matching lines @@
         '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_test_license_server',
       ],
       'include_dirs': [
         '..',
         '<(SHARED_INTERMEDIATE_DIR)',
       ],
       'defines': [
         'HAS_OUT_OF_PROC_TEST_RUNNER',
       ],
       'sources': [
+        '<@(chrome_browser_tests_extensions_sources)',
         '<@(chrome_browser_tests_sources)',
         '<@(chrome_browser_tests_webui_js_sources)',
         '<@(chrome_browser_extensions_test_support_sources)',
         'test/base/browser_tests_main.cc',
       ],
       'rules': [
         {
           'rule_name': 'js2webui',
           'extension': 'js',
           'msvs_external_rule': 1,
@@ skipping 1226 matching lines @@
             'utility',
           ],
           'sources': [
             'tools/service_discovery_sniffer/service_discovery_sniffer.cc',
             'tools/service_discovery_sniffer/service_discovery_sniffer.h',
           ],
         }]
     }],
   ],  # 'conditions'
 }