Move interactive_ui_tests gyp definitions into chrome/chrome_tests.gypi

Among other things, makes it so that the test implementation files appear in the right places in the Xcode source tree (maybe helps on other platforms too -- haven't checked)

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/3571001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61125 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 172 insertions, 175 deletions

diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 0b0a9e7..85edf20 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -17,9 +17,6 @@
   },
   'targets': [
     {
-      'includes': ['test/interactive_ui/interactive_ui_tests.gypi']
-    },
-    {
       # This target contains mocks and test utilities that don't belong in
       # production libraries but are used by more than one test executable.
       'target_name': 'test_support_common',
@@ -266,6 +263,178 @@
       ],
     },
     {
+      'target_name': 'interactive_ui_tests',
+      'type': 'executable',
+      'msvs_guid': '018D4F38-6272-448F-A864-976DA09F05D0',
+      'dependencies': [
+        'chrome.gyp:chrome',
+        'chrome.gyp:chrome_resources',
+        'chrome.gyp:chrome_strings',
+        'chrome.gyp:debugger',
+        'chrome.gyp:test_support_common',
+        'chrome.gyp:test_support_ui',
+        'chrome.gyp:syncapi',
+        'browser/sync/protocol/sync_proto.gyp:sync_proto_cpp',
+        '../third_party/hunspell/hunspell.gyp:hunspell',
+        '../net/net.gyp:net_resources',
+        '../net/net.gyp:net_test_support',
+        '../skia/skia.gyp:skia',
+        '../third_party/icu/icu.gyp:icui18n',
+        '../third_party/libpng/libpng.gyp:libpng',
+        '../third_party/zlib/zlib.gyp:zlib',
+        '../testing/gtest.gyp:gtest',
+        '../third_party/npapi/npapi.gyp:npapi',
+        # run time dependency
+        '../webkit/support/webkit_support.gyp:webkit_resources',
+      ],
+      'include_dirs': [
+        '..',
+      ],
+      'defines': [ 'ALLOW_IN_PROC_BROWSER_TEST' ],
+      'sources': [
+        'browser/autocomplete/autocomplete_edit_view_browsertest.cc',
+        'browser/browser_focus_uitest.cc',
+        'browser/browser_keyevents_browsertest.cc',
+        'browser/collected_cookies_uitest.cc',
+        'browser/debugger/devtools_sanity_unittest.cc',
+        'browser/gtk/bookmark_bar_gtk_interactive_uitest.cc',
+        'browser/notifications/notifications_interactive_uitest.cc',
+        'browser/views/bookmark_bar_view_test.cc',
+        'browser/views/browser_keyboard_accessibility_test_win.cc',
+        'browser/views/find_bar_host_interactive_uitest.cc',
+        'browser/views/tabs/tab_dragging_test.cc',
+        'test/in_process_browser_test.cc',
+        'test/in_process_browser_test.h',
+        'test/interactive_ui/fast_shutdown_interactive_uitest.cc',
+        'test/interactive_ui/infobars_uitest.cc',
+        'test/interactive_ui/keyboard_access_uitest.cc',
+        'test/interactive_ui/mouseleave_interactive_uitest.cc',
+        'test/interactive_ui/npapi_interactive_test.cc',
+        'test/interactive_ui/view_event_test_base.cc',
+        'test/interactive_ui/view_event_test_base.h',
+        'test/test_launcher/out_of_proc_test_runner.cc',
+        'test/test_launcher/test_runner.cc',
+        'test/test_launcher/test_runner.h',
+        'test/unit/chrome_test_suite.h',
+      ],
+      'conditions': [
+        ['OS=="linux"', {
+          'dependencies': [
+            '../build/linux/system.gyp:gtk',
+            '../build/linux/system.gyp:nss',
+            '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
+          ],
+        }],
+        ['OS=="linux" and toolkit_views==0', {
+          'sources!': [
+            # TODO(port)
+            'browser/views/bookmark_bar_view_test.cc',
+            'browser/views/find_bar_host_interactive_uitest.cc',
+            'browser/views/tabs/tab_dragging_test.cc',
+            'browser/views/tabs/tab_strip_interactive_uitest.cc',
+            'test/interactive_ui/npapi_interactive_test.cc',
+            'test/interactive_ui/view_event_test_base.cc',
+            'test/interactive_ui/view_event_test_base.h',
+          ],
+        }],
+        ['OS=="linux" and toolkit_views==1', {
+          'sources!': [
+            'browser/gtk/bookmark_bar_gtk_interactive_uitest.cc',
+            # TODO(port)
+            'test/interactive_ui/npapi_interactive_test.cc',
+          ],
+        }],
+        ['target_arch!="x64" and target_arch!="arm"', {
+          'dependencies': [
+            # run time dependency
+            '../webkit/webkit.gyp:npapi_test_plugin',
+          ],
+        }],  # target_arch
+        ['OS=="mac"', {
+          'sources!': [
+            # TODO(port)
+            'browser/autocomplete/autocomplete_edit_view_browsertest.cc',
+            'browser/debugger/devtools_sanity_unittest.cc',
+            'browser/views/bookmark_bar_view_test.cc',
+            'browser/views/find_bar_host_interactive_uitest.cc',
+            'browser/views/tabs/tab_dragging_test.cc',
+            'browser/views/tabs/tab_strip_interactive_uitest.cc',
+            'test/interactive_ui/npapi_interactive_test.cc',
+            'test/interactive_ui/view_event_test_base.cc',
+            'test/interactive_ui/view_event_test_base.h',
+          ],
+          # See comment about the same line in chrome/chrome_tests.gypi.
+          'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
+        }],  # OS=="mac"
+        ['toolkit_views==1', {
+          'dependencies': [
+            '../views/views.gyp:views',
+          ],
+        }],
+        ['OS=="win"', {
+          'include_dirs': [
+            '../third_party/wtl/include',
+          ],
+          'dependencies': [
+            '../app/app.gyp:app_resources',
+            'chrome.gyp:chrome_dll_version',
+            'chrome.gyp:crash_service',  # run time dependency
+            'chrome.gyp:installer_util_strings',
+            '../sandbox/sandbox.gyp:sandbox',
+            '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
+          ],
+          'sources': [
+            '../webkit/glue/resources/aliasb.cur',
+            '../webkit/glue/resources/cell.cur',
+            '../webkit/glue/resources/col_resize.cur',
+            '../webkit/glue/resources/copy.cur',
+            '../webkit/glue/resources/row_resize.cur',
+            '../webkit/glue/resources/vertical_text.cur',
+            '../webkit/glue/resources/zoom_in.cur',
+            '../webkit/glue/resources/zoom_out.cur',
+
+            'app/chrome_dll.rc',
+            'test/data/resource.rc',
+
+            # TODO:  It would be nice to have these pulled in
+            # automatically from direct_dependent_settings in
+            # their various targets (net.gyp:net_resources, etc.),
+            # but that causes errors in other targets when
+            # resulting .res files get referenced multiple times.
+            '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
+
+            'browser/accessibility_win_browsertest.cc',
+            # TODO: port sidebar.
+            'browser/sidebar/sidebar_test.cc',
+            'browser/views/browser_views_accessibility_browsertest.cc',
+          ],
+          'conditions': [
+            ['win_use_allocator_shim==1', {
+              'dependencies': [
+                 '../base/allocator/allocator.gyp:allocator',
+              ],
+            }],
+          ],
+          'configurations': {
+            'Debug_Base': {
+              'msvs_settings': {
+                'VCLinkerTool': {
+                  'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
+                },
+              },
+            },
+          },  # configurations
+        }],  # OS=="win"
+      ],  # conditions
+    },
+    {
       'target_name': 'ui_tests',
       'type': 'executable',
       'msvs_guid': '76235B67-1C27-4627-8A33-4B2E1EF93EDE',
diff --git a/chrome/test/interactive_ui/interactive_ui_tests.gypi b/chrome/test/interactive_ui/interactive_ui_tests.gypi
deleted file mode 100644
index 2c9be8e..0000000
--- a/chrome/test/interactive_ui/interactive_ui_tests.gypi
+++ /dev/null
@@ -1,172 +0,0 @@
-{
-  'target_name': 'interactive_ui_tests',
-  'type': 'executable',
-  'msvs_guid': '018D4F38-6272-448F-A864-976DA09F05D0',
-  'dependencies': [
-    '<(DEPTH)/chrome/chrome.gyp:chrome',
-    '<(DEPTH)/chrome/chrome.gyp:chrome_resources',
-    '<(DEPTH)/chrome/chrome.gyp:chrome_strings',
-    '<(DEPTH)/chrome/chrome.gyp:debugger',
-    '<(DEPTH)/chrome/chrome.gyp:test_support_common',
-    '<(DEPTH)/chrome/chrome.gyp:test_support_ui',
-    '<(DEPTH)/chrome/chrome.gyp:syncapi',
-    '<(DEPTH)/chrome/browser/sync/protocol/sync_proto.gyp:sync_proto_cpp',
-    '<(DEPTH)/third_party/hunspell/hunspell.gyp:hunspell',
-    '<(DEPTH)/net/net.gyp:net_resources',
-    '<(DEPTH)/net/net.gyp:net_test_support',
-    '<(DEPTH)/skia/skia.gyp:skia',
-    '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
-    '<(DEPTH)/third_party/libpng/libpng.gyp:libpng',
-    '<(DEPTH)/third_party/zlib/zlib.gyp:zlib',
-    '<(DEPTH)/testing/gtest.gyp:gtest',
-    '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
-    # run time dependency
-    '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources',
-  ],
-  'include_dirs': [
-    '<(DEPTH)',
-  ],
-  'defines': [ 'ALLOW_IN_PROC_BROWSER_TEST' ],
-  'sources': [
-    '<(DEPTH)/chrome/browser/autocomplete/autocomplete_edit_view_browsertest.cc',
-    '<(DEPTH)/chrome/browser/browser_focus_uitest.cc',
-    '<(DEPTH)/chrome/browser/browser_keyevents_browsertest.cc',
-    '<(DEPTH)/chrome/browser/collected_cookies_uitest.cc',
-    '<(DEPTH)/chrome/browser/debugger/devtools_sanity_unittest.cc',
-    '<(DEPTH)/chrome/browser/gtk/bookmark_bar_gtk_interactive_uitest.cc',
-    '<(DEPTH)/chrome/browser/notifications/notifications_interactive_uitest.cc',
-    '<(DEPTH)/chrome/browser/views/bookmark_bar_view_test.cc',
-    '<(DEPTH)/chrome/browser/views/browser_keyboard_accessibility_test_win.cc',
-    '<(DEPTH)/chrome/browser/views/find_bar_host_interactive_uitest.cc',
-    '<(DEPTH)/chrome/browser/views/tabs/tab_dragging_test.cc',
-    '<(DEPTH)/chrome/test/in_process_browser_test.cc',
-    '<(DEPTH)/chrome/test/in_process_browser_test.h',
-    '<(DEPTH)/chrome/test/interactive_ui/fast_shutdown_interactive_uitest.cc',
-    '<(DEPTH)/chrome/test/interactive_ui/infobars_uitest.cc',
-    '<(DEPTH)/chrome/test/interactive_ui/keyboard_access_uitest.cc',
-    '<(DEPTH)/chrome/test/interactive_ui/mouseleave_interactive_uitest.cc',
-    '<(DEPTH)/chrome/test/interactive_ui/npapi_interactive_test.cc',
-    '<(DEPTH)/chrome/test/interactive_ui/view_event_test_base.cc',
-    '<(DEPTH)/chrome/test/interactive_ui/view_event_test_base.h',
-    '<(DEPTH)/chrome/test/test_launcher/out_of_proc_test_runner.cc',
-    '<(DEPTH)/chrome/test/test_launcher/test_runner.cc',
-    '<(DEPTH)/chrome/test/test_launcher/test_runner.h',
-    '<(DEPTH)/chrome/test/unit/chrome_test_suite.h',
-  ],
-  'conditions': [
-    ['OS=="linux"', {
-      'dependencies': [
-        '<(DEPTH)/build/linux/system.gyp:gtk',
-        '<(DEPTH)/build/linux/system.gyp:nss',
-        '<(DEPTH)/tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
-      ],
-    }],
-    ['OS=="linux" and toolkit_views==0', {
-      'sources!': [
-        # TODO(port)
-        '<(DEPTH)/chrome/browser/views/bookmark_bar_view_test.cc',
-        '<(DEPTH)/chrome/browser/views/find_bar_host_interactive_uitest.cc',
-        '<(DEPTH)/chrome/browser/views/tabs/tab_dragging_test.cc',
-        '<(DEPTH)/chrome/browser/views/tabs/tab_strip_interactive_uitest.cc',
-        '<(DEPTH)/chrome/test/interactive_ui/npapi_interactive_test.cc',
-        '<(DEPTH)/chrome/test/interactive_ui/view_event_test_base.cc',
-        '<(DEPTH)/chrome/test/interactive_ui/view_event_test_base.h',
-      ],
-    }],
-    ['OS=="linux" and toolkit_views==1', {
-      'sources!': [
-        '<(DEPTH)/chrome/browser/gtk/bookmark_bar_gtk_interactive_uitest.cc',
-        # TODO(port)
-        '<(DEPTH)/chrome/test/interactive_ui/npapi_interactive_test.cc',
-      ],
-    }],
-    ['target_arch!="x64" and target_arch!="arm"', {
-      'dependencies': [
-        # run time dependency
-        '<(DEPTH)/webkit/webkit.gyp:npapi_test_plugin',
-      ],
-    }],  # target_arch
-    ['OS=="mac"', {
-      'sources!': [
-        # TODO(port)
-        '<(DEPTH)/chrome/browser/autocomplete/autocomplete_edit_view_browsertest.cc',
-        '<(DEPTH)/chrome/browser/debugger/devtools_sanity_unittest.cc',
-        '<(DEPTH)/chrome/browser/views/bookmark_bar_view_test.cc',
-        '<(DEPTH)/chrome/browser/views/find_bar_host_interactive_uitest.cc',
-        '<(DEPTH)/chrome/browser/views/tabs/tab_dragging_test.cc',
-        '<(DEPTH)/chrome/browser/views/tabs/tab_strip_interactive_uitest.cc',
-        '<(DEPTH)/chrome/test/interactive_ui/npapi_interactive_test.cc',
-        '<(DEPTH)/chrome/test/interactive_ui/view_event_test_base.cc',
-        '<(DEPTH)/chrome/test/interactive_ui/view_event_test_base.h',
-      ],
-      # See comment about the same line in chrome/chrome_tests.gypi.
-      'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
-    }],  # OS=="mac"
-    ['toolkit_views==1', {
-      'dependencies': [
-        '<(DEPTH)/views/views.gyp:views',
-      ],
-    }],
-    ['OS=="win"', {
-      'include_dirs': [
-        '<(DEPTH)/third_party/wtl/include',
-      ],
-      'dependencies': [
-        '<(DEPTH)/app/app.gyp:app_resources',
-        '<(DEPTH)/chrome/chrome.gyp:chrome_dll_version',
-        '<(DEPTH)/chrome/chrome.gyp:crash_service',  # run time dependency
-        '<(DEPTH)/chrome/chrome.gyp:installer_util_strings',
-        '<(DEPTH)/sandbox/sandbox.gyp:sandbox',
-        '<(DEPTH)/third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
-      ],
-      'sources': [
-        '<(DEPTH)/webkit/glue/resources/aliasb.cur',
-        '<(DEPTH)/webkit/glue/resources/cell.cur',
-        '<(DEPTH)/webkit/glue/resources/col_resize.cur',
-        '<(DEPTH)/webkit/glue/resources/copy.cur',
-        '<(DEPTH)/webkit/glue/resources/row_resize.cur',
-        '<(DEPTH)/webkit/glue/resources/vertical_text.cur',
-        '<(DEPTH)/webkit/glue/resources/zoom_in.cur',
-        '<(DEPTH)/webkit/glue/resources/zoom_out.cur',
-
-        '<(DEPTH)/chrome/app/chrome_dll.rc',
-        '<(DEPTH)/chrome/test/data/resource.rc',
-
-        # TODO:  It would be nice to have these pulled in
-        # automatically from direct_dependent_settings in
-        # their various targets (net.gyp:net_resources, etc.),
-        # but that causes errors in other targets when
-        # resulting .res files get referenced multiple times.
-        '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc',
-        '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
-        '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
-        '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
-        '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
-        '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
-        '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
-        '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
-
-        '<(DEPTH)/chrome/browser/accessibility_win_browsertest.cc',
-        # TODO: port sidebar.
-        '<(DEPTH)/chrome/browser/sidebar/sidebar_test.cc',
-        '<(DEPTH)/chrome/browser/views/browser_views_accessibility_browsertest.cc',
-      ],
-      'conditions': [
-        ['win_use_allocator_shim==1', {
-          'dependencies': [
-             '<(DEPTH)/base/allocator/allocator.gyp:allocator',
-          ],
-        }],
-      ],
-      'configurations': {
-        'Debug_Base': {
-          'msvs_settings': {
-            'VCLinkerTool': {
-              'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
-            },
-          },
-        },
-      },  # configurations
-    }],  # OS=="win"
-  ],  # conditions
-}