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

Unified Diff: chrome/browser/translate/translate_manager_render_view_host_unittest.cc

Issue 304763002: Trust the renderer's same-document navigation flag if it is a same-origin nav. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/translate/translate_manager_render_view_host_unittest.cc
diff --git a/chrome/browser/translate/translate_manager_render_view_host_unittest.cc b/chrome/browser/translate/translate_manager_render_view_host_unittest.cc
index db74fe491c126b8bab4c027d42093a48e89e07ff..17fbc3b1254188de6b20d590459bfcc3cf41877a 100644
--- a/chrome/browser/translate/translate_manager_render_view_host_unittest.cc
+++ b/chrome/browser/translate/translate_manager_render_view_host_unittest.cc
@@ -94,7 +94,10 @@ class TranslateManagerRenderViewHostTest
void SimulateNavigation(const GURL& url,
const std::string& lang,
bool page_translatable) {
- NavigateAndCommit(url);
+ if (rvh()->GetMainFrame()->GetLastCommittedURL() == url)
+ Reload();
+ else
+ NavigateAndCommit(url);
SimulateOnTranslateLanguageDetermined(lang, page_translatable);
}
@@ -794,7 +797,8 @@ TEST_F(TranslateManagerRenderViewHostTest, ReloadFromLocationBar) {
NavEntryCommittedObserver nav_observer(web_contents());
web_contents()->GetController().LoadURL(
url, content::Referrer(), content::PAGE_TRANSITION_TYPED, std::string());
- rvh_tester()->SendNavigate(0, url);
+ rvh_tester()->SendNavigateWithTransition(
+ 0, url, content::PAGE_TRANSITION_TYPED);
// Test that we are really getting a same page navigation, the test would be
// useless if it was not the case.

Powered by Google App Engine
This is Rietveld 408576698