summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_tests.gypi
diff options
context:
space:
mode:
authornsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-09 15:51:21 +0000
committernsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-09 15:51:21 +0000
commit5a18973c436301794320afa7f4c56a7257a74c3d (patch)
tree440c39e178541d1e5746f610ab58c7179a4cd650 /chrome/chrome_tests.gypi
parentcf068a59fffe58ea7ab978ea20132e7015b23fde (diff)
downloadchromium_src-5a18973c436301794320afa7f4c56a7257a74c3d.zip
chromium_src-5a18973c436301794320afa7f4c56a7257a74c3d.tar.gz
chromium_src-5a18973c436301794320afa7f4c56a7257a74c3d.tar.bz2
Revert 58910 - This broke the "Google Chrome" compile.
Original description: Added a media UI test case for fullscreen video implementation for Windows (which is not committed yet). However, it is currently disabled until the webkit patches are here. Also changed the other cases in media_uitest.cc to stop using Sleep() in test code. Instead, NotificationObserver and NotificationRegistrar are used. Thirdly, moved media_uitest.cc from ui_tests to interactive_ui_tests. TEST=ui_tests, interactive_ui_tests BUGS=54838 Review URL: http://codereview.chromium.org/3322009 TBR=imcheng@chromium.org Review URL: http://codereview.chromium.org/3318020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58944 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_tests.gypi')
-rw-r--r--chrome/chrome_tests.gypi1
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 810908d..f1f1549 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -309,6 +309,7 @@
'browser/in_process_webkit/dom_storage_uitest.cc',
'browser/locale_tests_uitest.cc',
'browser/login_prompt_uitest.cc',
+ 'browser/media_uitest.cc',
'browser/metrics/metrics_service_uitest.cc',
'browser/prefs/pref_service_uitest.cc',
'browser/printing/printing_layout_uitest.cc',