chrome.gyp updates:

chrome/chrome.gyp

 # Copyright (c) 2009 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': {
     'chromium_code': 1,
   },
   'includes': [
     '../build/common.gypi',
@@ skipping 1939 matching lines @@
         'test/automation/constrained_window_proxy.h',
         'test/automation/tab_proxy.cc',
         'test/automation/tab_proxy.h',
         'test/automation/window_proxy.cc',
         'test/automation/window_proxy.h',
         'test/chrome_process_util.cc',
         'test/chrome_process_util.h',
         'test/chrome_process_util_linux.cc',
         'test/chrome_process_util_mac.cc',
         'test/chrome_process_util_win.cc',
+        'test/in_process_browser_test.cc',
+        'test/in_process_browser_test.h',
         'test/testing_profile.cc',
         'test/testing_profile.h',
+        'test/ui_test_utils.cc',
+        'test/ui_test_utils.h',
       ],
       'conditions': [
         ['OS=="linux"', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
           ],
         }],
         ['OS=="win"', {
           'include_dirs': [
             'third_party/wtl/include',
           ],
         }, { # OS != "win"
           'sources!': [
             'test/automation/autocomplete_edit_proxy.cc',
             'test/automation/autocomplete_edit_proxy.h',
+            'test/in_process_browser_test.cc',
+            'test/in_process_browser_test.h',
+            'test/ui_test_utils.cc',
+            'test/ui_test_utils.h',
           ],
         }],
       ],
     },
     {
       'target_name': 'test_support_ui',
       'type': '<(library)',
       'dependencies': [
         'test_support_common',
         'resources',
@@ skipping 365 matching lines @@
         'browser/sessions/session_service_unittest.cc',
         'browser/sessions/tab_restore_service_unittest.cc',
         'browser/site_instance_unittest.cc',
         'browser/spellcheck_unittest.cc',
         'browser/tab_contents/render_view_host_manager_unittest.cc',
         'browser/tab_contents/web_contents_unittest.cc',
         'browser/tabs/tab_strip_model_unittest.cc',
         'browser/task_manager_unittest.cc',
         'browser/theme_resources_util_unittest.cc',
         'browser/views/bookmark_editor_view_unittest.cc',
-        'browser/views/find_bar_win_unittest.cc',
         'browser/views/keyword_editor_view_unittest.cc',
         'browser/visitedlink_unittest.cc',
         'browser/webdata/web_database_unittest.cc',
         'browser/window_sizer_unittest.cc',
         'common/animation_unittest.cc',
         'common/bzip2_unittest.cc',
         'common/chrome_plugin_unittest.cc',
         'common/extensions/url_pattern_unittest.cc',
         'common/extensions/user_script_unittest.cc',
         'common/file_descriptor_set_unittest.cc',
@@ skipping 26 matching lines @@
         'renderer/net/render_dns_master_unittest.cc',
         'renderer/net/render_dns_queue_unittest.cc',
         'renderer/render_process_unittest.cc',
         'renderer/render_thread_unittest.cc',
         'renderer/render_view_unittest.cc',
         'renderer/render_widget_unittest.cc',
         'renderer/renderer_logging_mac_unittest.mm',
         'renderer/renderer_main_unittest.cc',
         'test/browser_with_test_window_test.cc',
         'test/browser_with_test_window_test.h',
-        'test/in_process_browser_test.cc',
-        'test/in_process_browser_test.h',
         'test/render_view_test.cc',
         'test/render_view_test.h',
         'test/test_notification_tracker.cc',
         'test/test_notification_tracker.h',
-        'test/ui_test_utils.cc',
-        'test/ui_test_utils.h',
         'test/v8_unit_test.cc',
         'test/v8_unit_test.h',
         'views/controls/label_unittest.cc',
         'views/controls/table/table_view_unittest.cc',
         'views/controls/tree/tree_node_iterator_unittest.cc',
         'views/focus/focus_manager_unittest.cc',
         'views/grid_layout_unittest.cc',
         'views/view_unittest.cc',
       ],
       'conditions': [
@@ skipping 78 matching lines @@
             'browser/views/find_bar_win_unittest.cc',
             'browser/views/keyword_editor_view_unittest.cc',
             'browser/window_sizer_unittest.cc',
             'common/chrome_plugin_unittest.cc',
             'common/gfx/emf_unittest.cc',
             'common/gfx/icon_util_unittest.cc',
             'common/net/url_util_unittest.cc',
             'common/os_exchange_data_unittest.cc',
             'test/browser_with_test_window_test.cc',
             'test/browser_with_test_window_test.h',
-            'test/in_process_browser_test.cc',
-            'test/in_process_browser_test.h',
-            'test/ui_test_utils.cc',
-            'test/ui_test_utils.h',
             'views/controls/label_unittest.cc',
             'views/controls/table/table_view_unittest.cc',
             'views/focus/focus_manager_unittest.cc',
             'views/grid_layout_unittest.cc',
             'views/view_unittest.cc',
           ],
         }],
       ],
     },
     {
@@ skipping 18 matching lines @@
       'conditions': [
         ['OS=="linux"', {
           'dependencies': [
             'views',
             '../build/linux/system.gyp:gtk',
           ],
         }],
         ['OS!="win"', {
           'sources!': [
             'test/startup/feature_startup_test.cc',
-            'tools/build/win/precompiled.cc',
-            'tools/build/win/precompiled.h',
           ],
         }],
       ],
     },
     {
       'target_name': 'page_cycler_tests',
       'type': 'executable',
       'dependencies': [
         'resources',
         'test_support_ui',
@@ skipping 390 matching lines @@
                 'views/window/window_win.cc',
               ],
             }],
           ],
         },
       ],
     }], # OS=="win" or OS=="linux"
     ['OS=="win"',
       { 'targets': [
         {
+          'target_name': 'interactive_ui_tests',
+          'type': 'executable',
+          'dependencies': [
+            'resources',
+            'test_support_common',
+            'test_support_ui',
+            'third_party/hunspell/hunspell.gyp:hunspell',
+            'views',
+            '../skia/skia.gyp:skia',
+            '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
+            '../third_party/icu38/icu38.gyp:icui18n',
+            '../third_party/libpng/libpng.gyp:libpng',
+            '../third_party/libxml/libxml.gyp:libxml',
+            '../third_party/zlib/zlib.gyp:zlib',
+            '../testing/gtest.gyp:gtest',
+            '../third_party/npapi/npapi.gyp:npapi',
+          ],
+          'include_dirs': [
+            '..',
+            'third_party/wtl/include',
+          ],
+          'sources': [
+            'browser/browser_focus_uitest.cc',
+            'browser/views/bookmark_bar_view_test.cc',
+            'browser/views/constrained_window_impl_interactive_uitest.cc',
+            'browser/views/find_bar_win_interactive_uitest.cc',
+            'browser/views/tabs/tab_dragging_test.cc',
+            'test/interactive_ui/npapi_interactive_test.cc',
+            'test/interactive_ui/view_event_test_base.cc',
+            'test/interactive_ui/view_event_test_base.h',
+            'tools/build/win/precompiled_wtl.h',
+            'tools/build/win/precompiled_wtl.cc',
+          ],
+          'configurations': {
+            'Debug': {
+              'msvs_precompiled_header': 'tools/build/win/precompiled_wtl.h',
+              'msvs_precompiled_source': 'tools/build/win/precompiled_wtl.cc',
+            },
+          },
+        },
+        {
+          'target_name': 'plugin_tests',
+          'type': 'executable',
+          'dependencies': [
+            'resources',
+            'test_support_common',
+            'test_support_ui',
+            '../skia/skia.gyp:skia',
+            '../testing/gtest.gyp:gtest',
+            '../third_party/libxml/libxml.gyp:libxml',
+            '../third_party/libxslt/libxslt.gyp:libxslt',
+            '../third_party/npapi/npapi.gyp:npapi',
+          ],
+          'include_dirs': [
+            '..',
+            'third_party/wtl/include',
+          ],
+          'sources': [
+            'test/plugin/plugin_test.cpp',
+            'tools/build/win/precompiled_wtl.h',
+            'tools/build/win/precompiled_wtl.cc',
+          ],
+          'configurations': {
+            'Debug': {
+              'msvs_precompiled_header': 'tools/build/win/precompiled_wtl.h',
+              'msvs_precompiled_source': 'tools/build/win/precompiled_wtl.cc',
+            },
+          },
+        },
+        {
+          'target_name': 'selenium_tests',
+          'type': 'executable',
+          'dependencies': [
+            'resources',
+            'test_support_common',
+            'test_support_ui',
+            '../skia/skia.gyp:skia',
+            '../testing/gtest.gyp:gtest',
+          ],
+          'include_dirs': [
+            '..',
+            'third_party/wtl/include',
+          ],
+          'sources': [
+            'test/selenium/selenium_test.cc',
+            'tools/build/win/precompiled_wtl.h',
+            'tools/build/win/precompiled_wtl.cc',
+          ],
+          'configurations': {
+            'Debug': {
+              'msvs_precompiled_header': 'tools/build/win/precompiled_wtl.h',
+              'msvs_precompiled_source': 'tools/build/win/precompiled_wtl.cc',
+            },
+          },
+        },
+        {
           'target_name': 'worker',
           'type': '<(library)',
           'dependencies': [
             '../base/base.gyp:base',
             '../webkit/webkit.gyp:webkit',
           ],
           'sources': [
             'tools/build/win/precompiled.cc',
             'tools/build/win/precompiled.h',
 
@@ skipping 39 matching lines @@
                           '../tools/code_coverage/coverage_posix.py',
                           '--directory',
                           '<(PRODUCT_DIR)' ],
             },
           ],  # 'actions'
         },
       ]
     }],
   ],  # 'conditions'
 }