diff options
| author | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-23 15:05:42 +0000 |
|---|---|---|
| committer | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-23 15:05:42 +0000 |
| commit | 61ab21a7cc04d00e258fc9caf491e12d6f0569f5 (patch) | |
| tree | cf33bb7c2ec8b55b543fc9fca5be7a20b9dab99f /chrome/test/base/ui_test_utils.cc | |
| parent | 5e06f46d0d9cbe27d892262800bf1e04ae52dedb (diff) | |
| download | chromium_src-61ab21a7cc04d00e258fc9caf491e12d6f0569f5.zip chromium_src-61ab21a7cc04d00e258fc9caf491e12d6f0569f5.tar.gz chromium_src-61ab21a7cc04d00e258fc9caf491e12d6f0569f5.tar.bz2 | |
Re-apply r128453 "Restore the back/forward stack when opening tabs from other devices." It was not the source of failure.
TBR=dubroy
TEST=
Review URL: https://chromiumcodereview.appspot.com/9845012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128489 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/base/ui_test_utils.cc')
| -rw-r--r-- | chrome/test/base/ui_test_utils.cc | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/chrome/test/base/ui_test_utils.cc b/chrome/test/base/ui_test_utils.cc index 6b7b318..441c81e 100644 --- a/chrome/test/base/ui_test_utils.cc +++ b/chrome/test/base/ui_test_utils.cc @@ -976,6 +976,23 @@ void TitleWatcher::AlsoWaitForTitle(const string16& expected_title) { TitleWatcher::~TitleWatcher() { } +BrowserAddedObserver::BrowserAddedObserver() + : notification_observer_( + chrome::NOTIFICATION_BROWSER_OPENED, + content::NotificationService::AllSources()) { + original_browsers_.insert(BrowserList::begin(), BrowserList::end()); +} + +BrowserAddedObserver::~BrowserAddedObserver() { +} + +Browser* BrowserAddedObserver::WaitForSingleNewBrowser() { + notification_observer_.Wait(); + // Ensure that only a single new browser has appeared. + EXPECT_EQ(original_browsers_.size() + 1, BrowserList::size()); + return GetBrowserNotInSet(original_browsers_); +} + const string16& TitleWatcher::WaitAndGetTitle() { if (expected_title_observed_) return observed_title_; |