diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-30 03:34:38 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-30 03:34:38 +0000 |
| commit | c37aaca2543d12fb42cfc0317955e6376f868fee (patch) | |
| tree | c1322df01f454744b490d976d2ce9ae3b2ec97d4 | |
| parent | 7e830a9541a0b76e5c929ad8b64dbf0620b58e00 (diff) | |
| download | chromium_src-c37aaca2543d12fb42cfc0317955e6376f868fee.zip chromium_src-c37aaca2543d12fb42cfc0317955e6376f868fee.tar.gz chromium_src-c37aaca2543d12fb42cfc0317955e6376f868fee.tar.bz2 | |
move desktop notification tests to interactive_ui_tests and enable on win_aura
Were disabled at r170051. These tests require the user to be logged in which is
the case for interactive_ui_tests.
R=jam@chromium.org
BUG=163196, 154081
Review URL: https://codereview.chromium.org/11299265
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170379 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/notifications/desktop_notifications_unittest.cc | 5 | ||||
| -rw-r--r-- | chrome/chrome_tests.gypi | 6 |
2 files changed, 3 insertions, 8 deletions
diff --git a/chrome/browser/notifications/desktop_notifications_unittest.cc b/chrome/browser/notifications/desktop_notifications_unittest.cc index e2d8e4c..6e5c308 100644 --- a/chrome/browser/notifications/desktop_notifications_unittest.cc +++ b/chrome/browser/notifications/desktop_notifications_unittest.cc @@ -21,9 +21,6 @@ #include "ui/aura/root_window.h" #endif -// TODO(jam): figure out why notification tests are failing on win aura buildbot -#if !(defined(OS_WIN) && defined(USE_AURA)) - using content::BrowserThread; // static @@ -480,5 +477,3 @@ TEST_F(DesktopNotificationsTest, TestPositionPreference) { int current_x = (*balloons.begin())->GetPosition().x(); EXPECT_LT(current_x, last_x); } - -#endif diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index e692a6b..21b7343 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -178,6 +178,8 @@ 'browser/extensions/window_open_interactive_apitest.cc', 'browser/instant/instant_browsertest.cc', 'browser/mouseleave_browsertest.cc', + 'browser/notifications/desktop_notifications_unittest.cc', + 'browser/notifications/desktop_notifications_unittest.h', 'browser/printing/print_dialog_cloud_interative_uitest.cc', 'browser/task_manager/task_manager_browsertest_util.cc', 'browser/ui/browser_focus_uitest.cc', @@ -324,6 +326,7 @@ 'browser/ui/panels/panel_drag_browsertest.cc', 'browser/ui/panels/panel_resize_browsertest.cc', 'browser/ui/views/panels/panel_view_browsertest.cc', + 'browser/notifications/desktop_notifications_unittest.cc', ], }], ['OS=="win"', { @@ -1053,8 +1056,6 @@ 'browser/net/load_timing_observer_browsertest.cc', 'browser/net/predictor_browsertest.cc', 'browser/net/proxy_browsertest.cc', - 'browser/notifications/desktop_notifications_unittest.cc', - 'browser/notifications/desktop_notifications_unittest.h', 'browser/notifications/notification_browsertest.cc', 'browser/page_cycler/page_cycler_browsertest.cc', 'browser/performance_monitor/performance_monitor_browsertest.cc', @@ -1358,7 +1359,6 @@ ['exclude', '^browser/protector'], ], 'sources!': [ - 'browser/notifications/desktop_notifications_unittest.cc', 'browser/printing/cloud_print/test/cloud_print_policy_browsertest.cc', 'browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc', 'browser/service/service_process_control_browsertest.cc', |