summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-08 08:56:13 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-08 08:56:13 +0000
commitc7f6bba878e9564527a628b55f9dcee91654568f (patch)
tree86ea93436e6762bf9f90b1b895fb49689e5981cf
parentc7dbf3059d788213208d5c8030984cb8c958f58a (diff)
downloadchromium_src-c7f6bba878e9564527a628b55f9dcee91654568f.zip
chromium_src-c7f6bba878e9564527a628b55f9dcee91654568f.tar.gz
chromium_src-c7f6bba878e9564527a628b55f9dcee91654568f.tar.bz2
When navigating the current tab with NavigateToURL, make sure the tab isn't currently navigating
BUG=103080 TEST=none Review URL: http://codereview.chromium.org/8477035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108989 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/test/base/ui_test_utils.cc2
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..a388936 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)
+ WaitForLoadStop(browser->GetSelectedTabContents());
TestNavigationObserver same_tab_observer(
content::Source<NavigationController>(
&browser->GetSelectedTabContents()->controller()),