diff options
| author | dominich@chromium.org <dominich@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-26 22:14:20 +0000 |
|---|---|---|
| committer | dominich@chromium.org <dominich@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-26 22:14:20 +0000 |
| commit | 5869e29bd54daa66f98eafebb5469aff24354cfe (patch) | |
| tree | a3e0698337b2e8d5e2b42aea603296b744c159f0 /chrome/browser/prerender/prerender_unittest.cc | |
| parent | b714f55c2a99e52c19eee74503373169a5bb1570 (diff) | |
| download | chromium_src-5869e29bd54daa66f98eafebb5469aff24354cfe.zip chromium_src-5869e29bd54daa66f98eafebb5469aff24354cfe.tar.gz chromium_src-5869e29bd54daa66f98eafebb5469aff24354cfe.tar.bz2 | |
Don't prematurely cancel the Omnibox prerender due to URL mismatch.
It's possible there's a redirect chain that needs to be resolved. We
could check the chain for a match and cancel, but it's much simpler (and
not unreasonable) to not cancel in the first place.
BUG=134268
R=gavinp@chromium.org
TEST=
Review URL: https://chromiumcodereview.appspot.com/10673003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144293 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prerender/prerender_unittest.cc')
| -rw-r--r-- | chrome/browser/prerender/prerender_unittest.cc | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/chrome/browser/prerender/prerender_unittest.cc b/chrome/browser/prerender/prerender_unittest.cc index 10b9f48..b6403d9 100644 --- a/chrome/browser/prerender/prerender_unittest.cc +++ b/chrome/browser/prerender/prerender_unittest.cc @@ -670,33 +670,6 @@ TEST_F(PrerenderTest, CancelAllTest) { EXPECT_EQ(null, prerender_manager()->FindEntry(url)); } -// Make sure canceling for omnibox works as expected. -TEST_F(PrerenderTest, CancelOmniboxRemovesOmniboxTest) { - // Check canceling removes the Omnibox url. - GURL url("http://www.google.com/"); - DummyPrerenderContents* prerender_contents = - prerender_manager()->CreateNextPrerenderContents( - url, ORIGIN_OMNIBOX, FINAL_STATUS_CANCELLED); - EXPECT_TRUE(prerender_manager()->AddPrerenderFromOmnibox( - url, NULL, gfx::Size())); - EXPECT_TRUE(prerender_contents->prerendering_has_started()); - prerender_manager()->CancelOmniboxPrerenders(); - const DummyPrerenderContents* null = NULL; - EXPECT_EQ(null, prerender_manager()->FindEntry(url)); -} - -TEST_F(PrerenderTest, CancelOmniboxDoesNotRemoveLinkTest) { - GURL url("http://www.google.com/"); - DummyPrerenderContents* prerender_contents = - prerender_manager()->CreateNextPrerenderContents( - url, ORIGIN_LINK_REL_PRERENDER, FINAL_STATUS_MANAGER_SHUTDOWN); - EXPECT_TRUE(AddSimplePrerender(url)); - EXPECT_TRUE(prerender_contents->prerendering_has_started()); - prerender_manager()->CancelOmniboxPrerenders(); - const DummyPrerenderContents* null = NULL; - EXPECT_NE(null, prerender_manager()->FindEntry(url)); -} - TEST_F(PrerenderTest, OmniboxNotAllowedWhenDisabled) { prerender_manager()->set_enabled(false); EXPECT_FALSE(prerender_manager()->AddPrerenderFromOmnibox( |