Split the test support into three separate target libaries:

* test_support_unit
  For *_tests executables using main() from test/unit/run_all_unittests.cc.
* test_support_ui
  For *_tests executables using main() from test/ui/run_all_unittests.cc,
  plus supporing UI-specific code.
* test_support_common
  All the stuff common to both unit and UI testing.

Ripple effects and additional changes:
* Added list of *_uitest.cc modules.  Most of these aren't building on mac
  or Linux, but should give the Windows gyp build a head start.  
  browser/locale_tests_uitest.cc, however, is self-contained enough to
  actually build and work on Linux.  (Bonus!)
* test/automation/automation_handle_tracker.cc moves into test_support_common.
* Added missing browser/grk/dialogs_gtk.cc.
Review URL: http://codereview.chromium.org/42186

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

1 files changed, 161 insertions, 19 deletions

diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index dc0d55f..f8990f4 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -629,6 +629,7 @@
         'browser/gtk/browser_window_gtk.h',
         'browser/gtk/custom_button.cc',
         'browser/gtk/custom_button.h',
+        'browser/gtk/dialogs_gtk.cc',
         'browser/gtk/download_item_gtk.cc',
         'browser/gtk/download_item_gtk.h',
         'browser/gtk/download_shelf_gtk.cc',
@@ -1628,7 +1629,7 @@
     {
       # 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',
+      'target_name': 'test_support_common',
       'type': 'static_library',
       'dependencies': [
         'browser',
@@ -1659,6 +1660,8 @@
         'renderer/mock_render_process.h',
         'renderer/mock_render_thread.cc',
         'renderer/mock_render_thread.h',
+        'test/automation/automation_handle_tracker.cc',
+        'test/automation/automation_handle_tracker.h',
         'test/automation/automation_proxy.cc',
         'test/automation/automation_proxy.h',
         'test/automation/browser_proxy.cc',
@@ -1669,9 +1672,6 @@
         'test/automation/window_proxy.h',
         'test/testing_profile.cc',
         'test/testing_profile.h',
-        'test/ui/ui_test.cc',
-        'test/ui/ui_test.h',
-        'test/unit/run_all_unittests.cc',
       ],
       'conditions': [
         ['OS=="mac"', {
@@ -1682,8 +1682,6 @@
             'test/automation/browser_proxy.h',
             'test/automation/tab_proxy.cc',
             'test/automation/tab_proxy.h',
-            'test/ui/ui_test.cc',
-            'test/ui/ui_test.h',
           ],
         }],
         ['OS=="win"', {
@@ -1699,11 +1697,56 @@
       ],
     },
     {
+      'target_name': 'test_support_ui',
+      'type': 'static_library',
+      'dependencies': [
+        'test_support_common',
+        'resources',
+        '../skia/skia.gyp:skia',
+        '../testing/gtest.gyp:gtest',
+      ],
+      'include_dirs': [
+        '..',
+      ],
+      'sources': [
+        'test/ui/npapi_test_helper.cc',
+        'test/ui/npapi_test_helper.h',
+        'test/ui/run_all_unittests.cc',
+        'test/ui/ui_test.cc',
+        'test/ui/ui_test.h',
+        'test/ui/ui_test_suite.cc',
+        'test/ui/ui_test_suite.h',
+      ],
+      'conditions': [
+        ['OS!="win"', {
+          'sources!': [
+            'test/ui/npapi_test_helper.cc',
+          ],
+        }],
+      ],
+    },
+    {
+      'target_name': 'test_support_unit',
+      'type': 'static_library',
+      'dependencies': [
+        'test_support_common',
+        'resources',
+        '../skia/skia.gyp:skia',
+        '../testing/gtest.gyp:gtest',
+      ],
+      'include_dirs': [
+        '..',
+      ],
+      'sources': [
+        'test/unit/run_all_unittests.cc',
+      ],
+    },
+    {
       'target_name': 'ipc_tests',
       'type': 'executable',
       'dependencies': [
         'common',
-        'test_support',
+        'test_support_unit',
         '../base/base.gyp:base',
         '../testing/gtest.gyp:gtest',
       ],
@@ -1725,30 +1768,106 @@
         'browser',
         'common',
         'resources',
-        'test_support',
+        'test_support_ui',
         '../base/base.gyp:base',
+        '../net/net.gyp:net',
+        '../build/temp_gyp/googleurl.gyp:googleurl',
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',
+        '../third_party/icu38/icu38.gyp:icui18n',
+        '../third_party/icu38/icu38.gyp:icuuc',
+        '../third_party/libxml/libxml.gyp:libxml',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
-        'test/ui/run_all_unittests.cc',
-        'test/ui/ui_test_suite.cc',
-        'test/ui/ui_test_suite.h',
-        'test/automation/automation_handle_tracker.cc',
-        'test/automation/automation_handle_tracker.h',
+        'app/chrome_main_uitest.cc',
+        'browser/browser_uitest.cc',
+        'browser/crash_recovery_uitest.cc',
+        'browser/download/download_uitest.cc',
+        'browser/download/save_page_uitest.cc',
+        'browser/errorpage_uitest.cc',
+        'browser/history/redirect_uitest.cc',
+        'browser/iframe_uitest.cc',
+        'browser/images_uitest.cc',
+        'browser/interstitial_page_uitest.cc',
+        'browser/locale_tests_uitest.cc',
+        'browser/login_prompt_uitest.cc',
+        'browser/metrics/metrics_service_uitest.cc',
+        'browser/printing/printing_layout_uitest.cc',
+        'browser/printing/printing_test.h',
+        'browser/renderer_host/resource_dispatcher_host_uitest.cc',
+        'browser/sanity_uitest.cc',
+        'browser/session_history_uitest.cc',
+        'browser/sessions/session_restore_uitest.cc',
+        'browser/ssl/ssl_uitest.cc',
+        'browser/tab_contents/view_source_uitest.cc',
+        'browser/tab_restore_uitest.cc',
+        'browser/unload_uitest.cc',
+        'browser/views/find_bar_win_uitest.cc',
+        'common/logging_chrome_uitest.cc',
+        'common/net/cache_uitest.cc',
+        'common/pref_service_uitest.cc',
+        'test/accessibility/accessibility_tests.cc',
+        'test/accessibility/accessibility_util.cc',
+        'test/accessibility/accessibility_util.h',
+        'test/accessibility/browser_impl.cc',
+        'test/accessibility/browser_impl.h',
+        'test/accessibility/constants.h',
+        'test/accessibility/keyboard_util.cc',
+        'test/accessibility/keyboard_util.h',
+        'test/accessibility/registry_util.cc',
+        'test/accessibility/registry_util.h',
+        'test/accessibility/tab_impl.cc',
+        'test/accessibility/tab_impl.h',
+        'test/automation/automation_proxy_uitest.cc',
+        'test/perf/mem_usage.cc',
+        'test/perf/mem_usage.h',
+        'test/reliability/page_load_test.cc',
+        'test/reliability/page_load_test.h',
+        'test/ui/dom_checker_uitest.cc',
+        'test/ui/history_uitest.cc',
+        'test/ui/inspector_controller_uitest.cc',
+        'test/ui/layout_plugin_uitest.cpp',
+        'test/ui/npapi_uitest.cpp',
+        'test/ui/omnibox_uitest.cc',
+        'test/ui/sandbox_uitests.cc',
       ],
       'conditions': [
+        ['OS=="linux"', {
+          'sources!': [
+            # TODO(port)
+            'app/chrome_main_uitest.cc',
+            'browser/browser_uitest.cc',
+            'browser/crash_recovery_uitest.cc',
+            'browser/download/download_uitest.cc',
+            'browser/download/save_page_uitest.cc',
+            'browser/errorpage_uitest.cc',
+            'browser/iframe_uitest.cc',
+            'browser/images_uitest.cc',
+            'browser/interstitial_page_uitest.cc',
+            'browser/login_prompt_uitest.cc',
+            'browser/metrics/metrics_service_uitest.cc',
+            'browser/renderer_host/resource_dispatcher_host_uitest.cc',
+            'browser/sanity_uitest.cc',
+            'browser/sessions/session_restore_uitest.cc',
+            'browser/tab_contents/view_source_uitest.cc',
+            'common/net/cache_uitest.cc',
+            'common/pref_service_uitest.cc',
+            'test/reliability/page_load_test.cc',
+            'test/ui/dom_checker_uitest.cc',
+            'test/ui/history_uitest.cc',
+            'test/ui/layout_plugin_uitest.cpp',
+            'test/ui/omnibox_uitest.cc',
+          ],
+        }],
         ['OS=="mac"', {
           # mac tests load the resources from the built app beside the test
           'dependencies': ['app'],
-          # There are only real ui_tests on Windows.  On mac there's just a
-          # dummy stub that looks like a test.  Since it's not a real ui_tests
-          # executable, it builds test/unit/run_all_unittests.cc instead of the
-          # one in test/ui, and excludes all other files.  The runner in
-          # test/unit should not be built on Windows.
+          # Mac doesn't have real ui_tests yet, just a dummy stub that
+          # looks like a test.  Since it's not a real ui_test, exclude
+          # the sources and just re-use test/unit/run_all_unittests.cc.
           'sources=': [
             'test/unit/run_all_unittests.cc',
           ],
@@ -1761,6 +1880,29 @@
             '../google_update/google_update.gyp:google_update',
             'views',
           ],
+        }, { # else: OS != "win"
+          'sources!': [
+            # TODO(port)?  (Most of these include windows.h or similar.)
+            'browser/history/redirect_uitest.cc',
+            'browser/printing/printing_layout_uitest.cc',
+            'browser/session_history_uitest.cc',
+            'browser/ssl/ssl_uitest.cc',
+            'browser/tab_restore_uitest.cc',
+            'browser/unload_uitest.cc',
+            'browser/views/find_bar_win_uitest.cc',
+            'common/logging_chrome_uitest.cc',
+            'test/accessibility/accessibility_tests.cc',
+            'test/accessibility/accessibility_util.cc',
+            'test/accessibility/browser_impl.cc',
+            'test/accessibility/keyboard_util.cc',
+            'test/accessibility/registry_util.cc',
+            'test/accessibility/tab_impl.cc',
+            'test/automation/automation_proxy_uitest.cc',
+            'test/perf/mem_usage.cc',
+            'test/ui/inspector_controller_uitest.cc',
+            'test/ui/npapi_uitest.cpp',
+            'test/ui/sandbox_uitests.cc',
+          ],
         }],
       ],
     },
@@ -1772,7 +1914,7 @@
         'common',
         'renderer',
         'resources',
-        'test_support',
+        'test_support_unit',
         '../webkit/webkit.gyp:webkit',
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',