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

Unified Diff: content/browser/tab_contents/render_view_host_manager_unittest.cc

Issue 8949061: Move a bunch of methods from TabContents into the WebContents interface. This change either moves... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/ssl/ssl_policy.cc ('k') | content/browser/tab_contents/tab_contents.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/tab_contents/render_view_host_manager_unittest.cc
===================================================================
--- content/browser/tab_contents/render_view_host_manager_unittest.cc (revision 115435)
+++ content/browser/tab_contents/render_view_host_manager_unittest.cc (working copy)
@@ -172,7 +172,7 @@
kNtpUrl, content::Referrer(), content::PAGE_TRANSITION_LINK,
std::string());
TestRenderViewHost* ntp_rvh2 = static_cast<TestRenderViewHost*>(
- contents2.render_manager_for_testing()->current_host());
+ contents2.GetRenderManagerForTesting()->current_host());
EXPECT_FALSE(contents2.cross_navigation_pending());
ntp_rvh2->SendNavigate(100, kNtpUrl);
@@ -183,7 +183,7 @@
std::string());
EXPECT_TRUE(contents2.cross_navigation_pending());
TestRenderViewHost* dest_rvh2 = static_cast<TestRenderViewHost*>(
- contents2.render_manager_for_testing()->pending_render_view_host());
+ contents2.GetRenderManagerForTesting()->pending_render_view_host());
ASSERT_TRUE(dest_rvh2);
ntp_rvh2->SendShouldCloseACK(true);
dest_rvh2->SendNavigate(101, kDestUrl);
@@ -203,7 +203,7 @@
kNtpUrl, content::Referrer(), content::PAGE_TRANSITION_LINK,
std::string());
dest_rvh2->SendShouldCloseACK(true);
- static_cast<TestRenderViewHost*>(contents2.render_manager_for_testing()->
+ static_cast<TestRenderViewHost*>(contents2.GetRenderManagerForTesting()->
pending_render_view_host())->SendNavigate(102, kNtpUrl);
dest_rvh2->OnSwapOutACK();
@@ -588,7 +588,7 @@
// We should have a new pending RVH.
// Note that in this case, the navigation has not committed, so evil_rvh will
// not be deleted yet.
- EXPECT_NE(evil_rvh, contents()->render_manager_for_testing()->
+ EXPECT_NE(evil_rvh, contents()->GetRenderManagerForTesting()->
pending_render_view_host());
// Before that RVH has committed, the evil page reloads itself.
@@ -605,9 +605,9 @@
// That should have cancelled the pending RVH, and the evil RVH should be the
// current one.
- EXPECT_TRUE(contents()->render_manager_for_testing()->
+ EXPECT_TRUE(contents()->GetRenderManagerForTesting()->
pending_render_view_host() == NULL);
- EXPECT_EQ(evil_rvh, contents()->render_manager_for_testing()->current_host());
+ EXPECT_EQ(evil_rvh, contents()->GetRenderManagerForTesting()->current_host());
// Also we should not have a pending navigation entry.
NavigationEntry* entry = contents()->GetController().GetActiveEntry();
« no previous file with comments | « content/browser/ssl/ssl_policy.cc ('k') | content/browser/tab_contents/tab_contents.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698