| 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 4eb0792a800841b32aa1997835d8b0162ee5cf63..7772956bdc8f189c49db51028476afc0b87088ec 100644
|
| --- a/chrome/browser/translate/translate_manager_render_view_host_unittest.cc
|
| +++ b/chrome/browser/translate/translate_manager_render_view_host_unittest.cc
|
| @@ -840,11 +840,8 @@
|
| NavEntryCommittedObserver nav_observer(web_contents());
|
| web_contents()->GetController().LoadURL(
|
| url, content::Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
|
| - int pending_id =
|
| - web_contents()->GetController().GetPendingEntry()->GetUniqueID();
|
| content::RenderFrameHostTester::For(web_contents()->GetMainFrame())
|
| - ->SendNavigateWithTransition(0, pending_id, false, url,
|
| - ui::PAGE_TRANSITION_TYPED);
|
| + ->SendNavigateWithTransition(0, url, ui::PAGE_TRANSITION_TYPED);
|
|
|
| // Test that we are really getting a same page navigation, the test would be
|
| // useless if it was not the case.
|
| @@ -897,12 +894,12 @@
|
|
|
| // Simulate a sub-frame auto-navigating.
|
| subframe_tester->SendNavigateWithTransition(
|
| - 0, 0, false, GURL("http://pub.com"), ui::PAGE_TRANSITION_AUTO_SUBFRAME);
|
| + 0, GURL("http://pub.com"), ui::PAGE_TRANSITION_AUTO_SUBFRAME);
|
| EXPECT_TRUE(GetTranslateInfoBar() == NULL);
|
|
|
| // Simulate the user navigating in a sub-frame.
|
| subframe_tester->SendNavigateWithTransition(
|
| - 1, 0, true, GURL("http://pub.com"), ui::PAGE_TRANSITION_MANUAL_SUBFRAME);
|
| + 1, GURL("http://pub.com"), ui::PAGE_TRANSITION_MANUAL_SUBFRAME);
|
| EXPECT_TRUE(GetTranslateInfoBar() == NULL);
|
|
|
| // Navigate out of page, a new infobar should show.
|
|
|