Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(488)

Side by Side Diff: chrome/browser/prerender/prerender_manager_unittest.cc

Issue 6915019: Changes to not use the prerendered contents when window.opener needs to be set. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Addresing Chris's comments. Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/memory/scoped_vector.h" 5 #include "base/memory/scoped_vector.h"
6 #include "base/time.h" 6 #include "base/time.h"
7 #include "chrome/browser/prerender/prerender_contents.h" 7 #include "chrome/browser/prerender/prerender_contents.h"
8 #include "chrome/browser/prerender/prerender_manager.h" 8 #include "chrome/browser/prerender/prerender_manager.h"
9 #include "content/browser/browser_thread.h" 9 #include "content/browser/browser_thread.h"
10 #include "content/browser/renderer_host/render_view_host.h" 10 #include "content/browser/renderer_host/render_view_host.h"
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 182
183 private: 183 private:
184 // Needed to pass PrerenderManager's DCHECKs. 184 // Needed to pass PrerenderManager's DCHECKs.
185 MessageLoop message_loop_; 185 MessageLoop message_loop_;
186 BrowserThread ui_thread_; 186 BrowserThread ui_thread_;
187 scoped_ptr<TestPrerenderManager> prerender_manager_; 187 scoped_ptr<TestPrerenderManager> prerender_manager_;
188 }; 188 };
189 189
190 TEST_F(PrerenderManagerTest, EmptyTest) { 190 TEST_F(PrerenderManagerTest, EmptyTest) {
191 GURL url("http://www.google.com/"); 191 GURL url("http://www.google.com/");
192 EXPECT_FALSE(prerender_manager()->MaybeUsePreloadedPage(NULL, url)); 192 EXPECT_FALSE(prerender_manager()->MaybeUsePreloadedPage(NULL, url, false));
193 } 193 }
194 194
195 TEST_F(PrerenderManagerTest, FoundTest) { 195 TEST_F(PrerenderManagerTest, FoundTest) {
196 GURL url("http://www.google.com/"); 196 GURL url("http://www.google.com/");
197 DummyPrerenderContents* prerender_contents = 197 DummyPrerenderContents* prerender_contents =
198 prerender_manager()->CreateNextPrerenderContents( 198 prerender_manager()->CreateNextPrerenderContents(
199 url, 199 url,
200 FINAL_STATUS_USED); 200 FINAL_STATUS_USED);
201 EXPECT_TRUE(prerender_manager()->AddSimplePreload(url)); 201 EXPECT_TRUE(prerender_manager()->AddSimplePreload(url));
202 EXPECT_TRUE(prerender_contents->has_started()); 202 EXPECT_TRUE(prerender_contents->has_started());
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after
524 DummyPrerenderContents* prerender_contents = 524 DummyPrerenderContents* prerender_contents =
525 prerender_manager()->CreateNextPrerenderContents(fragment_url, 525 prerender_manager()->CreateNextPrerenderContents(fragment_url,
526 FINAL_STATUS_USED); 526 FINAL_STATUS_USED);
527 EXPECT_TRUE(prerender_manager()->AddSimplePreload(fragment_url)); 527 EXPECT_TRUE(prerender_manager()->AddSimplePreload(fragment_url));
528 EXPECT_TRUE(prerender_contents->has_started()); 528 EXPECT_TRUE(prerender_contents->has_started());
529 ASSERT_EQ(prerender_contents, 529 ASSERT_EQ(prerender_contents,
530 prerender_manager()->GetEntry(other_fragment_url)); 530 prerender_manager()->GetEntry(other_fragment_url));
531 } 531 }
532 532
533 } // namespace prerender 533 } // namespace prerender
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698