summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_tests.gypi
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-29 18:32:32 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-29 18:32:32 +0000
commitaf44e7fb02b4a5d5cd5fffcf1408a065339b7535 (patch)
treed0872f21ae0563ef4bca43f690653ab71c54ea9d /chrome/chrome_tests.gypi
parentcb08c583ddbe51cb99d2ee8e051bb409774e43ab (diff)
downloadchromium_src-af44e7fb02b4a5d5cd5fffcf1408a065339b7535.zip
chromium_src-af44e7fb02b4a5d5cd5fffcf1408a065339b7535.tar.gz
chromium_src-af44e7fb02b4a5d5cd5fffcf1408a065339b7535.tar.bz2
Move in_process_browser_test and ui_test_utils to chrome/test/base
BUG=90905 Review URL: http://codereview.chromium.org/7532034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94720 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_tests.gypi')
-rw-r--r--chrome/chrome_tests.gypi19
1 files changed, 8 insertions, 11 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index bd2b96f..00ade6b 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -143,13 +143,18 @@
'test/automation/tab_proxy.h',
'test/automation/window_proxy.cc',
'test/automation/window_proxy.h',
+ 'test/base/in_process_browser_test.cc',
+ 'test/base/in_process_browser_test.h',
+ 'test/base/ui_test_utils.cc',
+ 'test/base/ui_test_utils.h',
+ 'test/base/ui_test_utils_linux.cc',
+ 'test/base/ui_test_utils_mac.mm',
+ 'test/base/ui_test_utils_win.cc',
'test/bookmark_load_observer.cc',
'test/bookmark_load_observer.h',
'test/chrome_process_util.cc',
'test/chrome_process_util.h',
'test/chrome_process_util_mac.cc',
- 'test/in_process_browser_test.cc',
- 'test/in_process_browser_test.h',
'test/model_test_utils.cc',
'test/model_test_utils.h',
'test/profile_mock.cc',
@@ -178,11 +183,6 @@
'test/testing_profile.cc',
'test/testing_profile.h',
'test/thread_observer_helper.h',
- 'test/ui_test_utils.cc',
- 'test/ui_test_utils.h',
- 'test/ui_test_utils_linux.cc',
- 'test/ui_test_utils_mac.mm',
- 'test/ui_test_utils_win.cc',
'test/unit/chrome_test_suite.cc',
'test/unit/chrome_test_suite.h',
'test/values_test_util.cc',
@@ -2620,11 +2620,11 @@
'renderer/safe_browsing/render_view_fake_resources_test.h',
'renderer/translate_helper_browsertest.cc',
'test/automation/dom_automation_browsertest.cc',
+ 'test/base/in_process_browser_test_browsertest.cc',
'test/data/webui/assertions-inl.h',
'test/data/webui/assertions.js',
'test/data/webui/print_preview.js',
'test/data/webui/options.js',
- 'test/in_process_browser_test_browsertest.cc',
'test/out_of_proc_test_runner.cc',
'test/render_view_test.cc',
'test/render_view_test.h',
@@ -3544,9 +3544,6 @@
'test/live_sync/two_client_preferences_sync_test.cc',
'test/test_notification_tracker.cc',
'test/test_notification_tracker.h',
- 'test/ui_test_utils_linux.cc',
- 'test/ui_test_utils_mac.mm',
- 'test/ui_test_utils_win.cc',
'test/data/resource.rc',
],
'conditions': [