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

Unified Diff: chrome/browser/tab_contents/test_tab_contents.cc

Issue 3585002: Revert 60963 - Merge 58701 - Relanding this:... (Closed) Base URL: svn://svn.chromium.org/chrome/branches/517/src/
Patch Set: Created 10 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/tab_contents/test_tab_contents.cc
===================================================================
--- chrome/browser/tab_contents/test_tab_contents.cc (revision 60964)
+++ chrome/browser/tab_contents/test_tab_contents.cc (working copy)
@@ -45,7 +45,7 @@
}
}
-TestRenderViewHost* TestTabContents::pending_rvh() const {
+TestRenderViewHost* TestTabContents::pending_rvh() {
return static_cast<TestRenderViewHost*>(
render_manager_.pending_render_view_host_);
}
@@ -70,34 +70,7 @@
bool reverse_on_redirect = false;
BrowserURLHandler::RewriteURLIfNecessary(
&loaded_url, profile(), &reverse_on_redirect);
-
- // LoadURL created a navigation entry, now simulate the RenderView sending
- // a notification that it actually navigated.
- CommitPendingNavigation();
+ static_cast<TestRenderViewHost*>(render_view_host())->SendNavigate(
+ static_cast<MockRenderProcessHost*>(render_view_host()->process())->
+ max_page_id() + 1, loaded_url);
}
-
-void TestTabContents::CommitPendingNavigation() {
- // If we are doing a cross-site navigation, this simulates the current RVH
- // notifying that it has unloaded so the pending RVH is resumed and can
- // navigate.
- ProceedWithCrossSiteNavigation();
- TestRenderViewHost* rvh = pending_rvh();
- if (!rvh)
- rvh = static_cast<TestRenderViewHost*>(render_manager_.current_host());
-
- const NavigationEntry* entry = controller().pending_entry();
- DCHECK(entry);
- int page_id = entry->page_id();
- if (page_id == -1) {
- // It's a new navigation, assign a never-seen page id to it.
- page_id =
- static_cast<MockRenderProcessHost*>(rvh->process())->max_page_id() + 1;
- }
- rvh->SendNavigate(page_id, entry->url());
-}
-
-void TestTabContents::ProceedWithCrossSiteNavigation() {
- if (!pending_rvh())
- return;
- render_manager_.ShouldClosePage(true, true);
-}
« no previous file with comments | « chrome/browser/tab_contents/test_tab_contents.h ('k') | chrome/browser/translate/translate_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698