summaryrefslogtreecommitdiffstats
path: root/chrome/browser/external_extension_browsertest.cc
diff options
context:
space:
mode:
authorcreis@chromium.org <creis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-24 01:27:15 +0000
committercreis@chromium.org <creis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-24 01:27:15 +0000
commit979a4bc639c02064f3dc6b57abdce2d4f5eff0c2 (patch)
tree45b9f614ea0d4b13accb640133736f4d409a14ab /chrome/browser/external_extension_browsertest.cc
parenta9d2b8ff6ad9886baf661f428e662af7e992a0f8 (diff)
downloadchromium_src-979a4bc639c02064f3dc6b57abdce2d4f5eff0c2.zip
chromium_src-979a4bc639c02064f3dc6b57abdce2d4f5eff0c2.tar.gz
chromium_src-979a4bc639c02064f3dc6b57abdce2d4f5eff0c2.tar.bz2
Revert 195553 "Allow showing pending URL for new tab navigations..."
Caused spike in renderer crashes. > Allow showing pending URL for new tab navigations, but only if safe. > > We revert to showing the opener's URL if it modifies the content of the > initial blank page before the pending URL commits, to prevent URL spoofs. > > Implications: > - All renderer-initiated navigations now have pending NavigationEntries. > - GetURL and GetTitle use the visible entry, not active entry. > - The renderer notifies the browser if DOM mutations occur before first load. > > [Second attempt, after http://crrev.com/191277 was reverted.] > > BUG=9682 > TEST=Open a slow link in a new tab. Destination URL should be visible and reloadable. > > Review URL: https://chromiumcodereview.appspot.com/13846007 TBR=creis@chromium.org Review URL: https://codereview.chromium.org/13966012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195970 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/external_extension_browsertest.cc')
-rw-r--r--chrome/browser/external_extension_browsertest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/external_extension_browsertest.cc b/chrome/browser/external_extension_browsertest.cc
index 3fdc0ab..a724213 100644
--- a/chrome/browser/external_extension_browsertest.cc
+++ b/chrome/browser/external_extension_browsertest.cc
@@ -58,7 +58,7 @@ class SearchProviderTest : public InProcessBrowserTest {
search_provider_test_url_.path() + "#" + expected_result);
ui_test_utils::NavigateToURLWithDisposition(
browser, test_url, NEW_FOREGROUND_TAB,
- ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
+ ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB);
// Bundle up information needed to verify the result.
content::WebContents* tab =