diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-08 14:42:00 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-08 14:42:00 +0000 |
| commit | bb2bd6a8faedf61fe220726abc1c40432446b86d (patch) | |
| tree | f7c1fd17d9ebed844b806e2fd13672dfd4c236dd | |
| parent | 7f0944eb2e8e1af647e24634be25b86956eaef51 (diff) | |
| download | chromium_src-bb2bd6a8faedf61fe220726abc1c40432446b86d.zip chromium_src-bb2bd6a8faedf61fe220726abc1c40432446b86d.tar.gz chromium_src-bb2bd6a8faedf61fe220726abc1c40432446b86d.tar.bz2 | |
When navigating the current tab with NavigateToURL, make sure the tab isn't currently navigating
Note that the tab might be NULL if the browser doesn't have any tabs yet
BUG=103080
TEST=none
Review URL: http://codereview.chromium.org/8501009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109024 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/test/base/ui_test_utils.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/test/base/ui_test_utils.cc b/chrome/test/base/ui_test_utils.cc index bc975a7..74a809b 100644 --- a/chrome/test/base/ui_test_utils.cc +++ b/chrome/test/base/ui_test_utils.cc @@ -336,6 +336,8 @@ static void NavigateToURLWithDispositionBlockUntilNavigationsComplete( int number_of_navigations, WindowOpenDisposition disposition, int browser_test_flags) { + if (disposition == CURRENT_TAB && browser->GetSelectedTabContents()) + WaitForLoadStop(browser->GetSelectedTabContents()); TestNavigationObserver same_tab_observer( content::Source<NavigationController>( &browser->GetSelectedTabContents()->controller()), |