| Index: content/browser/devtools/devtools_manager_unittest.cc
|
| diff --git a/content/browser/devtools/devtools_manager_unittest.cc b/content/browser/devtools/devtools_manager_unittest.cc
|
| index 2e36089e43d470b63f64a449f36e76d5bc732ca5..5d3efc9d8ec56468f791d6db6cac197c2a3e36e5 100644
|
| --- a/content/browser/devtools/devtools_manager_unittest.cc
|
| +++ b/content/browser/devtools/devtools_manager_unittest.cc
|
| @@ -276,9 +276,10 @@ TEST_F(DevToolsManagerTest, ReattachOnCancelPendingNavigation) {
|
| const GURL url("http://www.google.com");
|
| controller().LoadURL(
|
| url, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
|
| + int pending_id = controller().GetPendingEntry()->GetUniqueID();
|
| contents()->GetMainFrame()->PrepareForCommit();
|
| - contents()->TestDidNavigate(
|
| - contents()->GetMainFrame(), 1, url, ui::PAGE_TRANSITION_TYPED);
|
| + contents()->TestDidNavigate(contents()->GetMainFrame(), 1, pending_id, true,
|
| + url, ui::PAGE_TRANSITION_TYPED);
|
| EXPECT_FALSE(contents()->cross_navigation_pending());
|
|
|
| TestDevToolsClientHost client_host;
|
| @@ -297,9 +298,10 @@ TEST_F(DevToolsManagerTest, ReattachOnCancelPendingNavigation) {
|
| // Interrupt pending navigation and navigate back to the original site.
|
| controller().LoadURL(
|
| url, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
|
| + pending_id = controller().GetPendingEntry()->GetUniqueID();
|
| contents()->GetMainFrame()->PrepareForCommit();
|
| - contents()->TestDidNavigate(
|
| - contents()->GetMainFrame(), 1, url, ui::PAGE_TRANSITION_TYPED);
|
| + contents()->TestDidNavigate(contents()->GetMainFrame(), 1, pending_id, false,
|
| + url, ui::PAGE_TRANSITION_TYPED);
|
| EXPECT_FALSE(contents()->cross_navigation_pending());
|
| EXPECT_EQ(client_host.agent_host(),
|
| DevToolsAgentHost::GetOrCreateFor(web_contents()).get());
|
|
|