summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-03 17:26:16 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-03 17:26:16 +0000
commit16c9108c8c532b24ac09b829d0e13b9fb59045d1 (patch)
tree2af9440a6c5ef8230c7cd96d91a1af7624a26e10 /chrome/browser
parent64e4a3e7f711141360b3c37bfbf92ecd89f44da6 (diff)
downloadchromium_src-16c9108c8c532b24ac09b829d0e13b9fb59045d1.zip
chromium_src-16c9108c8c532b24ac09b829d0e13b9fb59045d1.tar.gz
chromium_src-16c9108c8c532b24ac09b829d0e13b9fb59045d1.tar.bz2
Make sure that the about:blank tab is loaded after returning from the extension
It's a precondition for NavigateToURL that the current tab is not navigating. BUG=none TEST=none Review URL: http://codereview.chromium.org/8446002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108487 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/extensions/extension_webrequest_apitest.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/extensions/extension_webrequest_apitest.cc b/chrome/browser/extensions/extension_webrequest_apitest.cc
index 7939f20..82b0d7f 100644
--- a/chrome/browser/extensions/extension_webrequest_apitest.cc
+++ b/chrome/browser/extensions/extension_webrequest_apitest.cc
@@ -108,6 +108,9 @@ IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, WebRequestNewTab) {
ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_newTab.html"))
<< message_;
+ TabContents* tab = browser()->GetSelectedTabContents();
+ ui_test_utils::WaitForLoadStop(tab);
+
ResultCatcher catcher;
ExtensionService* service = browser()->profile()->GetExtensionService();
@@ -125,7 +128,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, WebRequestNewTab) {
mouse_event.x = 7;
mouse_event.y = 7;
mouse_event.clickCount = 1;
- TabContents* tab = browser()->GetSelectedTabContents();
tab->render_view_host()->ForwardMouseEvent(mouse_event);
mouse_event.type = WebKit::WebInputEvent::MouseUp;
tab->render_view_host()->ForwardMouseEvent(mouse_event);