diff options
| author | gbillock@chromium.org <gbillock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-17 19:36:06 +0000 |
|---|---|---|
| committer | gbillock@chromium.org <gbillock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-17 19:36:06 +0000 |
| commit | 6b4e8e4d926b90d49668c0bf5189e60c60b71762 (patch) | |
| tree | 7285f9d2dcea8f07de6a0c3e5f8a113841b12317 /chrome/test | |
| parent | ec41a1d0f8d75e3b21ea4db6dbbb432e08a8e923 (diff) | |
| download | chromium_src-6b4e8e4d926b90d49668c0bf5189e60c60b71762.zip chromium_src-6b4e8e4d926b90d49668c0bf5189e60c60b71762.tar.gz chromium_src-6b4e8e4d926b90d49668c0bf5189e60c60b71762.tar.bz2 | |
Revert 96617
Revert 96593 (Original review URL http://codereview.chromium.org/7489019)
Fix up various browser tests not to use WaitForNavigation.
Now with corrected pdf browsertest
R=phajdan.jr@chromium.org
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/7645001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97181 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/base/ui_test_utils.cc | 1 | ||||
| -rw-r--r-- | chrome/test/base/ui_test_utils.h | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/chrome/test/base/ui_test_utils.cc b/chrome/test/base/ui_test_utils.cc index df7358b..7ee8db6 100644 --- a/chrome/test/base/ui_test_utils.cc +++ b/chrome/test/base/ui_test_utils.cc @@ -57,6 +57,7 @@ namespace ui_test_utils { namespace { // Used to block until a navigation completes. +// TODO(gbillock): this should be merged with TestNavigationObserver class NavigationNotificationObserver : public NotificationObserver { public: NavigationNotificationObserver(const NotificationSource& source, diff --git a/chrome/test/base/ui_test_utils.h b/chrome/test/base/ui_test_utils.h index 84a4e7c..201f82f 100644 --- a/chrome/test/base/ui_test_utils.h +++ b/chrome/test/base/ui_test_utils.h @@ -230,10 +230,14 @@ bool IsViewFocused(const Browser* browser, ViewID vid); void ClickOnView(const Browser* browser, ViewID vid); // Blocks until a notification for given |type| is received. +// TODO(gbillock): remove this race hazard. +// Use WindowedNotificationObserver instead. void WaitForNotification(int type); // Blocks until a notification for given |type| from the specified |source| // is received. +// TODO(gbillock): remove this race hazard. +// Use WindowedNotificationObserver instead. void WaitForNotificationFrom(int type, const NotificationSource& source); |